Changeset 036ab9a in freewrt for package/base-files

Timestamp:

May 13, 2007, 12:36:00 AM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Children:

84afd92

Parents:

96f261f

Message:

by request of wbx@:

make it possible for users to do
| /etc/init.d/<foo> restart
instead of having to do
| /etc/init.d/S*<foo> restart
by moving the order into a magickal™ comment.

Untested.

Also remove the svn:executable properties, because rcS and rcK will
always call them with /bin/sh, and bump dashvers accordingly.

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@2485 afb5a338-a214-0410-bd46-81f09a774fd1

Location:

package/base-files

Files:

• Makefile (modified) (1 diff)
• files/etc/init.d/K20hotplug (deleted)
• files/etc/init.d/S10boot (deleted)
• files/etc/init.d/S98done (deleted)
• files/etc/init.d/boot (added)
• files/etc/init.d/done (added)
• files/etc/init.d/hotplug (added)
• files/etc/init.d/rcK (modified) (1 diff)
• files/etc/init.d/rcS (modified) (1 diff)

package/base-files/Makefile

@@ -10 +10 @@
 PKG_NAME:=              base-files
 PKG_VERSION:=           1.0
-PKG_RELEASE:=           24
+PKG_RELEASE:=           25
 WRKDIST=                ${WRKDIR}/base-files
 NO_DISTFILES:=          1

package/base-files/files/etc/init.d/rcK

@@ -1 +1 @@
 #!/bin/sh
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
-for i in x /etc/init.d/K*; do
-        if test x = "$i"; then
-                # /etc/rc.shutdown is for rcK what /etc/rc.local is for rcS
-                test -e /etc/rc.shutdown && (/bin/sh /etc/rc.shutdown) 2>&1
-        else
-                /bin/sh $i stop 2>&1
-        fi
-done | logger -s -p 6 -t ''
+{
+        test -e /etc/rc.shutdown && (/bin/sh /etc/rc.shutdown) 2>&1
+        grep '^#FWINIT ' /etc/init.d/* | \
+            sort -rnk2 | \
+            while read line; do
+                /bin/sh ${line%%:*} stop 2>&1
+        done
+} | logger -s -p 6 -t '' &

package/base-files/files/etc/init.d/rcS

@@ -1 +1 @@
 #!/bin/sh
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
-for i in /etc/init.d/S* x; do
-        if test x = "$i"; then
-                # if /etc/rc.local exists (it will never be created
-                # by the ADK, it's only for user customisation), it
-                # is run by the bourne shell after all init scripts
-                # have been processed.
-                test -e /etc/rc.local && (/bin/sh /etc/rc.local) 2>&1
-        else
-                /bin/sh $i autostart 2>&1
-        fi
-done | logger -s -p 6 -t '' &
+{
+        grep '^#FWINIT ' /etc/init.d/* | \
+            sort -nk2 | \
+            while read line; do
+                /bin/sh ${line%%:*} autostart 2>&1
+        done
+        test -e /etc/rc.local && (/bin/sh /etc/rc.local) 2>&1
+} | logger -s -p 6 -t '' &