summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-03-15 21:08:13 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-03-15 21:08:13 +0100
commit5ab73932ee0b48cee835aecf6434bd32ec1ea599 (patch)
tree117ddc4e66b8c00d470e7fc8e21dcd1b951316f7 /package
parente17608e28f2929f5f194170ed9e76fb66effb39c (diff)
parentc080998e2d9468b09a4d386384ec4e2ff2416358 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package')
-rw-r--r--package/base-files/Makefile2
-rw-r--r--package/base-files/src/etc/init.d/boot5
-rwxr-xr-xpackage/base-files/src/etc/init.d/rcS3
-rw-r--r--package/base-files/src/etc/profile2
-rw-r--r--package/base-files/src/etc/rc.shutdown2
-rwxr-xr-xpackage/base-files/src/init7
6 files changed, 9 insertions, 12 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 89b9414d9..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:= 71
+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/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/rcS b/package/base-files/src/etc/init.d/rcS
index ef3a52a31..e27bc9eb5 100755
--- a/package/base-files/src/etc/init.d/rcS
+++ b/package/base-files/src/etc/init.d/rcS
@@ -3,6 +3,7 @@
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
{
@@ -11,4 +12,4 @@ export PATH=/bin:/sbin:/usr/bin:/usr/sbin
while read line; do
sh ${line%%:*} autostart
done
-} | logger -s -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 $*