hotplug-based network script rewrite

[openwrt.git] / package / base-files / default / bin / firstboot

diff --git a/package/base-files/default/bin/firstboot b/package/base-files/default/bin/firstboot
index cef258c..eff7063 100755 (executable)
--- a/package/base-files/default/bin/firstboot
+++ b/package/base-files/default/bin/firstboot
@@ -17,7 +17,7 @@ jdev=$(mount | awk '/jffs2/ {print $3}')
 
 if [ -z "$jdev" ]; then
        echo -n "Creating jffs2 partition... "
 
 if [ -z "$jdev" ]; then
        echo -n "Creating jffs2 partition... "

-       mtd erase OpenWrt >&- 
+       mtd erase OpenWrt >&- 2>&-

        mount -t jffs2 /dev/mtdblock/4 /jffs
        echo "done"
        cd /jffs
        mount -t jffs2 /dev/mtdblock/4 /jffs
        echo "done"
        cd /jffs


@@ -42,11 +42,10 @@ echo "done"
 echo -n "setting up symlinks... "
 for file in $(cd /rom; find *  -type f; find *  -type l;)
 do {
 echo -n "setting up symlinks... "
 for file in $(cd /rom; find *  -type f; find *  -type l;)
 do {

-  [ "${file%/*}" = "usr/lib/ipkg/info" ] && {
-    cp -f /rom/$file $file
-  } || {
-    ln -sf /rom/$file $file
-  }
+  case "${file%/*}" in
+    "usr/lib/ipkg/info"|"etc/config") cp -f /rom/$file $file;;
+    *) ln -sf /rom/$file $file;;
+  esac

 } done
 echo "done"
 
 } done
 echo "done"