--- trunk/installer/guification.sh	2008/04/18 20:40:28	719
+++ trunk/installer/guification.sh	2008/09/24 10:14:59	768
@@ -1,5 +1,5 @@
 #! /bin/bash
-# $Header: /home/cvsd/magellan-cvs/magellan-src/installer/guification.sh,v 1.1 2008-04-18 20:40:28 niro Exp $
+# $Header: /home/cvsd/magellan-cvs/magellan-src/installer/guification.sh,v 1.2 2008-09-24 10:14:59 niro Exp $
 
 # helper scripts
 source hwdetection.sh
@@ -10,6 +10,10 @@
 source gtk-gui/networking.sh
 source gtk-gui/diskpartition.sh
 source gtk-gui/usermanagement.sh
+source gtk-gui/install.sh
+
+# install root
+INSTALL_ROOT="/mnt/magellan"
 
 # setup if needed sudo
 sudo=""
@@ -51,17 +55,17 @@
 #### Guification starts here ####
 #################################
 
-# start Xnest
-Xnest :2 -ac -geometry 800x600 +kb &
-# or start a full X11
-#X :2 &
-export DISPLAY=:2
-
-# start openbox as windowmanager
-export XDG_CONFIG_DIR=/etc/xdg
-export XDG_DATA_DIR=/usr/share
-sleep 1
-exec openbox &
+# # # start Xnest
+# # Xnest :2 -ac -geometry 800x600 +kb &
+# # # or start a full X11
+# # #X :2 &
+# # export DISPLAY=:2
+# # 
+# # # start openbox as windowmanager
+# # export XDG_CONFIG_DIR=/etc/xdg
+# # export XDG_DATA_DIR=/usr/share
+# # sleep 1
+# # exec openbox &
 
 
 # set a reasonable background
@@ -84,6 +88,7 @@
 echo "DEBUG: NETWORK_METHOD='${NETWORK_METHOD}'"
 echo "DEBUG: NETWORK_IP='${NETWORK_IP}'"
 echo "DEBUG: NETWORK_NETMASK='${NETWORK_NETMASK}'"
+echo "DEBUG: NETWORK_BROADCAST='${NETWORK_BROADCAST}'"
 echo "DEBUG: NETWORK_GATEWAY='${NETWORK_GATEWAY}'"
 echo "DEBUG: NETWORK_NAMESERVER='${NETWORK_NAMESERVER}'"
 
@@ -106,10 +111,16 @@
 echo "DEBUG: PARTITION_DISK_OPT='${PARTITION_DISK_OPT}'"
 echo "DEBUG: PARTITION_FS_OPT='${PARTITION_FS_OPT}'"
 echo "DEBUG: PARTITION_DISK_SWAP='${PARTITION_DISK_SWAP}'"
+echo "DEBUG: PARTITION_FS_SWAP='${PARTITION_DISK_SWAP}'"
 
 main_usermanagement
 echo "DEBUG: ROOT_PASSWORD='${ROOT_PASSWORD}'"
 echo "DEBUG: USER_NAME='${USER_NAME}'"
 echo "DEBUG: USER_PASSWORD='${USER_PASSWORD}'"
 
+main_install
+
+# end of everything
+rundialog FINISH
+
 exit 0