fix ipcalc (off by 1)

[openwrt.git] / package / base-files / default / etc / init.d / S10boot

diff --git a/package/base-files/default/etc/init.d/S10boot b/package/base-files/default/etc/init.d/S10boot
index 9dd0beb..b361e15 100755 (executable)
--- a/package/base-files/default/etc/init.d/S10boot
+++ b/package/base-files/default/etc/init.d/S10boot
@@ -1,33 +1,25 @@
 #!/bin/sh
-. /etc/nvram.sh
+# Copyright (C) 2006 OpenWrt.org
 
-[ "$(uname -r|grep -c 2.4)" = "1" ] && {
-        echo "S" > /proc/jffs2_bbc
-}
+. /etc/functions.sh
 
-vconfig set_name_type VLAN_PLUS_VID_NO_PAD
+[ -f /proc/mounts ] || /sbin/mount_root
+[ -f /proc/jffs2_bbc ] && echo "S" > /proc/jffs2_bbc
+vconfig set_name_type DEV_PLUS_VID_NO_PAD
 
-HOSTNAME=$(nvram get wan_hostname)
-HOSTNAME=${HOSTNAME%%.*}
+HOSTNAME=${wan_hostname%%.*}
 echo ${HOSTNAME:=OpenWrt}>/proc/sys/kernel/hostname
 
-# automagically run firstboot
-[ -z "$FAILSAFE" -a -z "$(nvram get no_root_swap)" ] && {
-       { mount|grep "on / type jffs2" 1>&-; } || firstboot
-}
-
 mkdir -p /var/run
 mkdir -p /var/log
+mkdir -p /var/lock
 touch /var/log/wtmp
 touch /var/log/lastlog
 [ "$FAILSAFE" = "true" ] && touch /tmp/.failsafe
 
-for iface in $(/sbin/ifconfig -a | awk '{print $1}' | grep eth); do
+# manually trigger hotplug before loading modules
+for iface in $(awk -F: '/:/ {print $1}' /proc/net/dev); do
        /usr/bin/env -i ACTION=add INTERFACE="$iface" /sbin/hotplug net
 done
 
-sed 's/^[^#]/insmod &/' /etc/modules /etc/modules.d/* 2>&-|ash
-
-ifconfig lo 127.0.0.1 up
-ifconfig eth0 promisc
-
+load_modules /etc/modules /etc/modules.d/*