From 2cb18b43e4b753f4cd5d72d91f005a1593812a73 Mon Sep 17 00:00:00 2001
From: Mike Staszel <mikestaszel@gmail.com>
Date: Sun, 2 Jan 2011 01:20:35 -0600
Subject: [PATCH] new initscripts for 2011 with better LED support

---
 core/initscripts/PKGBUILD    | 32 +++++++++++++++++++++-----------
 core/initscripts/rc.shutdown | 33 ++++++++++++++++-----------------
 2 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/core/initscripts/PKGBUILD b/core/initscripts/PKGBUILD
index f5f2e82e1..bd2e0a509 100755
--- a/core/initscripts/PKGBUILD
+++ b/core/initscripts/PKGBUILD
@@ -1,14 +1,19 @@
 # Maintainer: Mike Staszel <mikestaszel@plugboxlinux.org>
 
+# Plugbox changes: inittab has a line for ttyS0 at 115200
+#                  rc.shutdown has an LED turn-off line
+#                  rc.conf is different
+#                  rc.sysinit has our copyright info
+
 pkgname=initscripts
-pkgver=2010.11
+pkgver=2011.01
 pkgrel=1
 pkgdesc="System initialization/bootup scripts"
 arch=('arm')
 url="http://www.plugboxlinux.org"
 license=('GPL')
 groups=('base')
-backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown)
+backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown etc/conf.d/wireless)
 depends=('glibc' 'bash' 'awk' 'grep' 'coreutils' 'sed' 'udev>=139-1'
          'net-tools' 'ncurses' 'kbd' 'findutils' 'sysvinit')
 optdepends=('bridge-utils: Network bridging support'
@@ -19,6 +24,7 @@ source=(adjtime.cron
 	functions
 	inittab
 	install.sh
+	minilogd
 	minilogd.c
 	netfs
 	network
@@ -28,24 +34,28 @@ source=(adjtime.cron
 	rc.multi
 	rc.shutdown
 	rc.single
-	rc.sysinit)
+	rc.sysinit
+	wireless.conf.d)
 
 md5sums=('c03a4a5be5e2579b59e0dcd6a21d310b'
-	 '3f63494a13668789e99606aad059e8a4'
-	 '5bd94c5ea67521b6b3e94b45ddec808a'
+	 '5a09834b409f579d02b22cd603bc4ea5'
+	 'd73d9303e5aae968b6e1c300f4a4fb0f'
 	 '3fb0b6e945065ba1d283f136d17d612e'
-	 'ae343387b55279b8aa872c54b2ac0e50'
+	 '505290bcaaffe1b3198d0e978a5aeab2'
+	 '2c2dcc7ce7586f27fc5e6887f8ec74b8'
 	 '96fdb70f95844d95a9941ee319601e8d'
-	 'b61c592e400ab0cd0bb85eec5b82719f'
-	 'f4743ece29da4980c34f1c7a27d033db'
+	 'faecfa79b6a19e4f947cb1e1c683f7f2'
+	 '5d838064143eb66491df92a6a21bbc5b'
 	 'bd236a57bc00aa4727b98c5ae401c457'
 	 '669ce6d766dd9deb86686219f3763fe4'
-	 '8c94c7faaa17f0f4971cff19da047e44'
-	 'faff655ea188e1dac232e9c1c4b9f4f8'
+	 '3dfa8c33cf3fac7b1721e280225498b9'
+	 '53ab5e1327105bd054eb634ee73fe589'
 	 '230b25d02b0c2f99b9d1053ebcb9694f'
-	 '47e3f38b25f8482d4ccb5939b30bdca1')
+	 '8b0c2132217c4b03493cdea26415a424'
+	 '027576534885b8d5dded9be546057b12')
 
 build() {
   cd ${srcdir}/
   DESTDIR=${pkgdir} ./install.sh
+  install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless
 }
diff --git a/core/initscripts/rc.shutdown b/core/initscripts/rc.shutdown
index acdcf1ce3..754e88458 100755
--- a/core/initscripts/rc.shutdown
+++ b/core/initscripts/rc.shutdown
@@ -105,18 +105,18 @@ stat_done
 # Kill non-root encrypted partition mappings
 if [ -f /etc/crypttab -a -n "$(/bin/grep -v ^# /etc/crypttab | /bin/grep -v ^$)" ]; then
 	stat_busy "Deactivating encrypted volumes:"
-        # Arch cryptsetup packages traditionally contained the binaries
-        #  /usr/sbin/cryptsetup
-        #  /sbin/cryptsetup.static
-        # By default, initscripts used the /sbin/cryptsetup.static.
-        # Newer packages will only have /sbin/cryptsetup and no static binary
-        # This ensures maximal compatibility with the old and new layout
-        if [ -x /sbin/cryptsetup ]; then
-                CS=/sbin/cryptsetup
-        elif [ -x /usr/sbin/cryptsetup ]; then
-                CS=/usr/sbin/cryptsetup
-        else
-                CS=/sbin/cryptsetup.static
+	# Arch cryptsetup packages traditionally contained the binaries
+	#  /usr/sbin/cryptsetup
+	#  /sbin/cryptsetup.static
+	# By default, initscripts used the /sbin/cryptsetup.static.
+	# Newer packages will only have /sbin/cryptsetup and no static binary
+	# This ensures maximal compatibility with the old and new layout
+	if [ -x /sbin/cryptsetup ]; then
+		CS=/sbin/cryptsetup
+	elif [ -x /usr/sbin/cryptsetup ]; then
+		CS=/usr/sbin/cryptsetup
+	else
+		CS=/sbin/cryptsetup.static
 	fi
 	do_uncrypt() {
 		if [ $# -ge 3 ]; then
@@ -151,11 +151,9 @@ stat_done
 
 run_hook shutdown_poweroff
 
-# Turn LEDs off for Dockstar
-if [ -e "/sys/class/leds/dockstar:green:health/trigger" ]; then
-        echo none > /sys/class/leds/dockstar\:green\:health/trigger
-        echo none > /sys/class/leds/dockstar\:orange\:misc/trigger
-fi
+# Turn LEDs off
+
+/usr/bin/find /sys/ -path *led* -name *trigger* -exec sh -c '/bin/echo none > {}' \
 
 # Power off or reboot
 if [ "$RUNLEVEL" = "0" ]; then
@@ -171,3 +169,4 @@ else
 fi
 
 # End of file
+# vim: set ts=2 sw=2 noet: