resolve merge conflicts

6 files changed, 18 insertions, 9 deletions

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 7091c8541..1b8bf812a 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:=		38
+PKG_RELEASE:=		41
 PKG_SECTION:=		base
 PKG_DESCR:=		basic files and scripts
 
@@ -51,6 +51,7 @@ endif
 	mkdir -p $(IDIR_BASE_FILES)/usr/{lib,bin}
 	chmod 755 $(IDIR_BASE_FILES)/lib/mdev/init
 	chmod 600 $(IDIR_BASE_FILES)/etc/shadow
+	chmod 600 $(IDIR_BASE_FILES)/etc/network/interfaces
 	ln -sf ../proc/mounts $(IDIR_BASE_FILES)/etc/mtab
 	rm -rf $(IDIR_BASE_FILES)/var
 	ln -sf tmp $(IDIR_BASE_FILES)/var
diff --git a/package/base-files/src/etc/init.d/rcK b/package/base-files/src/etc/init.d/rcK
index 20c47f5db..9d0e06440 100755
--- a/package/base-files/src/etc/init.d/rcK
+++ b/package/base-files/src/etc/init.d/rcK
@@ -1,7 +1,6 @@
 #!/bin/sh
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 {
-	test -e /etc/rc.shutdown && (/bin/sh /etc/rc.shutdown) 2>&1
 	grep '^#INIT ' /etc/init.d/* | \
 	    sort -rnk2 | \
 	    while read line; do
@@ -15,4 +14,5 @@ export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 		esac
 		${shebang:-/bin/sh} ${line%%:*} autostop 2>&1
 	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/mdev.conf b/package/base-files/src/etc/mdev.conf
index 69d9c0079..173a851f3 100644
--- a/package/base-files/src/etc/mdev.conf
+++ b/package/base-files/src/etc/mdev.conf
@@ -1,13 +1,15 @@
-rtc0 root:root 660 @ln -sf /dev/rtc0 /dev/rtc
-device-mapper 0:0 660 @mkdir /dev/mapper
-tun 0:0 660 >net/tun
 null 0:0 777
 zero 0:0 666
 u?random 0:0 644
-console 0:0 0600
+console 0:0 600
 ptmx 0:0 666
 tty 0:0 666
+tty[0-9]* 0:0 666
 ttyS* 0:0 640
+rtc0 root:root 660 @ln -sf /dev/rtc0 /dev/rtc
+device-mapper 0:0 660 @test -d /dev/mapper || mkdir /dev/mapper
+tun 0:0 660 >net/tun
+fb? root:video 660
 audio root:audio 660 >snd/audio
 dsp root:audio 660 >snd/dsp
 timer root:audio 660 >snd/timer
diff --git a/package/base-files/src/etc/rc.shutdown b/package/base-files/src/etc/rc.shutdown
new file mode 100644
index 000000000..85d9e0058
--- /dev/null
+++ b/package/base-files/src/etc/rc.shutdown
@@ -0,0 +1,5 @@
+#!/bin/sh
+for i in $(grep -v ^# /etc/fstab |awk '{ print $2 }');do
+	printf Unmounting $i
+	umount $i
+done
diff --git a/package/base-files/src/init b/package/base-files/src/init
index e290cee95..fc4ec8cb9 100755
--- a/package/base-files/src/init
+++ b/package/base-files/src/init
@@ -16,8 +16,7 @@ exec 0<>/dev/console >&0 2>&0
 echo >/dev/mdev.seq
 echo "/sbin/mdev" >/proc/sys/kernel/hotplug
 mdev -s
-mount -o remount,rw /
 cat /etc/.rnd >/dev/urandom 2>&1
-[ -x /sbin/cfgfs ] && { cfgfs setup; mount -o remount,ro /;}
-[ -f /etc/fstab ] && mount -a
+[ -x /sbin/cfgfs ] && { cfgfs setup; mount -o remount,ro /;} || mount -o remount,rw /
+[ -f /etc/fstab ] && fsck -p >/dev/null ; mount -a
 exec /sbin/init
diff --git a/package/base-files/src/usr/share/udhcpc/default.script b/package/base-files/src/usr/share/udhcpc/default.script
index 68c603496..415bf92a4 100755
--- a/package/base-files/src/usr/share/udhcpc/default.script
+++ b/package/base-files/src/usr/share/udhcpc/default.script
@@ -23,6 +23,8 @@ case $1 in
 		done
 	fi
 
+	touch /tmp/resolv.conf
+	ln -sf /tmp/resolv.conf $RESOLV_CONF
 	echo -n >$RESOLV_CONF
 	${domain:+echo search $domain} >>$RESOLV_CONF
 	for i in $dns; do