Changeset 273 for floppyfw-3.0/scripts

Timestamp:

07/18/11 22:04:01 (10 months ago)

Author:

root

Message:

Various fixes I should have synced earlier and one new feature (!).

Now it will attept to save and then use the last address it got from the DHCP server through reboots.

Location:

floppyfw-3.0/scripts

Files:

• config (modified) (1 diff)
• network.ini (modified) (1 diff)
• rc.initrd (modified) (2 diffs)
• udhcpc.sh (added)

floppyfw-3.0/scripts/config

@@ -33 +33 @@
 CONNECT_TYPE=DHCP       # For getting the IP address by DHCP, often used 
                         # on cable modems.
+
+DHCP_USE_LAST_ADDR=y    # I'll make this new feature a default yes.
+                        # Reason is simple; I Want it and I presume
+                        # most others want it aswell.
+                        # Since it tries to store the address on the
+                        # root / source media, this only works with a 
+                        # writeable source.
+
 # CONNECT_TYPE=STATIC   # For the good old LAN/WAN connections with
                         # static IP addresses on the outside.

floppyfw-3.0/scripts/network.ini

@@ -140 +140 @@
                 echo "Connetion method is DHCP"
                 echo "OUTSIDE_DEVICE=$OUTSIDE_DEV" > /etc/outside.info
-                HARGS=
-                [ "$USER_IDENT" != "" ] && HARGS="-H $USER_IDENT"
-                if /sbin/udhcpc -n -s /etc/udhcpcrenew.sh $HARGS -i $OUTSIDE_DEV
+                if /etc/udhcpc.sh
                 then
                         . /etc/outside.info
                 else
                         echo "duh!"     # Or some more useful error handling
+                        echo -n "Sorry, I could not get an IP address,"
+                        echo -n " I'd better quit."
+                        exit;
                 fi
                 ;;

floppyfw-3.0/scripts/rc.initrd

@@ -28 +28 @@
 while [ "$1" -a "$2" ]
 do
-       echo "Attempting to mount $1 ($2)"
-       load_fsmod $1 $2
-       if mount -t $2 $1 /mnt/tmp
+       SOURCE_DEV=$1
+       SOURCE_FS=$2
+       echo "Attempting to mount $SOURCE_DEV ($SOURCE_FS)"
+       load_fsmod $SOURCE_DEV $SOURCE_FS
+       if mount -t $SOURCE_FS $SOURCE_DEV /mnt/tmp
         then
-         echo "Mounted $1 on /mnt/tmp"
+         echo "Mounted $SOURCE_DEV on /mnt/tmp"
          break
        else
@@ -153 +155 @@
 stripcr /mnt/tmp/floppyfw.msg /etc/issue 644
 
+# I also want to add the source device and file system so that I can remount.
+echo "SOURCE_DEV=$SOURCE_DEV" >> /etc/config
+echo "SOURCE_FS=$SOURCE_FS" >> /etc/config
+
 #
 # Before I source it I want to fix the password. It's in the config but