Changeset 1933be2 in clfs-embedded

Timestamp:

Sep 8, 2009, 11:33:21 AM (15 years ago)

Author:

Maarten Lankhorst <mlankhorst@…>

Branches:

master

Children:

67b70f4

Parents:

2e856a4

Message:

bootscripts: Updates, and add a network bridge startup file

Location:

bootscripts

Files:

• Makefile (modified) (1 diff)
• clfs/rc.d/init.d/bridge (added)
• clfs/rc.d/init.d/network (modified) (1 diff)
• clfs/rc.d/init.d/syslog (modified) (1 diff)
• clfs/rc.d/shutdown (modified) (2 diffs)
• clfs/rc.d/startup (modified) (5 diffs)

bootscripts/Makefile

@@ -28 +28 @@
         ln -sf ../init.d/sshd ${EXTDIR}/rc.d/stop/K30sshd
 
-.PHONY: all create-dirs install install-dropbear
+install-bridge: create-dirs
+        install -m ${MODE} clfs/rc.d/init.d/bridge ${EXTDIR}/rc.d/init.d/
+        ln -sf ../init.d/bridge ${EXTDIR}/rc.d/start/S09bridge
+        ln -sf ../init.d/bridge ${EXTDIR}/rc.d/stop/K81bridge
+
+.PHONY: all create-dirs install install-dropbear install-bridge

bootscripts/clfs/rc.d/init.d/network

@@ -56 +56 @@
                         check_status
                         if [ "$DHCP" = "yes" ]; then
-                                kill `cat "/var/run/udhcpc.$INTERFACE.pid"`
+                                kill `cat "/var/run/udhcpc.$INTERFACE.pid"` 2>/dev/null || echo true
                                 sleep 1
                         fi

bootscripts/clfs/rc.d/init.d/syslog

@@ -6 +6 @@
 . /etc/rc.d/init.d/functions
 
-SYSLOG_ROTATE_SIZE=80kb
+SYSLOG_ROTATE_SIZE=65536
 
 case "$1" in

bootscripts/clfs/rc.d/shutdown

@@ -20 +20 @@
 done
 
-if [ -x /sbin/hwclock ]; then
+if [ -x /sbin/hwclock ] && [ -e /dev/rtc ]; then
         echo -n "Syncing hardware clock to system clock:"
         hwclock --systohc --utc
@@ -38 +38 @@
 echo -n "Unmounting all filesystems: "
 umount -a -r
+

bootscripts/clfs/rc.d/startup

@@ -11 +11 @@
 /bin/mkdir /dev/shm
 /bin/echo "/sbin/mdev" > /proc/sys/kernel/hotplug
+
+echo -n "Starting mdev: "
 /sbin/mdev -s
+check_status
 
-if [ -x /sbin/hwclock ]; then
+echo -n "Mounting devpts: "
+mount /dev/pts
+check_status
+
+if [ -x /sbin/hwclock ] && [ -e /dev/rtc ]; then
         echo -n "Setting system clock: "
         hwclock --hctosys --utc
@@ -20 +27 @@
 
 if [ -x /sbin/fsck ]; then
-        echo "Starting fsck for root filesystem."
-        fsck -T -C /
+        echo "Starting fsck for local filesystems."
+        fsck -A -C -R -T -t nonfs,nosmbfs
         if [ "$?" -gt 2 ]; then
-                echo "WARNING: Errors found while checking root filesystem."
+                echo "WARNING: Errors found while checking filesystems."
                 echo "You can login as root now, the system will reboot after logout."
                 sulogin
@@ -32 +39 @@
                 reboot
         else
-                echo -n "Checking root filesystem: "
+                echo -n "Checking local filesystems: "
                 check_status
         fi
 fi
 
-echo -n "Remounting root rw: "
-mount -o remount,rw /
-check_status
-
-echo -n "Mounting devpts: "
-mount /dev/pts
-check_status
-
-echo "Starting fsck for local filesystems."
-fsck -A -C -R -T -t nonfs,nosmbfs
-if [ "$?" -gt 2 ]; then
-        echo "WARNING: Errors found while checking filesystems."
-        echo "You can login as root now, the system will reboot after logout."
-        sulogin
-        reboot
-elif [ "$?" = "2" ]; then
-        echo "NOTICE: System needs to be rebooted now."
-        sleep 1
-        reboot
-else
-        echo -n "Checking local filesystems: "
-        check_status
-fi
 
 if [ -x /sbin/swapon ]; then
@@ -66 +50 @@
         check_status
 fi
+
+echo -n "Remounting root rw: "
+mount -o remount,rw /
+check_status
 
 echo -n "Setting hostname: "
@@ -94 +82 @@
         fi
 done
+
+exit 0