use a drop-in file to run console-conf before getty
This commit is contained in:
parent
e4e9edacfd
commit
a21aba4f11
|
@ -1,3 +1,9 @@
|
|||
subiquity (0.0.7~4~xenial) UNRELEASED; urgency=medium
|
||||
|
||||
* Use a drop-in file to run console-conf before getty.
|
||||
|
||||
-- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Fri, 05 Aug 2016 13:53:29 +1200
|
||||
|
||||
subiquity (0.0.7~3~xenial) xenial; urgency=medium
|
||||
|
||||
[ Michael Hudson-Doyle ]
|
||||
|
|
|
@ -0,0 +1,3 @@
|
|||
[Unit]
|
||||
After=console-conf@%i.service
|
||||
Wants=console-conf@%i.service
|
|
@ -4,7 +4,6 @@ After=systemd-user-sessions.service plymouth-quit-wait.service
|
|||
ExecPreStart=systemctl stop getty@%I
|
||||
After=rc-local.service
|
||||
ExecStop=systemctl start getty@%I
|
||||
Before=getty.target
|
||||
IgnoreOnIsolate=yes
|
||||
ConditionPathExists=/dev/tty0
|
||||
ConditionPathExists=!/writable/firstboot-complete
|
||||
|
@ -26,14 +25,10 @@ TTYVHangup=yes
|
|||
TTYVTDisallocate=yes
|
||||
KillMode=process
|
||||
IgnoreSIGPIPE=no
|
||||
SendsSIGHUP=yes
|
||||
SendSIGHUP=yes
|
||||
|
||||
#KillMode=process
|
||||
#Restart=always
|
||||
#StandardInput=tty-force
|
||||
#StandardOutput=tty
|
||||
#StandardError=tty
|
||||
|
||||
[Install]
|
||||
WantedBy=getty.target
|
||||
DefaultInstance=tty1
|
||||
|
|
|
@ -1,6 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
systemctl enable console-conf@tty1.service
|
||||
systemctl enable serial-console-conf@ttyS1.service
|
|
@ -1,7 +1,6 @@
|
|||
[Unit]
|
||||
Description=Ubuntu Core Firstboot Configuration %I
|
||||
BindsTo=dev-%i.device
|
||||
#After=getty@tty.service
|
||||
After=dev-%i.device systemd-user-sessions.service plymouth-quit-wait.service
|
||||
After=rc-local.service
|
||||
ConditionPathExists=!/writable/firstboot-complete
|
||||
|
@ -19,7 +18,7 @@ TTYReset=yes
|
|||
TTYVHangup=yes
|
||||
KillMode=process
|
||||
IgnoreSIGPIPE=no
|
||||
SendsSIGHUP=yes
|
||||
SendSIGHUP=yes
|
||||
|
||||
#TTYVTDisallocate=yes
|
||||
#KillMode=process
|
||||
|
@ -27,6 +26,3 @@ SendsSIGHUP=yes
|
|||
#StandardInput=tty-force
|
||||
#StandardOutput=tty
|
||||
#StandardError=tty
|
||||
|
||||
[Install]
|
||||
WantedBy=getty.target
|
||||
|
|
|
@ -26,6 +26,10 @@ override_dh_python3:
|
|||
override_dh_installinit:
|
||||
dh_installinit --no-start --name=console-conf@
|
||||
dh_installinit --no-start --name=serial-console-conf@
|
||||
mkdir $(CURDIR)/debian/console-conf/lib/systemd/system/getty@.service.d/
|
||||
install -m 0644 $(CURDIR)/debian/console-conf.conf $(CURDIR)/debian/console-conf/lib/systemd/system/getty@.service.d/
|
||||
mkdir $(CURDIR)/debian/console-conf/lib/systemd/system/serial-getty@.service.d/
|
||||
install -m 0644 $(CURDIR)/debian/console-conf-serial.conf $(CURDIR)/debian/console-conf/lib/systemd/system/serial-getty@.service.d/
|
||||
|
||||
override_dh_auto_test:
|
||||
@echo "No tests."
|
||||
|
|
Loading…
Reference in New Issue