More shuffling for gettys: reinstate the wrapper for VTs, make sure we display the issue file.
This commit is contained in:
parent
7c9f75b4ee
commit
98cf79175e
|
@ -0,0 +1,8 @@
|
||||||
|
#!/bin/sh
|
||||||
|
set -e
|
||||||
|
|
||||||
|
trap true HUP INT QUIT TSTP
|
||||||
|
|
||||||
|
cat /usr/share/subiquity/console-conf-wait
|
||||||
|
read REPLY
|
||||||
|
exec console-conf "$@"
|
|
@ -1,8 +1,8 @@
|
||||||
subiquity (0.0.13) UNRELEASED; urgency=medium
|
subiquity (0.0.13) UNRELEASED; urgency=medium
|
||||||
|
|
||||||
[ Mathieu Trudel-Lapierre ]
|
[ Mathieu Trudel-Lapierre ]
|
||||||
* bin/console-conf-wait: replace console-conf-wrapper with an issue file
|
* bin/console-conf-wait: add an issue file that agetty can show on screen
|
||||||
that agetty can show on screen while waiting for user input.
|
while waiting for user input. This is used directly for serial.
|
||||||
* debian/console-conf.*.service: configure agetty to wait 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
|
before running our login program (console-conf), and display our issue
|
||||||
file in the meantime. Always clear the screen, so that the issue text
|
file in the meantime. Always clear the screen, so that the issue text
|
||||||
|
@ -10,6 +10,12 @@ subiquity (0.0.13) UNRELEASED; urgency=medium
|
||||||
* debian/console-conf.serial-console-conf@.service: pass --serial as an
|
* debian/console-conf.serial-console-conf@.service: pass --serial as an
|
||||||
explicit login-program option to avoid it being seen as a parameter to
|
explicit login-program option to avoid it being seen as a parameter to
|
||||||
agetty.
|
agetty.
|
||||||
|
* debian/console-conf-wrapper: display the contents of our issue file
|
||||||
|
instead of a hard-coded string.
|
||||||
|
|
||||||
|
[ Steve Langasek ]
|
||||||
|
* debian/console-conf-wrapper: trap various signals in our shell script,
|
||||||
|
as they should be in console-conf itself.
|
||||||
|
|
||||||
[ Michael Hudson-Doyle ]
|
[ Michael Hudson-Doyle ]
|
||||||
* Prevent C-c, C-\ and C-x from exiting console-conf.
|
* Prevent C-c, C-\ and C-x from exiting console-conf.
|
||||||
|
|
|
@ -11,7 +11,7 @@ ConditionPathExists=!/var/lib/console-conf/complete
|
||||||
[Service]
|
[Service]
|
||||||
Environment=PYTHONPATH=/usr/share/subiquity
|
Environment=PYTHONPATH=/usr/share/subiquity
|
||||||
ExecStartPre=/bin/systemctl stop getty@%I
|
ExecStartPre=/bin/systemctl stop getty@%I
|
||||||
ExecStart=-/sbin/agetty -n --keep-baud -f /usr/share/subiquity/console-conf-wait -w -l /usr/bin/console-conf %I $TERM
|
ExecStart=-/sbin/agetty -n --noclear -l /usr/share/subiquity/console-conf-wrapper %I $TERM
|
||||||
ExecStop=/bin/systemctl start getty@%I
|
ExecStop=/bin/systemctl start getty@%I
|
||||||
#ExecStopPost=/bin/echo "Post stop, starting getty@%I"
|
#ExecStopPost=/bin/echo "Post stop, starting getty@%I"
|
||||||
#ExecStopPost=/bin/systemctl start getty@%I
|
#ExecStopPost=/bin/systemctl start getty@%I
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
bin/console-conf-tui usr/share/subiquity
|
bin/console-conf-tui usr/share/subiquity
|
||||||
bin/console-conf-wait usr/share/subiquity
|
bin/console-conf-wait usr/share/subiquity
|
||||||
|
bin/console-conf-wrapper usr/share/subiquity
|
||||||
usr/share/subiquity/console_conf
|
usr/share/subiquity/console_conf
|
||||||
|
|
Loading…
Reference in New Issue