From 7885524586983ec44edf08324cfc7c63574b5388 Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 15 Jun 2006 17:21:17 +0000 Subject: clean up handling of the root filesystem mount - remove broadcom specific junk from the generic base-files part git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3951 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/ar7-2.4/bin/firstboot | 89 ++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100755 package/base-files/ar7-2.4/bin/firstboot (limited to 'package/base-files/ar7-2.4/bin') diff --git a/package/base-files/ar7-2.4/bin/firstboot b/package/base-files/ar7-2.4/bin/firstboot new file mode 100755 index 0000000000..955423be09 --- /dev/null +++ b/package/base-files/ar7-2.4/bin/firstboot @@ -0,0 +1,89 @@ +#!/bin/sh +# $Id$ + +rom=$(awk '/squashfs/ {print $2}' /proc/mounts) +jffs=$(awk '/jffs2/ {print $2}' /proc/mounts) + +dupe() { # + cd $1 + echo -n "creating directories... " + { + cd $2 + find . -xdev -type d + echo "./dev ./jffs ./mnt ./proc ./tmp ./sys" + # xdev skips mounted directories + cd $1 + } | xargs mkdir -p + echo "done" + + echo -n "setting up symlinks... " + for file in $(cd $2; find . -xdev -type f;); do + case "$file" in + ./rom/note) ;; #nothing + ./etc/config*|\ + ./etc/resolv.conf|\ + ./usr/lib/ipkg/info) cp -af $2/$file $file;; + *) ln -sf /rom/${file#./*} $file;; + esac + done + for file in $(cd $2; find . -xdev -type l;); do + cp -af $2/${file#./*} $file + done + echo "done" +} + +pivot() { # + mount -o move /proc $1/proc && \ + pivot_root $1 $1$2 && { + mount -o move $2/dev /dev + mount -o move $2/tmp /tmp + mount -o move $2/sys /sys + return 0 + } +} + +mountdp() { # + dev=$1; mnt=$2; shift 2; opt=$* + mount $dev $mnt $opt + dupe $mnt $rom + pivot $mnt /rom +} + +ramoverlay() { + mkdir -p /tmp/root + mountdp /tmp/root /mnt -o bind +} + +[ "${0##*/}" = "firstboot" ] && { + [ -z "$rom" ] && { + echo "You do not have a squashfs partition; aborting" + echo "(firstboot cannot be run on jffs2 based firmwares)" + exit 1 + } + + [ "$1" = "switch2jffs" ] && { + mtd erase OpenWrt + mount -o remount,ro none / # try to avoid fs changing while copying + mount -o bind / /mnt + mount /dev/mtdblock/4 /rom/jffs -t jffs2 + echo -n "copying files ... " + cp -a /mnt/* /rom/jffs + umount /mnt + echo "done" + pivot /rom /mnt + mount -o move /mnt /tmp/root + pivot /jffs /rom + exit 0 + } + + # script run manually + [ \! -z "$jffs" ] && { + echo "firstboot has already been run" + echo "jffs2 partition is mounted, only resetting files" + dupe $jffs $rom + exit 0 + } + + mtd erase OpenWrt + mountdp /dev/mtdblock/4 /jffs -t jffs2 +} -- cgit v1.2.3 From ed5ef674d100ca0ffa8bc00160718f69af5515c3 Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 27 Jun 2006 00:36:13 +0000 Subject: add copyright headers to base-files scripts and config files git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4090 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/ar7-2.4/bin/firstboot | 2 +- package/base-files/aruba-2.6/etc/config/network | 2 ++ package/base-files/au1000-2.6/etc/config/network | 1 + package/base-files/au1000-2.6/sbin/mount_root | 2 ++ package/base-files/brcm-2.4/bin/firstboot | 2 +- package/base-files/brcm-2.4/etc/config/wireless | 2 ++ package/base-files/brcm-2.4/etc/hotplug.d/net/09-net | 2 ++ package/base-files/brcm-2.4/etc/init.d/S05netconfig | 2 ++ package/base-files/brcm-2.4/etc/preinit | 2 ++ package/base-files/brcm-2.4/sbin/mount_root | 2 ++ package/base-files/brcm-2.6/bin/firstboot | 2 +- package/base-files/brcm-2.6/etc/hotplug.d/net/09-net | 2 ++ package/base-files/brcm-2.6/etc/init.d/S05netconfig | 2 ++ package/base-files/brcm-2.6/etc/preinit | 2 ++ package/base-files/brcm-2.6/sbin/mount_root | 2 ++ package/base-files/default/bin/ipcalc | 1 + package/base-files/default/bin/login | 2 ++ package/base-files/default/etc/functions.sh | 2 ++ package/base-files/default/etc/hotplug.d/net/10-net | 2 ++ package/base-files/default/etc/hotplug.d/usb/01-mount | 3 +++ package/base-files/default/etc/init.d/S10boot | 2 ++ package/base-files/default/etc/init.d/S50httpd | 2 ++ package/base-files/default/etc/init.d/S50telnet | 2 ++ package/base-files/default/etc/init.d/S60cron | 2 ++ package/base-files/default/etc/init.d/S98done | 2 ++ package/base-files/default/etc/init.d/rcS | 2 ++ package/base-files/default/etc/nvram.sh | 2 ++ package/base-files/default/sbin/hotplug | 1 + package/base-files/default/sbin/ifdown | 2 ++ package/base-files/default/sbin/ifup | 2 ++ package/base-files/default/sbin/mount_root | 2 ++ package/base-files/default/sbin/wifi | 2 ++ package/base-files/default/usr/lib/common.awk | 2 ++ package/base-files/default/usr/lib/parse-config.awk | 2 ++ package/base-files/rb532-2.6/etc/config/network | 1 + package/base-files/sibyte-2.6/etc/config/network | 1 + package/base-files/sibyte-2.6/etc/inittab | 2 ++ package/base-files/x86-2.4/etc/config/network | 1 + package/base-files/x86-2.6/etc/config/network | 1 + package/base-files/xscale-2.6/etc/config/network | 1 + 40 files changed, 70 insertions(+), 3 deletions(-) (limited to 'package/base-files/ar7-2.4/bin') diff --git a/package/base-files/ar7-2.4/bin/firstboot b/package/base-files/ar7-2.4/bin/firstboot index 955423be09..774bbc754b 100755 --- a/package/base-files/ar7-2.4/bin/firstboot +++ b/package/base-files/ar7-2.4/bin/firstboot @@ -1,5 +1,5 @@ #!/bin/sh -# $Id$ +# Copyright (C) 2006 OpenWrt.org rom=$(awk '/squashfs/ {print $2}' /proc/mounts) jffs=$(awk '/jffs2/ {print $2}' /proc/mounts) diff --git a/package/base-files/aruba-2.6/etc/config/network b/package/base-files/aruba-2.6/etc/config/network index f60332cd8c..65797797ee 100644 --- a/package/base-files/aruba-2.6/etc/config/network +++ b/package/base-files/aruba-2.6/etc/config/network @@ -1,4 +1,6 @@ # Network configuration file +# Copyright (C) 2006 OpenWrt.org + ## LAN configuration lan_ifname="eth0" diff --git a/package/base-files/au1000-2.6/etc/config/network b/package/base-files/au1000-2.6/etc/config/network index 2cc9e26717..576677bf7c 100644 --- a/package/base-files/au1000-2.6/etc/config/network +++ b/package/base-files/au1000-2.6/etc/config/network @@ -1,4 +1,5 @@ # Network configuration file +# Copyright (C) 2006 OpenWrt.org ## LAN configuration lan_ifname="br0" diff --git a/package/base-files/au1000-2.6/sbin/mount_root b/package/base-files/au1000-2.6/sbin/mount_root index bc4165ca30..718394ca4c 100755 --- a/package/base-files/au1000-2.6/sbin/mount_root +++ b/package/base-files/au1000-2.6/sbin/mount_root @@ -1,4 +1,6 @@ #!/bin/sh +# Copyright (C) 2006 OpenWrt.org + mount none /proc -t proc size=$(awk '/Mem:/ {l=5242880;print((s=$2/2)&- || return 1 OFFSET="$(($(hexdump -v /dev/mtdblock/1 -s 20 -n 2 -e '"%d"')-1))" diff --git a/package/base-files/brcm-2.6/bin/firstboot b/package/base-files/brcm-2.6/bin/firstboot index 28189780bd..d37ce4f90b 100755 --- a/package/base-files/brcm-2.6/bin/firstboot +++ b/package/base-files/brcm-2.6/bin/firstboot @@ -1,5 +1,5 @@ #!/bin/sh -# $Id$ +# Copyright (C) 2006 OpenWrt.org rom=$(awk '/squashfs/ {print $2}' /proc/mounts) jffs=$(awk '/jffs2/ {print $2}' /proc/mounts) diff --git a/package/base-files/brcm-2.6/etc/hotplug.d/net/09-net b/package/base-files/brcm-2.6/etc/hotplug.d/net/09-net index 8bbf604df8..90a92bd2b0 100644 --- a/package/base-files/brcm-2.6/etc/hotplug.d/net/09-net +++ b/package/base-files/brcm-2.6/etc/hotplug.d/net/09-net @@ -1,4 +1,6 @@ #!/bin/sh +# Copyright (C) 2006 OpenWrt.org + setup_eth() { [ -d /proc/switch ] || { diff --git a/package/base-files/brcm-2.6/etc/init.d/S05netconfig b/package/base-files/brcm-2.6/etc/init.d/S05netconfig index 6a626f54a5..0f53c0c9c9 100755 --- a/package/base-files/brcm-2.6/etc/init.d/S05netconfig +++ b/package/base-files/brcm-2.6/etc/init.d/S05netconfig @@ -1,4 +1,6 @@ #!/bin/sh +# Copyright (C) 2006 OpenWrt.org + [ -e /etc/config/network ] && exit 0 mkdir -p /etc/config diff --git a/package/base-files/brcm-2.6/etc/preinit b/package/base-files/brcm-2.6/etc/preinit index 5b676ca3ac..fb13e107e5 100755 --- a/package/base-files/brcm-2.6/etc/preinit +++ b/package/base-files/brcm-2.6/etc/preinit @@ -1,4 +1,6 @@ #!/bin/sh +# Copyright (C) 2006 OpenWrt.org + export PATH=/bin:/sbin:/usr/bin:/usr/sbin mount none /proc -t proc diff --git a/package/base-files/brcm-2.6/sbin/mount_root b/package/base-files/brcm-2.6/sbin/mount_root index a3ada58908..e3bdd3655c 100755 --- a/package/base-files/brcm-2.6/sbin/mount_root +++ b/package/base-files/brcm-2.6/sbin/mount_root @@ -1,4 +1,6 @@ #!/bin/sh +# Copyright (C) 2006 OpenWrt.org + is_dirty() { grep Broadcom /proc/cpuinfo >&- || return 1 OFFSET="$(($(hexdump -v /dev/mtdblock/1 -s 20 -n 2 -e '"%d"')-1))" diff --git a/package/base-files/default/bin/ipcalc b/package/base-files/default/bin/ipcalc index 318980e5a2..23af6a0c3b 100755 --- a/package/base-files/default/bin/ipcalc +++ b/package/base-files/default/bin/ipcalc @@ -1,4 +1,5 @@ #!/bin/sh +# Copyright (C) 2006 OpenWrt.org awk -f /usr/lib/common.awk -f - $* <&- 2>&- [ "$?" = "0" -a -z "$FAILSAFE" ] && { diff --git a/package/base-files/default/etc/functions.sh b/package/base-files/default/etc/functions.sh index 3010196171..a7f7c42e22 100755 --- a/package/base-files/default/etc/functions.sh +++ b/package/base-files/default/etc/functions.sh @@ -1,4 +1,6 @@ #!/bin/sh +# Copyright (C) 2006 OpenWrt.org + alias debug=${DEBUG:-:} # newline diff --git a/package/base-files/default/etc/hotplug.d/net/10-net b/package/base-files/default/etc/hotplug.d/net/10-net index b68ec1be28..f306ae342d 100644 --- a/package/base-files/default/etc/hotplug.d/net/10-net +++ b/package/base-files/default/etc/hotplug.d/net/10-net @@ -1,4 +1,6 @@ #!/bin/sh +# Copyright (C) 2006 OpenWrt.org + find_name() { for ifname in lan wan wifi ${ifnames}; do diff --git a/package/base-files/default/etc/hotplug.d/usb/01-mount b/package/base-files/default/etc/hotplug.d/usb/01-mount index c28ada204e..c4d356b0da 100644 --- a/package/base-files/default/etc/hotplug.d/usb/01-mount +++ b/package/base-files/default/etc/hotplug.d/usb/01-mount @@ -1,3 +1,6 @@ +#!/bin/sh +# Copyright (C) 2006 OpenWrt.org + mount_storage() { cd /dev/discs for dev in disc*; do diff --git a/package/base-files/default/etc/init.d/S10boot b/package/base-files/default/etc/init.d/S10boot index e0d15db0e0..cb5c6ac4a7 100755 --- a/package/base-files/default/etc/init.d/S10boot +++ b/package/base-files/default/etc/init.d/S10boot @@ -1,4 +1,6 @@ #!/bin/sh +# Copyright (C) 2006 OpenWrt.org + . /etc/functions.sh [ -f /proc/mounts ] || /sbin/mount_root diff --git a/package/base-files/default/etc/init.d/S50httpd b/package/base-files/default/etc/init.d/S50httpd index a1b883d0a8..d278519e98 100755 --- a/package/base-files/default/etc/init.d/S50httpd +++ b/package/base-files/default/etc/init.d/S50httpd @@ -1,2 +1,4 @@ #!/bin/sh +# Copyright (C) 2006 OpenWrt.org + [ -d /www ] && httpd -p 80 -h /www -r OpenWrt diff --git a/package/base-files/default/etc/init.d/S50telnet b/package/base-files/default/etc/init.d/S50telnet index fb9687c8aa..25242bdef8 100755 --- a/package/base-files/default/etc/init.d/S50telnet +++ b/package/base-files/default/etc/init.d/S50telnet @@ -1,2 +1,4 @@ #!/bin/sh +# Copyright (C) 2006 OpenWrt.org + if awk -F: '/^root:/ && $2 !~ /\!/ {exit 1}' /etc/passwd 2>/dev/null; then telnetd -l /bin/login; fi diff --git a/package/base-files/default/etc/init.d/S60cron b/package/base-files/default/etc/init.d/S60cron index 1752734267..6df9b7dee9 100755 --- a/package/base-files/default/etc/init.d/S60cron +++ b/package/base-files/default/etc/init.d/S60cron @@ -1,4 +1,6 @@ #!/bin/sh +# Copyright (C) 2006 OpenWrt.org + mkdir -p /var/spool/cron ln -s /etc/crontabs /var/spool/cron/crontabs crond -c /etc/crontabs diff --git a/package/base-files/default/etc/init.d/S98done b/package/base-files/default/etc/init.d/S98done index 5d5ab49ce3..a1ea5ad438 100755 --- a/package/base-files/default/etc/init.d/S98done +++ b/package/base-files/default/etc/init.d/S98done @@ -1,4 +1,6 @@ #!/bin/sh +# Copyright (C) 2006 OpenWrt.org + sysctl -p >&- # automagically run firstboot diff --git a/package/base-files/default/etc/init.d/rcS b/package/base-files/default/etc/init.d/rcS index b38e449781..dad989fe09 100755 --- a/package/base-files/default/etc/init.d/rcS +++ b/package/base-files/default/etc/init.d/rcS @@ -1,4 +1,6 @@ #!/bin/sh +# Copyright (C) 2006 OpenWrt.org + ${FAILSAFE:+exit} [ -f /etc/config/network ] && . /etc/config/network diff --git a/package/base-files/default/etc/nvram.sh b/package/base-files/default/etc/nvram.sh index 4d39a10204..ddbd88b52f 100644 --- a/package/base-files/default/etc/nvram.sh +++ b/package/base-files/default/etc/nvram.sh @@ -1,4 +1,6 @@ #!/bin/ash +# Copyright (C) 2006 OpenWrt.org + # allow env to override nvram nvram () { diff --git a/package/base-files/default/sbin/hotplug b/package/base-files/default/sbin/hotplug index 106299343a..afe52a446f 100755 --- a/package/base-files/default/sbin/hotplug +++ b/package/base-files/default/sbin/hotplug @@ -1,4 +1,5 @@ #!/bin/sh +# Copyright (C) 2006 OpenWrt.org # bypass the normal hotplug path for firmware loading # would otherwise cause problems with drivers like bcm43xx diff --git a/package/base-files/default/sbin/ifdown b/package/base-files/default/sbin/ifdown index 0d85ca8eab..50ffee5304 100755 --- a/package/base-files/default/sbin/ifdown +++ b/package/base-files/default/sbin/ifdown @@ -1,4 +1,6 @@ #!/bin/sh +# Copyright (C) 2006 OpenWrt.org + [ $# = 0 ] && { echo " $0 "; exit; } . /etc/functions.sh . /etc/config/network diff --git a/package/base-files/default/sbin/ifup b/package/base-files/default/sbin/ifup index a86a7671e8..390f960395 100755 --- a/package/base-files/default/sbin/ifup +++ b/package/base-files/default/sbin/ifup @@ -1,4 +1,6 @@ #!/bin/sh +# Copyright (C) 2006 OpenWrt.org + [ $# = 0 ] && { echo " $0 "; exit; } . /etc/functions.sh . /etc/config/network diff --git a/package/base-files/default/sbin/mount_root b/package/base-files/default/sbin/mount_root index 647c25327a..81660f0067 100755 --- a/package/base-files/default/sbin/mount_root +++ b/package/base-files/default/sbin/mount_root @@ -1,4 +1,6 @@ #!/bin/sh +# Copyright (C) 2006 OpenWrt.org + mount none /proc -t proc size=$(awk '/Mem:/ {l=5242880;print((s=$2/2)