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

Merge pull request #149 from CanonicalLtd/mwhudson/lp-1618239 

Add a shell wrapper for console-conf
This commit is contained in:
Michael Hudson-Doyle 2016-08-30 12:40:30 +12:00 committed by GitHub
parent dd1cc527db e44c02b0cd
commit 0360e8caee
5 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/console-conf-wrapper Executable file
View File

@ -0,0 +1,6 @@
#!/bin/sh
set -e
echo -n 'Press enter to configure: '
read REPLY
exec 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/bin/console-conf %I $TERM
ExecStart=-/sbin/agetty -n --noclear -l /usr/bin/console-conf-wrapper %I $TERM
ExecStop=/bin/systemctl start getty@%I
#ExecStopPost=/bin/echo "Post stop, starting getty@%I"
#ExecStopPost=/bin/systemctl start getty@%I

1
debian/console-conf.install vendored
View File

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

1
debian/console-conf.links vendored
View File

@ -1 +1,2 @@
/usr/share/subiquity/console-conf-tui /usr/bin/console-conf
/usr/share/subiquity/console-conf-wrapper /usr/bin/console-conf-wrapper

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 -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
Type=idle
Restart=always