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

Merge pull request #158 from CanonicalLtd/mwhudson/lp-1621142 

Use console-conf-wrapper on the serial line again.
This commit is contained in:
Mathieu Trudel-Lapierre 2016-09-13 14:51:18 -04:00 committed by GitHub
parent 6036f5e739 a4add7037d
commit 85e9545768
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/console-conf-wrapper
View File

@ -3,6 +3,11 @@ set -e
trap true HUP INT QUIT TSTP
# agetty only sets ICRNL if it has read the username and seen whether
# it was terminated by CR or NL. We pass -n to agetty so that hasn't
# happened and need to force it on. Yay UNIX!
stty icrnl
cat /usr/share/subiquity/console-conf-wait
read REPLY
exec 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 --keep-baud -f /usr/share/subiquity/console-conf-wait -w -l /usr/bin/console-conf --login-options "--serial" 115200,38400,9600 %I $TERM
ExecStart=/sbin/agetty -n --keep-baud -l /usr/share/subiquity/console-conf-wrapper --login-options "--serial" 115200,38400,9600 %I $TERM
ExecStopPost=/bin/systemctl start serial-getty@%I
Type=idle
Restart=always