Update for kernel-4.14.13 and mdevd-0.1.0.0

21 files changed, 33 insertions, 57 deletions

diff --git a/layout/rootfs/etc/rc.init b/layout/rootfs/etc/rc.init
index 004ea90..579ef45 100755
--- a/layout/rootfs/etc/rc.init
+++ b/layout/rootfs/etc/rc.init
@@ -1,12 +1,5 @@
 #!/command/execlineb -P
 
-# Make sure the /dev/urandom entropy pool will be set in
-# a not-too-distant future. Ideally we'd block on this,
-# but it's not critical, so we don't.
-
-background -d { s6-fillurandompool }
-
-
 # Set the system clock to something sensible,
 # to get coherent logs until the initial NTP message
 
diff --git a/layout/rootfs/etc/rc.shutdown b/layout/rootfs/etc/rc.shutdown
index 9689fe9..ca63d14 100755
--- a/layout/rootfs/etc/rc.shutdown
+++ b/layout/rootfs/etc/rc.shutdown
@@ -1,21 +1,15 @@
-#!/command/execlineb -S0
+#!/command/execlineb -P
 
-foreground { s6-echo "Giving dying processes some grace time." }
-foreground { s6-sleep 2 }
-foreground { s6-echo "Syncing disks." }
-foreground { s6-sync }
-foreground { s6-echo "Sending all processes the TERM signal." }
-foreground { s6-nuke -th }
-foreground { s6-sleep 2 }
-foreground { s6-echo "Sending all processes the KILL signal." }
-foreground { s6-nuke -k }
-wait { }
+# Write a message to /var/log/syslogd
 
-foreground { s6-echo "Syncing and unmounting disks." }
-foreground { s6-sync }
+foreground
+{
+  s6-ipcclient -l0 /dev/log
+  fdmove 1 7
+  s6-echo "/etc/rc.shutdown requested"
+}
 
-foreground { s6-umount -a }
-foreground { s6-mount -ro remount /dev/root / }
 
-foreground { s6-echo "\nPerforming "${1}"." }
-s6-${1} -f
+# Shut down all services
+
+s6-rc -da change
diff --git a/layout/rootfs/etc/rc.tini b/layout/rootfs/etc/rc.tini
deleted file mode 100755
index 67a79b3..0000000
--- a/layout/rootfs/etc/rc.tini
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/command/execlineb -P
-
-# Write a message to /var/log/syslogd
-
-foreground
-{
-  s6-ipcclient -l0 /dev/log
-  fdmove 1 7
-  s6-echo "/etc/rc.tini: shutdown requested"
-}
-
-
-# Shut down all services
-
-s6-rc -da change
diff --git a/layout/rootfs/etc/s6-linux-init/run-image/service/.s6-svscan/SIGHUP b/layout/rootfs/etc/s6-linux-init/run-image/service/.s6-svscan/SIGHUP
index ffdd1bb..e45fc97 100755
--- a/layout/rootfs/etc/s6-linux-init/run-image/service/.s6-svscan/SIGHUP
+++ b/layout/rootfs/etc/s6-linux-init/run-image/service/.s6-svscan/SIGHUP
@@ -1,4 +1,4 @@
 #!/package/admin/execline/command/execlineb -P
 
-foreground { "/etc/rc.tini" }
+foreground { "/etc/rc.shutdown" }
 s6-svscanctl -h -- "/run"/service
diff --git a/layout/rootfs/etc/s6-linux-init/run-image/service/.s6-svscan/SIGINT b/layout/rootfs/etc/s6-linux-init/run-image/service/.s6-svscan/SIGINT
index 02fdc52..720ac95 100755
--- a/layout/rootfs/etc/s6-linux-init/run-image/service/.s6-svscan/SIGINT
+++ b/layout/rootfs/etc/s6-linux-init/run-image/service/.s6-svscan/SIGINT
@@ -1,4 +1,4 @@
 #!/package/admin/execline/command/execlineb -P
 
-foreground { "/etc/rc.tini" }
+foreground { "/etc/rc.shutdown" }
 s6-svscanctl -6 -- "/run"/service
diff --git a/layout/rootfs/etc/s6-linux-init/run-image/service/.s6-svscan/SIGQUIT b/layout/rootfs/etc/s6-linux-init/run-image/service/.s6-svscan/SIGQUIT
index 0ca5346..b741a3c 100755
--- a/layout/rootfs/etc/s6-linux-init/run-image/service/.s6-svscan/SIGQUIT
+++ b/layout/rootfs/etc/s6-linux-init/run-image/service/.s6-svscan/SIGQUIT
@@ -1,4 +1,4 @@
 #!/package/admin/execline/command/execlineb -P
 
-foreground { "/etc/rc.tini" }
+foreground { "/etc/rc.shutdown" }
 s6-svscanctl -q -- "/run"/service
diff --git a/layout/rootfs/etc/s6-linux-init/run-image/service/.s6-svscan/SIGTERM b/layout/rootfs/etc/s6-linux-init/run-image/service/.s6-svscan/SIGTERM
index 329830d..646befa 100755
--- a/layout/rootfs/etc/s6-linux-init/run-image/service/.s6-svscan/SIGTERM
+++ b/layout/rootfs/etc/s6-linux-init/run-image/service/.s6-svscan/SIGTERM
@@ -1,4 +1,4 @@
 #!/package/admin/execline/command/execlineb -P
 
-foreground { "/etc/rc.tini" }
+foreground { "/etc/rc.shutdown" }
 s6-svscanctl -t -- "/run"/service
diff --git a/layout/rootfs/etc/s6-linux-init/run-image/service/.s6-svscan/SIGUSR1 b/layout/rootfs/etc/s6-linux-init/run-image/service/.s6-svscan/SIGUSR1
index 8580a65..b1ffb93 100755
--- a/layout/rootfs/etc/s6-linux-init/run-image/service/.s6-svscan/SIGUSR1
+++ b/layout/rootfs/etc/s6-linux-init/run-image/service/.s6-svscan/SIGUSR1
@@ -1,4 +1,4 @@
 #!/package/admin/execline/command/execlineb -P
 
-foreground { "/etc/rc.tini" }
+foreground { "/etc/rc.shutdown" }
 s6-svscanctl -7 -- "/run"/service
diff --git a/layout/rootfs/etc/s6-linux-init/run-image/service/.s6-svscan/SIGUSR2 b/layout/rootfs/etc/s6-linux-init/run-image/service/.s6-svscan/SIGUSR2
index 54c54b8..2b79985 100755
--- a/layout/rootfs/etc/s6-linux-init/run-image/service/.s6-svscan/SIGUSR2
+++ b/layout/rootfs/etc/s6-linux-init/run-image/service/.s6-svscan/SIGUSR2
@@ -1,4 +1,4 @@
 #!/package/admin/execline/command/execlineb -P
 
-foreground { "/etc/rc.tini" }
+foreground { "/etc/rc.shutdown" }
 s6-svscanctl -0 -- "/run"/service
diff --git a/layout/rootfs/etc/s6-linux-init/run-image/service/.s6-svscan/finish b/layout/rootfs/etc/s6-linux-init/run-image/service/.s6-svscan/finish
index d6aaa00..7629cc4 100755
--- a/layout/rootfs/etc/s6-linux-init/run-image/service/.s6-svscan/finish
+++ b/layout/rootfs/etc/s6-linux-init/run-image/service/.s6-svscan/finish
@@ -6,4 +6,15 @@ fdmove -c 1 2
 foreground { s6-svc -X -- "/run"/service/s6-svscan-log }
 unexport ?
 wait -r -- { }
-"/etc/rc.shutdown" ${@}
+foreground { s6-echo "Syncing disks." }
+foreground { s6-sync }
+foreground { s6-echo "Sending all processes the TERM signal." }
+foreground { s6-nuke -th }
+foreground { s6-sleep 2 }
+foreground { s6-echo "Sending all processes the KILL signal." }
+foreground { s6-nuke -k }
+wait { }
+foreground { s6-echo "Unmounting disks and shutting down." }
+foreground { s6-umount -a }
+foreground { s6-mount -ro remount /dev/root / }
+s6-${1} -f
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-coldplug/dependencies b/layout/rootfs/etc/s6-rc/source-base/init-coldplug/dependencies
index c1ee812..18fefaa 100644
--- a/layout/rootfs/etc/s6-rc/source-base/init-coldplug/dependencies
+++ b/layout/rootfs/etc/s6-rc/source-base/init-coldplug/dependencies
@@ -1 +1,2 @@
 init-dev
+mdevd
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-coldplug/up b/layout/rootfs/etc/s6-rc/source-base/init-coldplug/up
index 8d668da..edc5c1b 100644
--- a/layout/rootfs/etc/s6-rc/source-base/init-coldplug/up
+++ b/layout/rootfs/etc/s6-rc/source-base/init-coldplug/up
@@ -1 +1 @@
-pipeline { mdevd-coldplug } mdevd
+mdevd-coldplug
diff --git a/layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/dependencies b/layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/dependencies
deleted file mode 100644
index c1ee812..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-init-dev
diff --git a/layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/pipeline-name b/layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/pipeline-name
deleted file mode 100644
index 0d284a9..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/pipeline-name
+++ /dev/null
@@ -1 +0,0 @@
-mdevd-pipeline
diff --git a/layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/producer-for b/layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/producer-for
deleted file mode 100644
index 3252ded..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/producer-for
+++ /dev/null
@@ -1 +0,0 @@
-mdevd
diff --git a/layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/run b/layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/run
deleted file mode 100755
index aa30b24..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/command/execlineb -P
-exec -c
-mdevd-netlink -d 3
diff --git a/layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/type b/layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/type
deleted file mode 100644
index 5883cff..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/type
+++ /dev/null
@@ -1 +0,0 @@
-longrun
diff --git a/layout/rootfs/etc/s6-rc/source-base/mdevd/consumer-for b/layout/rootfs/etc/s6-rc/source-base/mdevd/consumer-for
deleted file mode 100644
index ca025df..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/mdevd/consumer-for
+++ /dev/null
@@ -1 +0,0 @@
-mdevd-netlink
diff --git a/layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/notification-fd b/layout/rootfs/etc/s6-rc/source-base/mdevd/notification-fd
index 00750ed..00750ed 100644
--- a/layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/notification-fd
+++ b/layout/rootfs/etc/s6-rc/source-base/mdevd/notification-fd
diff --git a/layout/rootfs/etc/s6-rc/source-base/mdevd/run b/layout/rootfs/etc/s6-rc/source-base/mdevd/run
index 52b5fdc..7144bc9 100755
--- a/layout/rootfs/etc/s6-rc/source-base/mdevd/run
+++ b/layout/rootfs/etc/s6-rc/source-base/mdevd/run
@@ -1,4 +1,4 @@
 #!/command/execlineb -P
 exec -c
 export PATH /command:/bin
-mdevd
+mdevd -D 3
diff --git a/layout/rootfs/etc/s6-rc/source-base/ok-local/contents b/layout/rootfs/etc/s6-rc/source-base/ok-local/contents
index 242cfed..cbe3499 100644
--- a/layout/rootfs/etc/s6-rc/source-base/ok-local/contents
+++ b/layout/rootfs/etc/s6-rc/source-base/ok-local/contents
@@ -1,4 +1,4 @@
-mdevd-pipeline
+mdevd
 syslogd-pipeline
 klogd-pipeline
 fdholder-pipeline