From e675191cfaa9c388e8360b56cff12f6e7e702e18 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 16 Dec 2010 00:06:14 +0100 Subject: enable automatic filesystem checks for devices/partitions in /etc/fstab --- package/base-files/Makefile | 2 +- package/base-files/src/etc/rc.shutdown | 4 ++++ package/base-files/src/init | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 package/base-files/src/etc/rc.shutdown (limited to 'package/base-files') diff --git a/package/base-files/Makefile b/package/base-files/Makefile index f0695966e..2cd221fb1 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:= 39 PKG_SECTION:= base PKG_DESCR:= basic files and scripts diff --git a/package/base-files/src/etc/rc.shutdown b/package/base-files/src/etc/rc.shutdown new file mode 100644 index 000000000..a5b930ad9 --- /dev/null +++ b/package/base-files/src/etc/rc.shutdown @@ -0,0 +1,4 @@ +#!/bin/sh +for i in $(grep -v ^# /etc/fstab |awk '{ print $2 }');do + umount $i +done diff --git a/package/base-files/src/init b/package/base-files/src/init index e290cee95..af780c324 100755 --- a/package/base-files/src/init +++ b/package/base-files/src/init @@ -19,5 +19,5 @@ 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 +[ -f /etc/fstab ] && fsck -p >/dev/null ; mount -a exec /sbin/init -- cgit v1.2.3 From 7de31639b85a7b4ee855bb0bfaa124ab9ee37de4 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 16 Dec 2010 20:00:57 +0100 Subject: interfaces contains wpa keys, make it non-readable for the user, optimize init and shutdown --- package/base-files/Makefile | 3 ++- package/base-files/src/etc/init.d/rcK | 2 +- package/base-files/src/etc/rc.shutdown | 1 + package/base-files/src/init | 3 +-- 4 files changed, 5 insertions(+), 4 deletions(-) (limited to 'package/base-files') diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 2cd221fb1..cb6fea5f4 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:= 39 +PKG_RELEASE:= 40 PKG_SECTION:= base PKG_DESCR:= basic files and scripts @@ -50,6 +50,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/rc.shutdown b/package/base-files/src/etc/rc.shutdown index a5b930ad9..85d9e0058 100644 --- a/package/base-files/src/etc/rc.shutdown +++ b/package/base-files/src/etc/rc.shutdown @@ -1,4 +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 af780c324..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 /;} +[ -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 -- cgit v1.2.3 From 1b66827acaa9bc5684676f21000e0de4e3c69032 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 18 Dec 2010 08:22:42 +0100 Subject: fix some device node permissions --- package/base-files/src/etc/mdev.conf | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'package/base-files') 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 -- cgit v1.2.3 From 43f2f18848bc604723a1f8a94644f77ecb5d9fda Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 22 Dec 2010 14:48:54 +0100 Subject: use temporary resolv.conf when using udhcp --- package/base-files/Makefile | 2 +- package/base-files/src/usr/share/udhcpc/default.script | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'package/base-files') diff --git a/package/base-files/Makefile b/package/base-files/Makefile index cb6fea5f4..664db317b 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:= 40 +PKG_RELEASE:= 41 PKG_SECTION:= base PKG_DESCR:= basic files and scripts 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 -- cgit v1.2.3