Skip to content

Import run-screen, run-journalctl from grml-scripts #429

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 3, 2025
Merged

Import run-screen, run-journalctl from grml-scripts #429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd281f8
config: getty@tty12: inline run-journalctl
zeha Aug 26, 2025
cfe71db
config: import run-screen from grml-scripts
zeha Aug 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/files/GRMLBASE/etc/systemd/system/[email protected]/override.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ StandardInput=tty
StandardOutput=tty
TTYPath=/dev/tty12
ExecStart=
ExecStart=-/usr/share/grml-scripts/run-journalctl
ExecStart=-/usr/bin/journalctl -b -f

[Unit]
Description=journalctl on tty12
2 changes: 1 addition & 1 deletion config/files/GRMLBASE/etc/systemd/system/[email protected]/override.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ StandardOutput=tty
TTYPath=/dev/tty2
WorkingDirectory=~
ExecStart=
ExecStart=-/usr/share/grml-scripts/run-screen
ExecStart=-/usr/share/grml-autoconfig/run-screen

[Unit]
Description=screen on tty2
2 changes: 1 addition & 1 deletion config/files/GRMLBASE/etc/systemd/system/[email protected]/override.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ StandardOutput=tty
TTYPath=/dev/tty3
WorkingDirectory=~
ExecStart=
ExecStart=-/usr/share/grml-scripts/run-screen
ExecStart=-/usr/share/grml-autoconfig/run-screen

[Unit]
Description=screen on tty3
2 changes: 1 addition & 1 deletion config/files/GRMLBASE/etc/systemd/system/[email protected]/override.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ TTYPath=/dev/tty4
User=$USERNAME
WorkingDirectory=~
ExecStart=
ExecStart=-/usr/share/grml-scripts/run-screen
ExecStart=-/usr/share/grml-autoconfig/run-screen

[Unit]
Description=screen ($USERNAME) on tty4
23 changes: 23 additions & 0 deletions config/files/GRMLBASE/usr/share/grml-autoconfig/run-screen
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#!/bin/sh
# Filename: /usr/share/grml-autoconfig/run-screen
# Purpose: wrapper for screen to start with appropriate configuration
# Authors: grml-team (grml.org), (c) Michael Prokop <[email protected]>
# Bug-Reports: see http://grml.org/bugs/
# License: This file is licensed under the GPL v2.
################################################################################

export SHELL=/bin/zsh
# try to mitigate raceconditions from screen
SCREENDIR_="/var/run/screen"
mkdir -m 700 "${SCREENDIR_}/S-$USER" >/dev/null 2>&1

# now run screen with config
if [ "$(id -u)" = 0 ] ; then
exec screen -U -c /etc/grml/screenrc -s "-$SHELL"
elif [ -r "$HOME/.screenrc" ] ; then
exec screen -U -c "$HOME/.screenrc" -s "-$SHELL"
else
exec screen -U -c /etc/grml/screenrc_generic -s "-$SHELL"
fi

## END OF FILE #################################################################
1 change: 1 addition & 0 deletions config/scripts/GRMLBASE/01-autoconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ fcopy -M -v /usr/share/grml-autoconfig/autoconfig.functions

fcopy -m root,root,0755 /usr/share/grml-autoconfig/grml-autoconfig
fcopy -m root,root,0644 /usr/share/grml-autoconfig/language-functions
fcopy -m root,root,0755 /usr/share/grml-autoconfig/run-screen
fcopy -m root,root,0755 /usr/share/grml-autoconfig/run-welcome
fcopy -m root,root,0755 -v /usr/bin/restore-config
fcopy -m root,root,0755 -v /usr/bin/save-config
Expand Down