Changeset 1cf739c in freewrt

Timestamp:

Sep 24, 2006, 4:57:35 AM (19 years ago)

Author:

Waldemar Brodkorb <wbx@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

1485212

Parents:

1f1c1d8

Message:

fix squashfs-symlink, add network configuration for asus wl500g deluxe, add pre-up wireless script

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

Files:

• package/wireless-tools/Makefile (modified) (2 diffs)
• package/wireless-tools/files/wireless-tools (added)
• target/linux/brcm-2.4/asus-wl500g-deluxe/files/.gitignore (deleted)
• target/linux/brcm-2.4/asus-wl500g-deluxe/files/etc/network/interfaces (added)
• target/linux/brcm-2.4/asus-wl500g-deluxe/files/etc/preinit.arch (added)
• target/linux/brcm-2.4/asus-wl500g/files/etc/network/interfaces (modified) (1 diff)
• target/linux/brcm-2.4/squashfs-symlinks/files/etc/init.d/S20jffsclean (modified) (1 diff)
• target/linux/brcm-2.4/squashfs-symlinks/files/sbin/mount_root (modified) (1 diff)

package/wireless-tools/Makefile

@@ -36 +36 @@
 
 $(IPKG_WIRELESS_TOOLS):
+        $(INSTALL_DIR) $(IDIR_WIRELESS_TOOLS)/etc/network/if-pre-up.d
         $(INSTALL_DIR) $(IDIR_WIRELESS_TOOLS)/usr/sbin
         $(INSTALL_DIR) $(IDIR_WIRELESS_TOOLS)/usr/lib
@@ -44 +45 @@
         $(INSTALL_BIN) $(WRKINST)/usr/sbin/iwpriv $(IDIR_WIRELESS_TOOLS)/usr/sbin/
         $(INSTALL_BIN) $(WRKINST)/usr/sbin/iwspy $(IDIR_WIRELESS_TOOLS)/usr/sbin/
+        $(INSTALL_BIN) ./files/wireless-tools \
+                $(IDIR_WIRELESS_TOOLS)/etc/network/if-pre-up.d
         $(RSTRIP) $(IDIR_WIRELESS_TOOLS)
         $(IPKG_BUILD) $(IDIR_WIRELESS_TOOLS) $(PACKAGE_DIR)

target/linux/brcm-2.4/asus-wl500g/files/etc/network/interfaces

@@ -15 +15 @@
         network 192.168.10.0
         broadcast 192.168.10.255 
+        wireless_essid FreeWRT
+        wireless_mode managed
+        wireless_channel 11

target/linux/brcm-2.4/squashfs-symlinks/files/etc/init.d/S20jffsclean

@@ -2 +2 @@
 # if / is tmpfs, we have an old or broken jffs2
 # erase data partition and set flag between bootloader and kernel 
+rom=$(awk '/squashfs/ {print $2}' /proc/mounts)
+dupe() { # <new_root> <old_root>
+        cd $1
+        echo -n "creating directories... "
+        {
+                cd $2 
+                find . -xdev -type d
+                echo "./dev ./jffs ./mnt ./proc ./tmp"
+                # 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/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"
+}
+
 { mount|grep "on / type tmpfs" 1>&-; } && {
         mtd erase data
+        mount /dev/mtdblock/5 /mnt -t jffs2
+        dupe /mnt $rom
         jffs2root --clean
         reboot

target/linux/brcm-2.4/squashfs-symlinks/files/sbin/mount_root

@@ -59 +59 @@
         [ $? != 0 ] && {
                 echo "switching to jffs2 filesystem"
-                mountdp /dev/mtdblock/5 /jffs -t jffs2
+                mount -t jffs2 /dev/mtdblock/5 /jffs
+                pivot /jffs /rom
         } || {
                 echo "jffs2 unusable; using ramdisk"