Misc bugfix for issues starting on serial console.
* 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.
This commit is contained in:
parent
7ca0763103
commit
9065a68dc8
|
@ -0,0 +1,6 @@
|
||||||
|
#!/bin/sh
|
||||||
|
set -e
|
||||||
|
|
||||||
|
echo -n 'Press enter to configure: '
|
||||||
|
read REPLY
|
||||||
|
exec console-conf --serial "$@"
|
|
@ -1,3 +1,13 @@
|
||||||
|
subiquity (0.0.13) UNRELEASED; urgency=medium
|
||||||
|
|
||||||
|
* 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.
|
||||||
|
|
||||||
|
-- Mathieu Trudel-Lapierre <cyphermox@ubuntu.com> Tue, 30 Aug 2016 13:57:46 -0400
|
||||||
|
|
||||||
subiquity (0.0.12) yakkety; urgency=medium
|
subiquity (0.0.12) yakkety; urgency=medium
|
||||||
|
|
||||||
[ Mathieu Trudel-Lapierre ]
|
[ Mathieu Trudel-Lapierre ]
|
||||||
|
|
|
@ -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 --noclear -l /usr/bin/console-conf-wrapper %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-wrapper usr/share/subiquity
|
bin/console-conf-wrapper usr/share/subiquity
|
||||||
|
bin/console-conf-serial-wrapper usr/share/subiquity
|
||||||
usr/share/subiquity/console_conf
|
usr/share/subiquity/console_conf
|
||||||
|
|
|
@ -1,2 +1 @@
|
||||||
/usr/share/subiquity/console-conf-tui /usr/bin/console-conf
|
/usr/share/subiquity/console-conf-tui /usr/bin/console-conf
|
||||||
/usr/share/subiquity/console-conf-wrapper /usr/bin/console-conf-wrapper
|
|
||||||
|
|
|
@ -8,7 +8,7 @@ ConditionPathExists=!/var/lib/console-conf/complete
|
||||||
[Service]
|
[Service]
|
||||||
Environment=PYTHONPATH=/usr/share/subiquity
|
Environment=PYTHONPATH=/usr/share/subiquity
|
||||||
ExecStartPre=/bin/systemctl stop serial-getty@%I
|
ExecStartPre=/bin/systemctl stop serial-getty@%I
|
||||||
ExecStart=-/sbin/agetty -n --noclear -l /usr/bin/console-conf-wrapper --serial %I $TERM
|
ExecStart=-/sbin/agetty -n --noclear -l /usr/share/subiquity/console-conf-serial-wrapper %I $TERM
|
||||||
ExecStop=/bin/systemctl start serial-getty@%I
|
ExecStop=/bin/systemctl start serial-getty@%I
|
||||||
Type=idle
|
Type=idle
|
||||||
Restart=always
|
Restart=always
|
||||||
|
|
Loading…
Reference in New Issue