Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/examples/udhcp

Timestamp:

Dec 20, 2016, 4:07:32 PM (8 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/examples/udhcp/sample.bound (modified) (1 diff)
• mindi-busybox/examples/udhcp/sample.renew (modified) (1 diff)
• mindi-busybox/examples/udhcp/simple.script (modified) (1 diff)

branches/3.3/mindi-busybox/examples/udhcp/sample.bound

@@ -23 +23 @@
 fi
 
-echo -n > $RESOLV_CONF
-[ -n "$domain" ] && echo domain $domain >> $RESOLV_CONF
-for i in $dns
-do
-    echo adding dns $i
-    echo nameserver $i >> $RESOLV_CONF
-done
+# Only replace resolv.conf is we have at least one DNS server
+if [ -n "$dns" ]
+then
+    echo -n > $RESOLV_CONF
+    [ -n "$domain" ] && echo domain $domain >> $RESOLV_CONF
+    for i in $dns
+    do
+        echo adding dns $i
+        echo nameserver $i >> $RESOLV_CONF
+    done
+fi

branches/3.3/mindi-busybox/examples/udhcp/sample.renew

@@ -23 +23 @@
 fi
 
-echo -n > $RESOLV_CONF
-[ -n "$domain" ] && echo domain $domain >> $RESOLV_CONF
-for i in $dns
-do
-    echo adding dns $i
-    echo nameserver $i >> $RESOLV_CONF
-done
+# Only replace resolv.conf is we have at least one DNS server
+if [ -n "$dns" ]
+then
+    echo -n > $RESOLV_CONF
+    [ -n "$domain" ] && echo domain $domain >> $RESOLV_CONF
+    for i in $dns
+    do
+        echo adding dns $i
+        echo nameserver $i >> $RESOLV_CONF
+    done
+fi

branches/3.3/mindi-busybox/examples/udhcp/simple.script

@@ -30 +30 @@
             for i in $router ; do
                 echo "Adding router $i"
-                route add default gw $i dev $interface metric $((metric++))
+                route add default gw $i dev $interface metric $metric
+                : $(( metric += 1 ))
             done
         fi
 
         echo "Recreating $RESOLV_CONF"
-        echo -n > $RESOLV_CONF-$$
-        [ -n "$domain" ] && echo "search $domain" >> $RESOLV_CONF-$$
+        # If the file is a symlink somewhere (like /etc/resolv.conf
+        # pointing to /run/resolv.conf), make sure things work.
+        realconf=$(readlink -f "$RESOLV_CONF" 2>/dev/null || echo "$RESOLV_CONF")
+        tmpfile="$realconf-$$"
+        > "$tmpfile"
+        [ -n "$domain" ] && echo "search $domain" >> "$tmpfile"
         for i in $dns ; do
             echo " Adding DNS server $i"
-            echo "nameserver $i" >> $RESOLV_CONF-$$
+            echo "nameserver $i" >> "$tmpfile"
         done
-        mv $RESOLV_CONF-$$ $RESOLV_CONF
+        mv "$tmpfile" "$realconf"
         ;;
 esac