Changeset 887

Timestamp:

Dec 29, 2016, 4:42:38 PM (7 months ago)

Author:

amain

Message:

rootfs: fix/workaround ath9k loading issues. Fixes in rcS.firstboot.

Location:

trunk/debian/rootfs/files

Files:

• all/etc/init.d/debwrt (modified) (2 diffs)
• all/etc/init.d/rcS.firstboot (modified) (1 diff)
• ar71xx/etc/debwrt (added)
• ar71xx/etc/debwrt/debwrt.sh (added)
• ar71xx/etc/modules.early (added)

trunk/debian/rootfs/files/all/etc/init.d/debwrt

@@ -16 +16 @@
 #                    /lib/modules/debwrt.sub-target are installed when 
 #                    extracting the target specific debwrt-modules<version>.tar.gz.
+#
+#                    Also runs /etc/debwrt/debwrt.sh to perform ealy boot actions and
+#                    load modules from /etc/modules.early.
 ### END INIT INFO
 
@@ -45 +48 @@
         if [ ! -f /etc/debwrt/target.installed ]
         then
-            mkdir -p /etc/debwrt
+            if is_ro
+            then
+                mount -o remount,rw /
+                makero=1
+            fi
+
             if [ -d /target/${target} ]
             then
                 log_action_msg "Extracting target '${target}' specific files from /target/${target}"
-                if is_ro
-                then
-                    mount -o remount,rw /
-                    makero=1
-                fi
                 tar cf - -C /target/${target} . | tar xf - --warning=no-timestamp -C /
-                if [ "${makero}" = "1" ]
-                then
-                    mount -o remount,ro /
-                fi
             else
                 # no extra files for this target
+                log_action_msg "Not target ('${target}' specific files from /target/${target}"
                 :
             fi
+
+            mkdir -p /etc/debwrt
             touch /etc/debwrt/target.installed
+
+            if [ "${makero}" = "1" ]
+            then
+                mount -o remount,ro /
+            fi
+
         fi
     else
         log_warning_msg "No targets configured in /lib/modules/debwrt.target and/or /lib/modules/debwrt.subtarget. Unabl"
+    fi
+
+    if [ -x /etc/debwrt/debwrt.sh ]
+    then
+        log_action_msg "Running early DebWrt boot actions (/etc/debwrt/debwrt.sh)"
+        /etc/debwrt/debwrt.sh
+    fi
+
+    if [ -e /etc/modules.early ]
+    then
+        log_action_msg "Early loading of modules (/etc/modules.early)"
+        cat /etc/modules.early \
+         | grep -v -e "^#" -v -e "^$" \
+         | while read module
+           do
+               log_action_msg "  - ${module}"
+               modprobe ${module}
+           done
     fi
 }

trunk/debian/rootfs/files/all/etc/init.d/rcS.firstboot

@@ -2 +2 @@
 
 # Mount root read-write
-/bin/mount -n -o remount,rw /dev/root /
+/bin/mount -n -o remount,rw /
 
 # Mount proc - why not? :-)
 /bin/mount -t proc none /proc
+
+# Mount sys
+mount -t sysfs none /sys
 
 # Setup the network