summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-07-01 21:12:15 -0500
committerWaldemar Brodkorb <wbx@openadk.org>2015-07-01 21:12:15 -0500
commita32b558efb629fd9f28a8bd2d7e1af9538ff725d (patch)
tree629cfd8fab432b462221e0ba1d75b2032397b68d
parent360767f2ef426c9249131831286df32bd4bb666d (diff)
fix regression with new dev management change. order of execution is wrong.
-rw-r--r--package/base-files/Makefile2
-rwxr-xr-xpackage/base-files/src/etc/init.d/rcS24
2 files changed, 13 insertions, 13 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 84f9a2db1..7642c5e09 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -6,7 +6,7 @@ include $(ADK_TOPDIR)/mk/rootfs.mk
PKG_NAME:= base-files
PKG_VERSION:= 1.1
-PKG_RELEASE:= 14
+PKG_RELEASE:= 15
PKG_SECTION:= base/apps
PKG_DESCR:= basic files and scripts
diff --git a/package/base-files/src/etc/init.d/rcS b/package/base-files/src/etc/init.d/rcS
index 3c46c976b..5a6147cb9 100755
--- a/package/base-files/src/etc/init.d/rcS
+++ b/package/base-files/src/etc/init.d/rcS
@@ -13,13 +13,23 @@ fi
# remount /dev with smaller size
mount -o remount,nosuid,size=128k,mode=0755 -t tmpfs mdev /dev
+# create some useful directories in tmpfs
+mkdir -p /var/log
+mkdir -p /var/run
+mkdir -p /var/tmp
+touch /var/log/lastlog
+touch /var/log/wtmp
+
+# start dynamic device node management
+[ -f /etc/init.d/rcdev ] && . /etc/init.d/rcdev
+
# seed some random
cat /etc/.rnd >/dev/urandom 2>&1
# setup cfgfs
[ -x /sbin/cfgfs ] && {
- cfgfs setup
- mount -o remount,ro /
+ cfgfs setup
+ mount -o remount,ro /
}
# remount /tmp with smaller size
@@ -27,16 +37,6 @@ size=$(cat /etc/tmpfs 2>/dev/null)
[ -z $size ] && size=2048
mount -o remount,nosuid,nodev,mode=1777,size=${size}k -t tmpfs tmpfs /tmp
-# create some useful directories in tmpfs
-mkdir -p /var/log
-mkdir -p /var/run
-mkdir -p /var/tmp
-touch /var/log/lastlog
-touch /var/log/wtmp
-
-# start dynamic device node management
-[ -f /etc/init.d/rcdev ] && . /etc/init.d/rcdev
-
HOSTNAME=
[[ -s /etc/hostname ]] && HOSTNAME=$(cat /etc/hostname)
HOSTNAME=${HOSTNAME%%.*}