autoinst

commit ec744ecd71093fb3a8fa647785758a7ce60d4fa5
parent 9c99ce4c030f714a7843154af1e7c915c8f733b6
Author: Morel Bérenger <berengermorel76@gmail.com>
Date:   Sun, 15 Nov 2020 19:18:29 +0100

fix bb-getty and runit/common

Diffstat:
M
TODO
 | 
3
++-
M
templates/generic/root/etc/runit/common
 | 
3
++-
M
templates/generic/root/etc/sv/bb-getty/run
 | 
4
++--

3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/TODO b/TODO
@@ -7,7 +7,8 @@ runit: move the service directory to a ramdisk
 runit: cgroups support;
 runit: disable/remove Debian's sysvinit stuff;
 runit: implement an option to automatically install a DHCP client on scanned NIC at boot or 1st-time boot?
-runit: normalize etc/log.run, etc/sv/udhcpc/run, etc/sv/getty-ttyX
+runit: implement a watcher, so that changes in /etc/service will result in either *copying/removing* the folder to/from $SVDIR (which should be on ramdisk) and let runit handle things from that point.
+runit: modify badconf() so that it writes a `./down` file instead of simply stopping sv
 runit: udev support
 kernel: verify both UEFI and legacy boot support;
 kernel: Secure boot support?
diff --git a/templates/generic/root/etc/runit/common b/templates/generic/root/etc/runit/common
@@ -2,8 +2,9 @@
 
 badconf()
 {
+	#echo $@ | tee ./down #beware the sharing!
 	echo $@
-	echo $@ > ./down
+	sv stop $SVNAME
 	exit 1
 }
 
diff --git a/templates/generic/root/etc/sv/bb-getty/run b/templates/generic/root/etc/sv/bb-getty/run
@@ -8,7 +8,7 @@ test -n "$TTY" || badconf "Unable to retrieve TTY name from \"$SVNAME\""
 test -c "$TTY" || badconf "$TTY is not a character special file"
 
 CONF="$(grep "^$TTY" /etc/bb.conf.d/getty)"
-BAUDRATE="$(echo $CONF | cut -d- -f2)"
-TERMTYPE="$(echo $CONF | cut -d- -f3)"
+BAUDRATE="$(echo $CONF | cut -d: -f2)"
+TERMTYPE="$(echo $CONF | cut -d: -f3)"
 echo "Starting getty on $TTY..."
 exec chpst -b getty busybox ${BAUDRATE:-9600} $TTY ${TERMTYPE:-linux}