implement previous button

[pve-installer.git] / unconfigured.sh

diff --git a/unconfigured.sh b/unconfigured.sh
index 2a07edda767bf40012cc071b2960042f555bb50e..ac8fa4542f2f071da6f64c124063c203522bc84a 100755 (executable)
--- a/unconfigured.sh
+++ b/unconfigured.sh
@@ -38,16 +38,8 @@ real_reboot() {
     fi
     echo "done."
 
-    umount -l -n /dev/.static/dev
-    umount -l -n /dev
-
     umount -l -n /target >/dev/null 2>&1
-    umount -l -n /tmp
-    umount -l -n /var/tmp
-    umount -l -n /var/log
-    umount -l -n /var/run
-    umount -l -n /var/lib/xkb
-
+    umount -l -n /dev
     umount -l -n /sys
     umount -l -n /proc
 
@@ -66,11 +58,6 @@ echo "Starting Proxmox installation"
 PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin
 
 mount -n -t proc proc /proc
-mount -n -t tmpfs tmpfs /tmp
-mount -n -t tmpfs tmpfs /var/tmp
-mount -n -t tmpfs tmpfs /var/log
-mount -n -t tmpfs tmpfs /var/run
-mount -n -t tmpfs tmpfs /var/lib/xkb
 mount -n -t sysfs sysfs /sys
 
 parse_cmdline
@@ -92,12 +79,15 @@ export PREVLEVEL=N
 hostname proxmox
 
 # try to get ip config with dhcp
-echo -n "Detecting network settings... "
-/etc/init.d/networking start >/dev/tty2 2>&1
+echo -n "Attempting to get DHCP leases... "
+dhclient -v
 echo "done"
 
 xinit -- -dpi 96 >/dev/tty2 2>&1
 
+# just to be sure everything is on disk
+sync
+
 if [ $proxdebug -ne 0 ]; then 
     echo "Debugging mode (type exit or CTRL-D to reboot)"
     debugsh 
@@ -105,6 +95,7 @@ fi
 
 echo "Installation done, rebooting... "
 #mdadm -S /dev/md0 >/dev/tty2 2>&1
+kill $(pidof dhclient) 2>&1 > /dev/null
 real_reboot
 
 # never reached