Changeset 2e921f5 in freewrt

Timestamp:

Mar 13, 2007, 11:52:53 PM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Children:

3257946

Parents:

ea719e3

Message:

• /etc/preinit.arch is sourced, doesn't need to be executable or have a shebang line
• also, whitespace cleanup and simplification
• new: /etc/init.d/rcK calls /etc/rc.shutdown¹ and then /etc/init.d/K* scripts just like /etc/init.d/rc.S runs /etc/init.d/S* scripts and then /etc/rc.local -> derived from PR#246, thanks for the input, agreed to commit wbx@
• /etc/S* and /etc/K* scripts do not need to be executable any more or have a shebang line, they're called from /bin/sh now
• new: /etc/init.d/K20hotplug, from PR#246
• new: /etc/init.d/K00wan, from /etc/profile (“reboot” function), ok wbx@
• remove /etc/version – even wbx@ was surprised it still exists
• /etc/S* and /etc/K* scripts, /etc/init.d/rcS and /etc/init.d/rcK now sanitise $PATH
• clean up /etc/profile
• /sbin/hotplug now calls its scripts from /etc/hotplug.d/ with /bin/sh instead of sourcing them, thus being more reliable
• simplify /sbin/hotplug

¹) just like /etc/rc.local, /etc/rc.shutdown SHALL NEVER be created by ADK.

It's for the user to play with ONLY.

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

Files:

• package/base-files/Makefile (modified) (1 diff)
• package/base-files/files/etc/init.d/K00wan (added)
• package/base-files/files/etc/init.d/K20hotplug (added)
• package/base-files/files/etc/init.d/S10boot (modified) (1 diff, 1 prop)
• package/base-files/files/etc/init.d/S98done (modified) (1 diff, 1 prop)
• package/base-files/files/etc/init.d/rcK (added)
• package/base-files/files/etc/init.d/rcS (modified) (2 diffs)
• package/base-files/files/etc/inittab (modified) (1 diff)
• package/base-files/files/etc/profile (modified) (1 diff)
• package/base-files/files/etc/version (deleted)
• package/base-files/files/sbin/hotplug (modified) (1 diff)
• target/linux/brcm-2.4/asus-wl500g-deluxe/files/etc/init.d/S15switch (modified) (1 prop)
• target/linux/brcm-2.4/asus-wl500g-deluxe/files/etc/preinit.arch (modified) (2 diffs, 1 prop)
• target/linux/brcm-2.4/asus-wl500g-premium/files/etc/preinit.arch (modified) (2 diffs, 1 prop)
• target/linux/brcm-2.4/asus-wl500g/files/etc/preinit.arch (modified) (1 diff, 1 prop)
• target/linux/brcm-2.4/linksys-wrt54g-4/files/etc/preinit.arch (modified) (2 diffs, 1 prop)
• target/linux/brcm-2.4/linksys-wrt54g/files/etc/preinit.arch (modified) (2 diffs, 1 prop)
• target/linux/brcm-2.4/linksys-wrt54g3g/files/etc/preinit.arch (modified) (2 diffs, 1 prop)
• target/linux/brcm-2.4/linksys-wrt54gs-4/files/etc/preinit.arch (modified) (2 diffs, 1 prop)
• target/linux/brcm-2.4/linksys-wrt54gs/files/etc/preinit.arch (modified) (1 diff, 1 prop)
• target/linux/brcm-2.4/netgear-wgt634u/files/etc/preinit.arch (modified) (1 diff, 1 prop)
• target/linux/brcm-2.4/squashfs-overlay/files/etc/init.d/S20jffsclean (modified) (1 diff, 1 prop)

package/base-files/Makefile

@@ -10 +10 @@
 PKG_NAME:=              base-files
 PKG_VERSION:=           1.0
-PKG_RELEASE:=           20
+PKG_RELEASE:=           21
 WRKDIST=                ${WRKDIR}/base-files
 NO_DISTFILES:=          1       # should be Yes, but gmake sucks

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

@@ -1 @@
-#!/bin/sh
 . /etc/functions.sh
 

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

@@ -1 @@
-#!/bin/sh
 sysctl -p >&-

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
@@ -8 +9 @@
                 test -e /etc/rc.local && (/bin/sh /etc/rc.local) 2>&1
         else
-                $i autostart 2>&1
+                /bin/sh $i autostart 2>&1
         fi
 done | logger -s -p 6 -t '' &

package/base-files/files/etc/inittab

@@ -1 +1 @@
 ::sysinit:/etc/init.d/rcS
+::shutdown:/etc/init.d/rcK
 tts/0::askfirst:-/bin/sh

package/base-files/files/etc/profile

@@ -1 @@
-PATH=/bin:/sbin:/usr/bin:/usr/sbin
-PS1='\u@\h:\w\$ '
-
-export PATH PS1
-
+export PATH=/bin:/sbin:/usr/bin:/usr/sbin PS1='\u@\h:\w\$ '
 cat /etc/banner 2>&-
-
 [ -x /usr/bin/less ] || alias less=more
 [ -x /usr/bin/vim ] || alias vim=vi
+[ -x /usr/bin/arp ] || arp() { cat /proc/net/arp; }
+[ -x /usr/bin/ldd ] || ldd() { LD_TRACE_LOADED_OBJECTS=1 "$@"; }
 alias ll="ls -l"
-
-[ -x /usr/bin/arp ] || arp() { cat /proc/net/arp; }
-[ -x /usr/bin/ldd ] || ldd() { LD_TRACE_LOADED_OBJECTS=1 $*; }
-reboot() { ifdown wan >&- 2>&-; /sbin/reboot "$@"; }
-
 [ -z "$KSH_VERSION" -o \! -s /etc/mkshrc ] || . /etc/mkshrc

package/base-files/files/sbin/hotplug

@@ -6 +6 @@
 export PATH LOGNAME USER
 
-[ \! -z "$1" -a -d /etc/hotplug.d/$1 ] && {
-        for script in $(ls /etc/hotplug.d/$1/* 2>&-); do (
-                [ -f $script ] && . $script
-        ); done
-}
+test x"$1" = x"" || if test -d "/etc/hotplug.d/$1"; then
+        cd "/etc/hotplug.d/$1"
+        for script in *; do
+                [ -f "$script" ] && /bin/sh "$script"
+        done
+fi
+exit 0

target/linux/brcm-2.4/asus-wl500g-deluxe/files/etc/preinit.arch

@@ -1 @@
-#!/bin/sh
-
 # load diag led and button module
 insmod diag
@@ -23 +21 @@
         nvram set freewrt_fixup=1
         nvram commit
-fi      
+fi

target/linux/brcm-2.4/asus-wl500g-premium/files/etc/preinit.arch

@@ -1 @@
-#!/bin/sh
-
 # load diag led and button module
 insmod diag
@@ -26 +24 @@
         nvram set freewrt_fixup=1
         nvram commit
-fi      
+fi

target/linux/brcm-2.4/asus-wl500g/files/etc/preinit.arch

@@ -1 @@
-#!/bin/sh
 insmod diag

target/linux/brcm-2.4/linksys-wrt54g-4/files/etc/preinit.arch

@@ -1 @@
-#!/bin/sh
 [ "$(nvram get boot_wait)" != "on" ] && {
         nvram set boot_wait=on
@@ -11 +10 @@
 insmod switch-core
 insmod switch-robo
-

target/linux/brcm-2.4/linksys-wrt54g/files/etc/preinit.arch

@@ -1 @@
-#!/bin/sh
 [ "$(nvram get boot_wait)" != "on" ] && {
         nvram set boot_wait=on
@@ -12 +11 @@
 insmod switch-robo
 insmod switch-adm
-

target/linux/brcm-2.4/linksys-wrt54g3g/files/etc/preinit.arch

@@ -1 @@
-#!/bin/sh
 [ "$(nvram get boot_wait)" != "on" ] && {
         nvram set boot_wait=on
@@ -11 +10 @@
 insmod switch-core
 insmod switch-robo
-

target/linux/brcm-2.4/linksys-wrt54gs-4/files/etc/preinit.arch

@@ -1 @@
-#!/bin/sh
 [ "$(nvram get boot_wait)" != "on" ] && {
         nvram set boot_wait=on
@@ -11 +10 @@
 insmod switch-core
 insmod switch-robo
-

target/linux/brcm-2.4/linksys-wrt54gs/files/etc/preinit.arch

@@ -1 @@
-#!/bin/sh
 [ "$(nvram get boot_wait)" != "on" ] && {
         nvram set boot_wait=on

target/linux/brcm-2.4/netgear-wgt634u/files/etc/preinit.arch

@@ -1 @@
-#!/bin/sh
-
 insmod diag
 echo 0x01 >/proc/sys/diag
 
 insmod switch-core
-insmod switch-robo 
-
+insmod switch-robo

target/linux/brcm-2.4/squashfs-overlay/files/etc/init.d/S20jffsclean

@@ -1 @@
-#!/bin/sh
 # if / is tmpfs, we have an old or broken jffs2
-# erase data partition and set flag between bootloader and kernel 
-{ mount|grep "on / type tmpfs" 1>&-; } && {
+# erase data partition and set flag between bootloader and kernel
+if mount | fgrep "on / type tmpfs" >/dev/null; then
         mtd erase data
         jffs2root --clean
         busybox reboot
-}
+fi