Merge pull request #149 from CanonicalLtd/mwhudson/lp-1618239
Add a shell wrapper for console-conf
This commit is contained in:
commit
0360e8caee
|
@ -0,0 +1,6 @@
|
||||||
|
#!/bin/sh
|
||||||
|
set -e
|
||||||
|
|
||||||
|
echo -n 'Press enter to configure: '
|
||||||
|
read REPLY
|
||||||
|
exec 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 --noclear -l /usr/bin/console-conf %I $TERM
|
ExecStart=-/sbin/agetty -n --noclear -l /usr/bin/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,2 +1,3 @@
|
||||||
bin/console-conf-tui usr/share/subiquity
|
bin/console-conf-tui usr/share/subiquity
|
||||||
|
bin/console-conf-wrapper usr/share/subiquity
|
||||||
usr/share/subiquity/console_conf
|
usr/share/subiquity/console_conf
|
||||||
|
|
|
@ -1 +1,2 @@
|
||||||
/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 --serial %I $TERM
|
ExecStart=-/sbin/agetty -n --noclear -l /usr/bin/console-conf-wrapper --serial %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