10 files changed, 61 insertions, 72 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 81fb1f6df..11fb4f507 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
 
 PKG_NAME:=		base-files
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		70
+PKG_RELEASE:=		72
 PKG_SECTION:=		base
 PKG_DESCR:=		basic files and scripts
 PKG_BUILDDEP:=		pkgconf-host file-host
diff --git a/package/base-files/src/etc/fstab b/package/base-files/src/etc/fstab
index 5c09c2510..d5f900202 100644
--- a/package/base-files/src/etc/fstab
+++ b/package/base-files/src/etc/fstab
@@ -6,3 +6,5 @@ devpts          /dev/pts       devpts   defaults,gid=5,mode=620   0      0
 tmpfs           /dev/shm       tmpfs    mode=0777         0      0
 tmpfs           /tmp           tmpfs    mode=1777         0      0
 sysfs           /sys           sysfs    defaults          0      0
+# example for cifs
+#//192.168.1.1/music     /music/test        cifs    ro,password=linux123,username=adk,iocharset=utf8,sec=ntlm     0       0
diff --git a/package/base-files/src/etc/init.d/boot b/package/base-files/src/etc/init.d/boot
index fc2f79ac2..f52e8dc78 100644
--- a/package/base-files/src/etc/init.d/boot
+++ b/package/base-files/src/etc/init.d/boot
@@ -4,6 +4,10 @@
 
 . /etc/functions.sh
 
+if [ -f /proc/sys/kernel/printk ];then
+	echo 0 > /proc/sys/kernel/printk
+fi
+
 # remount /dev with smaller size
 mount -o remount,nosuid,size=128k,mode=0755 -t tmpfs mdev /dev
 
@@ -15,7 +19,6 @@ mount -o remount,nosuid,nodev,mode=1777,size=${size}k -t tmpfs tmpfs /tmp
 # start mdev dynamic device node management
 echo >/dev/mdev.seq
 echo "/sbin/mdev" >/proc/sys/kernel/hotplug
-mdev -s
 
 # seed some random
 cat /etc/.rnd >/dev/urandom 2>&1
diff --git a/package/base-files/src/etc/init.d/fs b/package/base-files/src/etc/init.d/fs
index 75ae760e0..8f4397897 100644
--- a/package/base-files/src/etc/init.d/fs
+++ b/package/base-files/src/etc/init.d/fs
@@ -1,20 +1,53 @@
 #!/bin/sh
-#INIT 60
+#INIT 20
 [[ $1 = autostart ]] || exit 0
 
-# mount net filesystems (nfs/cifs)
-grep nfs /proc/filesystems  >/dev/null 2>&1
+# activate swap
+[ -x /sbin/swapon ] && { swapon -a; }
+
+# activate any logical volumes
+[ -x /usr/sbin/lvm ] && { lvm vgscan; lvm vgchange -ay; }
+
+# filesystem checks
+[ -x /sbin/fsck.ext2 ] && {
+	for i in $(grep -v "^#" /etc/fstab|grep ext2|awk '{ print $1}');do fsck.ext2 $i;done;
+}
+[ -x /sbin/fsck.ext3 ] && {
+	for i in $(grep -v "^#" /etc/fstab|grep ext3|awk '{ print $1}');do fsck.ext3 $i;done;
+}
+[ -x /sbin/fsck.ext4 ] && {
+	for i in $(grep -v "^#" /etc/fstab|grep ext4|awk '{ print $1}');do fsck.ext4 $i;done;
+}
+[ -x /sbin/fsck.xfs ] && {
+	for i in $(grep -v "^#" /etc/fstab|grep xfs|awk '{ print $1}');do xfs_repair $i;done;
+}
+# local filesystems
+grep ext2 /proc/filesystems  >/dev/null 2>&1
+if [ $? -eq 0 ];then
+	grep -v "^#" /etc/fstab |grep ext2 >/dev/null 2>&1
+	if [ $? -eq 0 ];then
+		mount -a -t ext2
+	fi
+fi
+grep ext3 /proc/filesystems  >/dev/null 2>&1
+if [ $? -eq 0 ];then
+	grep -v "^#" /etc/fstab |grep ext3 >/dev/null 2>&1
+	if [ $? -eq 0 ];then
+		mount -a -t ext3
+	fi
+fi
+grep ext4 /proc/filesystems  >/dev/null 2>&1
 if [ $? -eq 0 ];then
-	grep -v "^#" /etc/fstab| grep nfs >/dev/null 2>&1
+	grep -v "^#" /etc/fstab |grep ext4 >/dev/null 2>&1
 	if [ $? -eq 0 ];then
-		mount -a -t nfs
+		mount -a -t ext4
 	fi
 fi
-grep cifs /proc/filesystems  >/dev/null 2>&1
+grep xfs /proc/filesystems  >/dev/null 2>&1
 if [ $? -eq 0 ];then
-	grep -v "^#" /etc/fstab| grep cifs >/dev/null 2>&1
+	grep -v "^#" /etc/fstab |grep xfs >/dev/null 2>&1
 	if [ $? -eq 0 ];then
-		mount -a -t cifs
+		mount -a -t xfs
 	fi
 fi
 exit 0
diff --git a/package/base-files/src/etc/init.d/fsnet b/package/base-files/src/etc/init.d/fsnet
index 8f4397897..75ae760e0 100644
--- a/package/base-files/src/etc/init.d/fsnet
+++ b/package/base-files/src/etc/init.d/fsnet
@@ -1,53 +1,20 @@
 #!/bin/sh
-#INIT 20
+#INIT 60
 [[ $1 = autostart ]] || exit 0
 
-# activate swap
-[ -x /sbin/swapon ] && { swapon -a; }
-
-# activate any logical volumes
-[ -x /usr/sbin/lvm ] && { lvm vgscan; lvm vgchange -ay; }
-
-# filesystem checks
-[ -x /sbin/fsck.ext2 ] && {
-	for i in $(grep -v "^#" /etc/fstab|grep ext2|awk '{ print $1}');do fsck.ext2 $i;done;
-}
-[ -x /sbin/fsck.ext3 ] && {
-	for i in $(grep -v "^#" /etc/fstab|grep ext3|awk '{ print $1}');do fsck.ext3 $i;done;
-}
-[ -x /sbin/fsck.ext4 ] && {
-	for i in $(grep -v "^#" /etc/fstab|grep ext4|awk '{ print $1}');do fsck.ext4 $i;done;
-}
-[ -x /sbin/fsck.xfs ] && {
-	for i in $(grep -v "^#" /etc/fstab|grep xfs|awk '{ print $1}');do xfs_repair $i;done;
-}
-# local filesystems
-grep ext2 /proc/filesystems  >/dev/null 2>&1
-if [ $? -eq 0 ];then
-	grep -v "^#" /etc/fstab |grep ext2 >/dev/null 2>&1
-	if [ $? -eq 0 ];then
-		mount -a -t ext2
-	fi
-fi
-grep ext3 /proc/filesystems  >/dev/null 2>&1
-if [ $? -eq 0 ];then
-	grep -v "^#" /etc/fstab |grep ext3 >/dev/null 2>&1
-	if [ $? -eq 0 ];then
-		mount -a -t ext3
-	fi
-fi
-grep ext4 /proc/filesystems  >/dev/null 2>&1
+# mount net filesystems (nfs/cifs)
+grep nfs /proc/filesystems  >/dev/null 2>&1
 if [ $? -eq 0 ];then
-	grep -v "^#" /etc/fstab |grep ext4 >/dev/null 2>&1
+	grep -v "^#" /etc/fstab| grep nfs >/dev/null 2>&1
 	if [ $? -eq 0 ];then
-		mount -a -t ext4
+		mount -a -t nfs
 	fi
 fi
-grep xfs /proc/filesystems  >/dev/null 2>&1
+grep cifs /proc/filesystems  >/dev/null 2>&1
 if [ $? -eq 0 ];then
-	grep -v "^#" /etc/fstab |grep xfs >/dev/null 2>&1
+	grep -v "^#" /etc/fstab| grep cifs >/dev/null 2>&1
 	if [ $? -eq 0 ];then
-		mount -a -t xfs
+		mount -a -t cifs
 	fi
 fi
 exit 0
diff --git a/package/base-files/src/etc/init.d/rcK b/package/base-files/src/etc/init.d/rcK
index 9d0e06440..938882ae5 100755
--- a/package/base-files/src/etc/init.d/rcK
+++ b/package/base-files/src/etc/init.d/rcK
@@ -4,15 +4,6 @@ export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 	grep '^#INIT ' /etc/init.d/* | \
 	    sort -rnk2 | \
 	    while read line; do
-		shebang=$(sed -n '1s/^#![	 ]*//p' ${line%%:*})
-		case $shebang in
-		*[\	\ ]*) shebang=\'$(echo X"$shebang" | sed \
-		    -e 's/^X//' -e "s/'/'\\\\''/g" \
-		    -e 's/^\([^	 ][^	 ]*\)[	 ]*$/\1/' \
-		    -e 's/^\([^	 ][^	 ]*\)[	 ][	 ]*\(..*\)$/\1 \2/' \
-		    -e 's/^\([^ ][^ ]*\) /\1'\'' '\''/')\' ;;
-		esac
-		${shebang:-/bin/sh} ${line%%:*} autostop 2>&1
+		sh ${line%%:*} autostop
 	done
-	test -e /etc/rc.shutdown && (/bin/sh /etc/rc.shutdown) 2>&1
 } | logger -s -p 6 -t ''
diff --git a/package/base-files/src/etc/init.d/rcS b/package/base-files/src/etc/init.d/rcS
index 9daa8f5cd..e27bc9eb5 100755
--- a/package/base-files/src/etc/init.d/rcS
+++ b/package/base-files/src/etc/init.d/rcS
@@ -3,13 +3,13 @@
 if [ -f /proc/sys/kernel/printk ];then
 	echo 0 > /proc/sys/kernel/printk
 fi
+ln -s /proc/self/fd/2 /dev/stderr
 echo "System initialization ..."
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
-ln -s /proc/self/fd/2 /dev/stderr
 {
 	grep '^#INIT ' /etc/init.d/* | \
 	    sort -nk2 | \
 	    while read line; do
 		sh ${line%%:*} autostart
 	    done
-} | tee /dev/stderr |logger -p 6 -t ''
+} |tee /dev/stderr |logger -p 6 -t ''
diff --git a/package/base-files/src/etc/profile b/package/base-files/src/etc/profile
index ce425b54c..eb3015d46 100644
--- a/package/base-files/src/etc/profile
+++ b/package/base-files/src/etc/profile
@@ -12,3 +12,5 @@ cat /etc/banner 2>&-
 alias l='ls -lF'
 alias la='ls -A'
 alias ll='ls -alF'
+alias ro='mount -o remount,ro /'
+alias rw='mount -o remount,rw /'
diff --git a/package/base-files/src/etc/rc.shutdown b/package/base-files/src/etc/rc.shutdown
deleted file mode 100644
index 5a1a0aa78..000000000
--- a/package/base-files/src/etc/rc.shutdown
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-# add code for shutdown routine
diff --git a/package/base-files/src/init b/package/base-files/src/init
deleted file mode 100755
index a27548217..000000000
--- a/package/base-files/src/init
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-# devtmpfs does not get automounted for initramfs
-/bin/mount -t devtmpfs devtmpfs /dev
-exec 0</dev/console
-exec 1>/dev/console
-exec 2>/dev/console
-exec /sbin/init $*