Changeset e4ba301 in freewrt for package/base-files

Timestamp:

Jul 9, 2006, 3:58:53 PM (19 years ago)

Author:

Waldemar Brodkorb <wbx@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

5642350

Parents:

141418f

Message:

• add a specific preinit.arch which executes brcm specific stuff
• for squashfs based images, use mini_fo as default, no ugly symlinks anymore
• add a "version" command, which can be used later, to exactly know which FreeWRT version is used (good for postinst scripts and bugreports), some users like to recreate the shell banner, but still need to know which version is used
• remove nvram sepcific stuff from some of the startup scripts, like syslogd startup params
• add some checks if ldd / arp is installed in /etc/profile

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@182 afb5a338-a214-0410-bd46-81f09a774fd1

Location:

package/base-files/default

Files:

• bin/firstboot (modified) (1 diff)
• bin/version (added)
• etc/init.d/rcS (modified) (1 diff)
• etc/preinit (modified) (1 diff)
• etc/profile (modified) (1 diff)
• sbin/failsafe (added)
• sbin/mount_root (modified) (1 diff)

package/base-files/default/bin/firstboot

@@ -50 +50 @@
 }
 
+fopivot() { # <rw_root> <ro_root> <dupe?>
+        root=$1
+    {
+      mount -t mini_fo -o base=/,sto=$1 $1 /mnt 2>&- && root=/mnt
+    } || {
+      [ "$3" = "1" ] && mount -o bind $1 $1 && dupe $1 $rom
+    }
+    pivot $root $2
+}
+
+
 ramoverlay() {
         mkdir -p /tmp/root

package/base-files/default/etc/init.d/rcS

@@ -2 +2 @@
 ${FAILSAFE:+exit}
 
-[ -f /etc/config/network ] && . /etc/config/network
-eval $(ipcalc "$log_ipaddr")
-[ "$log_ipaddr" = "$IP" ] || log_ipaddr=""
-syslogd -C 16 ${log_ipaddr:+-L -R $log_ipaddr}
+syslogd -C 16
 klogd
-#${FAILSAFE:+telnetd -l /bin/login; ifup lan; exit}
+
 for i in /etc/init.d/S*; do
   $i start 2>&1

package/base-files/default/etc/preinit

@@ -2 +2 @@
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 mount none /proc -t proc
-
-[ -f /etc/preinit.arch ] && . /etc/preinit.arch
-[ -z "$FAILSAFE" ] || {
-        echo /bin/true > /proc/sys/kernel/hotplug
-        telnetd -l /bin/login <> /dev/null 2>&1
-}
+[ -f /etc/preinit.arch ] && /etc/preinit.arch
+failsafe
+insmod mini_fo 2>&-
 mount_root ${FAILSAFE:+failsafe}
 exec /sbin/init

package/base-files/default/etc/profile

@@ -8 +8 @@
 [ -x /usr/bin/vim ] || alias vim=vi
 
-arp() { cat /proc/net/arp; }
-ldd() { LD_TRACE_LOADED_OBJECTS=1 $*; }
+[ -x /usr/bin/arp ] || arp() { cat /proc/net/arp; }
+[ -x /usr/bin/ldd ] || ldd() { LD_TRACE_LOADED_OBJECTS=1 $*; }
 reboot() { ifdown wan 2>&1 >/dev/null ; /sbin/reboot; }

package/base-files/default/sbin/mount_root

@@ -25 +25 @@
                         echo "switching to jffs2"
                         mount /dev/mtdblock/4 /jffs -t jffs2
-                        pivot /jffs /rom
+                        fopivot /jffs /rom
                 } || {
                         echo "jffs2 unusable; using ramdisk"