5 files changed, 17 insertions, 24 deletions
diff --git a/packages/slugos-init/files/boot/disk b/packages/slugos-init/files/boot/disk
index ede33a3ee6..e8d1f5245b 100755
--- a/packages/slugos-init/files/boot/disk
+++ b/packages/slugos-init/files/boot/disk
@@ -3,14 +3,14 @@
 # must be given) using options from the rest of
 # the command line.
 #
-/sbin/leds -A '!gr'
-#
 # Use the standard init path (see /etc/init.d/rcS)
 export PATH=/sbin:/bin:/usr/sbin:/usr/bin
 #
 # Load the helper functions
 . /etc/default/functions
 #
+leds boot system
+#
 if test -n "$1"
 then
 	device="$1"
diff --git a/packages/slugos-init/files/boot/flash b/packages/slugos-init/files/boot/flash
index e0bcebc9b8..12729d7b5d 100755
--- a/packages/slugos-init/files/boot/flash
+++ b/packages/slugos-init/files/boot/flash
@@ -1,14 +1,14 @@
 #!/bin/sh
 # boot from the current (flash) root partition
-# nothing need be done, make the power led flash
-# amber to indicate runlevel S
-/sbin/leds -A '!gr'
-exec /sbin/init
+# nothing need be done apart from setting the
+# system LED status correctly
+. /etc/default/functions
+leds beep
+leds boot system
+test -x /sbin/init && exec /sbin/init
 # fallback if /sbin/init has been deleted (bad!)
-# flashing amber/red - failed early boot
-# disk lights flashing: failed in flash boot!
-/sbin/leds +A '!g12'
+leds boot system panic
 exec <>/dev/console >&0 2>&0
-exec /sbin/sulogin
-exec /bin/sh
+test -x /sbin/sulogin && exec /sbin/sulogin
+test -x /bin/sh && exec /bin/sh
 exit 1
diff --git a/packages/slugos-init/files/boot/network b/packages/slugos-init/files/boot/network
index 02b226d1f3..599250e744 100755
--- a/packages/slugos-init/files/boot/network
+++ b/packages/slugos-init/files/boot/network
@@ -11,15 +11,6 @@
 # Now all the information for booting should be in the configuration
 # file.  Config the loopback and network interfaces.
 ifconfig lo 127.0.0.1 up
-mac="$(config mac)"
 iface="$(config iface)"
-if test -n "$mac" -a -n "$iface" -a "$mac" != "00:00:00:00:00:00" -a "$mac" != "FF:FF:FF:FF:FF:FF"
-then
-	if ifconfig "$iface" hw ether "$mac" &&
-	   ifup "$iface"
-	then
-		exit 0
-	fi
-fi
+test -n "$iface" && ifup "$iface"
 # exit code is true only if the interface config has succeeded
-exit 1
diff --git a/packages/slugos-init/files/boot/nfs b/packages/slugos-init/files/boot/nfs
index 534d8b7cb0..5f1cbbe323 100755
--- a/packages/slugos-init/files/boot/nfs
+++ b/packages/slugos-init/files/boot/nfs
@@ -3,7 +3,8 @@
 # must be given) using options from the rest of
 # the command line.
 #
-/sbin/leds -A '!gr'
+. /etc/default/functions
+leds boot system
 #
 # Use the standard init path (see /etc/init.d/rcS)
 export PATH=/sbin:/bin:/usr/sbin:/usr/bin
diff --git a/packages/slugos-init/files/boot/ram b/packages/slugos-init/files/boot/ram
index 66d46a7089..42ff8329f9 100755
--- a/packages/slugos-init/files/boot/ram
+++ b/packages/slugos-init/files/boot/ram
@@ -3,14 +3,15 @@
 # must be given) using options from the rest of
 # the command line.
 #
-/sbin/leds -A '!gr'
-#
 # Use the standard init path (see /etc/init.d/rcS)
 export PATH=/sbin:/bin:/usr/sbin:/usr/bin
 #
 # Load the helper functions
 . /etc/default/functions
 #
+leds beep double
+leds boot system
+#
 if test -n "$1"
 then
 	device="$1"