move sysfs to mount_root

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@3107 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/openwrt/package/base-files/Makefile b/openwrt/package/base-files/Makefile
index 9582627..e4753d0 100644 (file)
--- a/openwrt/package/base-files/Makefile
+++ b/openwrt/package/base-files/Makefile
@@ -55,6 +55,7 @@ $(IPKG_BASE):
        cp -a ./default/* $(IDIR_BASE)
        $(SED) 's,$$R,r$(REV),g' $(IDIR_BASE)/etc/banner
        $(SED) 's,$$S,$(BOARD)-$(KERNEL),g' $(IDIR_BASE)/etc/ipkg.conf
        cp -a ./default/* $(IDIR_BASE)
        $(SED) 's,$$R,r$(REV),g' $(IDIR_BASE)/etc/banner
        $(SED) 's,$$S,$(BOARD)-$(KERNEL),g' $(IDIR_BASE)/etc/ipkg.conf

+       mkdir -p $(IDIR_BASE)/sys

        mkdir -p $(IDIR_BASE)/jffs
        mkdir -p $(IDIR_BASE)/dev
        mkdir -p $(IDIR_BASE)/proc
        mkdir -p $(IDIR_BASE)/jffs
        mkdir -p $(IDIR_BASE)/dev
        mkdir -p $(IDIR_BASE)/proc

diff --git a/openwrt/package/base-files/default/etc/preinit b/openwrt/package/base-files/default/etc/preinit
index f82823e..ac9039c 100755 (executable)
--- a/openwrt/package/base-files/default/etc/preinit
+++ b/openwrt/package/base-files/default/etc/preinit
@@ -21,9 +21,4 @@ mount_root ${FAILSAFE:+failsafe}
        { mount|grep "on / type jffs2" 1>&-; } || firstboot
 }
 
        { mount|grep "on / type jffs2" 1>&-; } || firstboot
 }
 

-grep sysfs /proc/filesystems >&- 2>&- && {
-       mkdir -p /sys
-       mount -t sysfs none /sys
-}
-

 exec /sbin/init
 exec /sbin/init

diff --git a/openwrt/package/base-files/default/sbin/mount_root b/openwrt/package/base-files/default/sbin/mount_root
index bd9b815..427ff04 100755 (executable)
--- a/openwrt/package/base-files/default/sbin/mount_root
+++ b/openwrt/package/base-files/default/sbin/mount_root
@@ -37,3 +37,4 @@ fi
 mount none /tmp -t tmpfs -o nosuid,nodev,mode=1777,size=50%
 mkdir -p /dev/pts
 mount none /dev/pts -t devpts
 mount none /tmp -t tmpfs -o nosuid,nodev,mode=1777,size=50%
 mkdir -p /dev/pts
 mount none /dev/pts -t devpts

+grep sysfs /proc/filesystems >&- && mount -t sysfs none /sys