7 files changed, 13 insertions, 8 deletions

diff --git a/examples/shutdown-1.0/script/stop_storage b/examples/shutdown-1.0/script/stop_storage
index 1be5f735b..50f3b4dd2 100755
--- a/examples/shutdown-1.0/script/stop_storage
+++ b/examples/shutdown-1.0/script/stop_storage
@@ -4,7 +4,7 @@
 # Repeat.
 
 umountcnt=2
-writeout=0      # increase if your kernel doesn ot guarantee writes to complete
+writeout=0      # increase if your kernel does not guarantee writes to complete
 
 # No /usr - we are expecting all binaries to be accessible
 # from root fs alone
diff --git a/examples/udhcp/udhcpd.conf b/examples/udhcp/udhcpd.conf
index bb8774e08..df1258aaf 100644
--- a/examples/udhcp/udhcpd.conf
+++ b/examples/udhcp/udhcpd.conf
@@ -44,7 +44,7 @@ interface	eth0
 #notify_file                    # default: no script
 #notify_file    dumpleases      # useful for debugging
 
-# The following are bootp specific options
+# The following are BOOTP specific options
 # next server to use in bootstrap
 #siaddr         192.168.0.22    # default: 0.0.0.0 (none)
 # tftp server name
@@ -52,9 +52,14 @@ interface	eth0
 # tftp file to download (e.g. kernel image)
 #boot_file      /var/nfs_root   # default: none
 
+# NOTE: "boot_file FILE" and "opt bootfile FILE" are conceptually the same,
+# but "boot_file" goes into BOOTP-defined fixed-size field in the packet,
+# whereas "opt bootfile" goes into DHCP option 0x43.
+# Same for "sname HOST" and "opt tftp HOST".
+
 # Static leases map
 #static_lease 00:60:08:11:CE:4E 192.168.0.54
-#static_lease 00:60:08:11:CE:3E 192.168.0.44
+#static_lease 00:60:08:11:CE:3E 192.168.0.44 optional_hostname
 
 # The remainder of options are DHCP options and can be specified with the
 # keyword 'opt' or 'option'. If an option can take multiple items, such
diff --git a/examples/var_service/dhcp_if/run b/examples/var_service/dhcp_if/run
index d8f343586..882f008d6 100755
--- a/examples/var_service/dhcp_if/run
+++ b/examples/var_service/dhcp_if/run
@@ -8,7 +8,7 @@ pwd="$PWD"
 if="${PWD##*/dhcp_}"
 
 echo "* Upping iface $if"
-ip link set dev "$if" up || { sleep 5; exit; }
+ip link set dev "$if" up || exec sleep 5
 
 echo "* Starting udhcpc on $if [$$]"
 exec \
diff --git a/examples/var_service/dhcpd_if/run b/examples/var_service/dhcpd_if/run
index e3d1b00f4..82ac08aa4 100755
--- a/examples/var_service/dhcpd_if/run
+++ b/examples/var_service/dhcpd_if/run
@@ -8,7 +8,7 @@ pwd="$PWD"
 if="${PWD##*/dhcpd_}"
 
 echo "* Upping iface $if"
-ip link set dev $if up || { sleep 5; exit; }
+ip link set dev $if up || exec sleep 5
 
 >>udhcpd.leases
 sed 's/^interface.*$/interface '"$if/" -i udhcpd.conf
diff --git a/examples/var_service/ifplugd_if/run b/examples/var_service/ifplugd_if/run
index e7816619d..cfddfec06 100755
--- a/examples/var_service/ifplugd_if/run
+++ b/examples/var_service/ifplugd_if/run
@@ -9,7 +9,7 @@ pwd="$PWD"
 if="${PWD##*/ifplugd_}"
 
 echo "* Upping iface $if"
-ip link set dev "$if" up || { sleep 5; exit; }
+ip link set dev "$if" up || exec sleep 5
 
 echo "* Starting ifplugd on $if [$$]"
 exec \
diff --git a/examples/var_service/supplicant_if/run b/examples/var_service/supplicant_if/run
index bc16fb606..5c813b07f 100755
--- a/examples/var_service/supplicant_if/run
+++ b/examples/var_service/supplicant_if/run
@@ -9,7 +9,7 @@ if="${PWD##*/dhcp_}"
 
 echo "* Upping iface $if"
 # "or sleep" idiom prevents rapid respawning if iface does not exist
-ip link set dev "$if" up || { sleep 5; exit; }
+ip link set dev "$if" up || exec sleep 5
 
 ##echo "* Powersave disable on $if"
 ##iw dev "$if" set power_save off
diff --git a/examples/var_service/zcip_if/run b/examples/var_service/zcip_if/run
index 699823246..69f8b9bae 100755
--- a/examples/var_service/zcip_if/run
+++ b/examples/var_service/zcip_if/run
@@ -8,7 +8,7 @@ pwd="$PWD"
 if="${PWD##*/zcip_}"
 
 echo "* Upping iface $if"
-ip link set dev "$if" up || { sleep 5; exit; }
+ip link set dev "$if" up || exec sleep 5
 
 echo "* Starting zcip on $if [$$]"
 exec \