StealthOS/subiquity
StealthOS
/
subiquity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Yet more agetty tweaks to start console-conf correctly in a lazy manner.

This commit is contained in:
Mathieu Trudel-Lapierre 2016-08-30 20:02:19 -04:00
parent e36e89ae83
commit 7c9f75b4ee
6 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bin/console-conf-wait Executable file
View File

@ -0,0 +1 @@
Press enter to configure.

10
bin/console-conf-wrapper
View File

@ -1,10 +0,0 @@
#!/bin/sh
set -e
trap true HUP INT QUIT TSTP
logger -t console-conf -- "Starting with parameters: $@"
echo -n 'Press enter to configure: '
read REPLY
exec console-conf "$@"

18
debian/changelog vendored
View File

@ -1,15 +1,15 @@
subiquity (0.0.13) UNRELEASED; urgency=medium
[ Mathieu Trudel-Lapierre ]
* debian/console-conf.*.serial: Start the console-conf wrappers from
their path in /usr/share/subiquity; no need to have them in /usr/bin.
* bin/console-conf-serial-wrapper: add --serial to the command-line.
* debian/console-conf.serial-console-conf@.service: don't pass --serial,
this is meant to be parameters to agetty, not to the login program.
[ Steve Langasek ]
* debian/console-conf-wrapper: trap various signals in our shell script,
as they should be in console-conf itself.
* bin/console-conf-wait: replace console-conf-wrapper with an issue file
that agetty can show on screen while waiting for user input.
* debian/console-conf.*.service: configure agetty to wait for user input
before running our login program (console-conf), and display our issue
file in the meantime. Always clear the screen, so that the issue text
isn't obscured by other line noise.
* debian/console-conf.serial-console-conf@.service: pass --serial as an
explicit login-program option to avoid it being seen as a parameter to
agetty.
[ Michael Hudson-Doyle ]
* Prevent C-c, C-\ and C-x from exiting console-conf.

2
debian/console-conf.console-conf@.service vendored
View File

@ -11,7 +11,7 @@ ConditionPathExists=!/var/lib/console-conf/complete
[Service]
Environment=PYTHONPATH=/usr/share/subiquity
ExecStartPre=/bin/systemctl stop getty@%I
ExecStart=-/sbin/agetty -n --noclear -l /usr/share/subiquity/console-conf-wrapper %I $TERM
ExecStart=-/sbin/agetty -n --keep-baud -f /usr/share/subiquity/console-conf-wait -w -l /usr/bin/console-conf %I $TERM
ExecStop=/bin/systemctl start getty@%I
#ExecStopPost=/bin/echo "Post stop, starting getty@%I"
#ExecStopPost=/bin/systemctl start getty@%I

2
debian/console-conf.install vendored
View File

@ -1,3 +1,3 @@
bin/console-conf-tui usr/share/subiquity
bin/console-conf-wrapper usr/share/subiquity
bin/console-conf-wait usr/share/subiquity
usr/share/subiquity/console_conf

2
debian/console-conf.serial-console-conf@.service vendored
View File

@ -8,7 +8,7 @@ ConditionPathExists=!/var/lib/console-conf/complete
[Service]
Environment=PYTHONPATH=/usr/share/subiquity
ExecStartPre=/bin/systemctl stop serial-getty@%I
ExecStart=-/sbin/agetty -n --noclear --keep-baud -l /usr/share/subiquity/console-conf-wrapper --login-options "--serial" 115200,38400,9600 %I $TERM
ExecStart=-/sbin/agetty -n --keep-baud -f /usr/share/subiquity/console-conf-wait -w -l /usr/bin/console-conf --login-options "--serial" 115200,38400,9600 %I $TERM
ExecStop=/bin/systemctl start serial-getty@%I
Type=idle
Restart=always