runit-scripts: handle bootlogd in 1 and improve plymouth in 3

3 files changed, 11 insertions, 3 deletions

diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD
index 097c704..35620e6 100755
--- a/abs/core/runit-scripts/PKGBUILD
+++ b/abs/core/runit-scripts/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=runit-scripts
 pkgver=8.3
-pkgrel=1
+pkgrel=2
 pkgdesc="collection of startup scripts for runit"
 url="http://smarden.org/runit/"
 license="BSD"
diff --git a/abs/core/runit-scripts/runitscripts/1 b/abs/core/runit-scripts/runitscripts/1
index 9f92530..05c3707 100755
--- a/abs/core/runit-scripts/runitscripts/1
+++ b/abs/core/runit-scripts/runitscripts/1
@@ -55,4 +55,10 @@ run_hook multi_start
 mountpoint -q /proc/sys/fs/binfmt_misc || mount /proc/sys/fs/binfmt_misc &>/dev/null || mount -t binfmt_misc binfmt /proc/sys/fs/binfmt_misc
 /usr/lib/systemd/systemd-binfmt
 
+# Stop bootlogd and clean up /var/log/boot
+bootlogd_stop
+sed -i -r -e 's/\^\[\[[0-9]?;?[0-9]?[0-9]?;?[0-9]?[0-9]?[ms]//g' \
+          -e 's/\^\[(\[1?[0-9]1|%)G//g' -e 's/\^\[\[0;1//g' \
+          -e 's/\^\[(\[?[0-9]{1,})G//g' /var/log/boot
+
 rm -f /run/nologin
diff --git a/abs/core/runit-scripts/runitscripts/3 b/abs/core/runit-scripts/runitscripts/3
index 062f2c6..2a9fb0d 100755
--- a/abs/core/runit-scripts/runitscripts/3
+++ b/abs/core/runit-scripts/runitscripts/3
@@ -13,6 +13,10 @@ if [ -e "$pidfile" ]; then
     plypid=`cat "$pidfile"`
     if [ -n "$plypid" ]; then
         kill -s CONT "$plypid"
+        plymouthd --mode=shutdown --pid-file=/run/plymouthd
+        plymouth --show-splash
+        kill "$plypid"
+        add_omit_pids `cat /run/plymouthd`
     fi
 fi
 
@@ -42,6 +46,4 @@ ethtool -s  eth0 wol g 2>/dev/null
 ethtool -s  eth1 wol g 2>/dev/null
 ethtool -s  eth2 wol g 2>/dev/null
 
-plymouth quit --retain-splash
-
 /etc/rc.shutdown