bootdisk: installer-prep (HEAD) [malekith]

[PLD CVS]

Module name:	bootdisk
Changes by:	malekith	02/07/29 13:10:37

Modified files:
	installer-prep

Log message:
- wait 3 seconds before starting dhcpcd again
- support $net_proxy

Index: installer-prep
===================================================================
RCS file: /cvsroot/bootdisk/batch-installer/installer-prep,v
diff -d -u -r1.87 -r1.88
--- installer-prep	2002/07/26 10:47:56	1.87
+++ installer-prep	2002/07/29 11:10:36	1.88
@@ -148,7 +148,17 @@
     if test -n "$source_not_mountable"; then
 	file="$source_device/$source_dir/$inst_dir/${pkg}.tar.gz"
 	log info "`nls "Fetching %s" "$source_device/$source_dir/$inst_dir/${pkg}.tar.gz"`"
-	( cd $tmp; snarf -n "$file" ) || die "Cannot get $file"
+	( 
+	  cd $tmp 
+	  case "$net_proxy" in
+	    "" | none )
+	      ;;
+	    * )
+	      export SNARF_PROXY="$net_proxy"
+	      ;;
+	  esac
+	  snarf -n "$file" 
+	) || die "Cannot get $file"
 	file="$tmp/${pkg}.tar.gz"
     else
 	file="${source_mountpoint}${source_dir}/$inst_dir/${pkg}.tar.gz"
@@ -313,8 +323,10 @@
       load_module af_packet
       # kill old instance of dhcpcd
       kill `ps|grep dhcpcd|sed -e 's/  / /g' |cut -d' ' -f2` 2>/dev/null || :
+      log info "waiting for dhcpcd to die (3 seconds)"
+      sleep 3
       log info "running dhcpcd"
-      dhcpcd "$net_device" || die "Problems with dhcp\n"
+      dhcpcd "$net_device" || die "Problems with dhcp"
       log info "$net_device configured with dhcp"
     else
       test "x$net_prefix" != "xauto" || guess_net_prefix