--- trunk/installer/guification.sh	2008/04/18 20:40:28	719
+++ trunk/installer/guification.sh	2010/05/30 17:33:55	1015
@@ -1,8 +1,9 @@
 #! /bin/bash
-# $Header: /home/cvsd/magellan-cvs/magellan-src/installer/guification.sh,v 1.1 2008-04-18 20:40:28 niro Exp $
+# $Id$
 
 # helper scripts
-source hwdetection.sh
+source include/functions.sh
+source include/hwdetection.sh
 
 # gui
 source gtk-gui/common.sh
@@ -10,6 +11,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,65 +56,72 @@
 #### 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
-sleep 0.1; fbsetbg -f background.png
+sleep 0.1; fbsetbg -f data/background.png
 
 
 # start the program
 rundialog WELCOME
 #
 main_locales
-echo "DEBUG: TIMEZONE_REGION='${TIMEZONE_REGION}'"
-echo "DEBUG: TIMEZONE_LOCATION='${TIMEZONE_LOCATION}'"
-echo "DEBUG: LOCALE_ALL='${LOCALE_ALL}'"
-echo "DEBUG: LOCALE='${LOCALE}'"
+debug "RECEIVED: TIMEZONE_REGION='${TIMEZONE_REGION}'"
+debug "RECEIVED: TIMEZONE_LOCATION='${TIMEZONE_LOCATION}'"
+debug "RECEIVED: LOCALE_ALL='${LOCALE_ALL}'"
+debug "RECEIVED: LOCALE='${LOCALE}'"
 
 main_networking
-echo "DEBUG: NETWORK_HOSTNAME='${NETWORK_HOSTNAME}'"
-echo "DEBUG: NETWORK_DOMAIN='${NETWORK_DOMAIN}'"
-echo "DEBUG: NETWORK_NIC='${NETWORK_NIC}'"
-echo "DEBUG: NETWORK_METHOD='${NETWORK_METHOD}'"
-echo "DEBUG: NETWORK_IP='${NETWORK_IP}'"
-echo "DEBUG: NETWORK_NETMASK='${NETWORK_NETMASK}'"
-echo "DEBUG: NETWORK_GATEWAY='${NETWORK_GATEWAY}'"
-echo "DEBUG: NETWORK_NAMESERVER='${NETWORK_NAMESERVER}'"
+debug "RECEIVED: NETWORK_HOSTNAME='${NETWORK_HOSTNAME}'"
+debug "RECEIVED: NETWORK_DOMAIN='${NETWORK_DOMAIN}'"
+debug "RECEIVED: NETWORK_NIC='${NETWORK_NIC}'"
+debug "RECEIVED: NETWORK_METHOD='${NETWORK_METHOD}'"
+debug "RECEIVED: NETWORK_IP='${NETWORK_IP}'"
+debug "RECEIVED: NETWORK_NETMASK='${NETWORK_NETMASK}'"
+debug "RECEIVED: NETWORK_BROADCAST='${NETWORK_BROADCAST}'"
+debug "RECEIVED: NETWORK_GATEWAY='${NETWORK_GATEWAY}'"
+debug "RECEIVED: NETWORK_NAMESERVER='${NETWORK_NAMESERVER}'"
 
 main_diskpartition
-echo "DEBUG: PARTITION_DISK_SETUP='${PARTITION_DISK_SETUP}'"
-echo "DEBUG: PARTITION_DISK_ROOT='${PARTITION_DISK_ROOT}'"
-echo "DEBUG: PARTITION_FS_ROOT='${PARTITION_FS_ROOT}'"
-echo "DEBUG: PARTITION_DISK_BOOT='${PARTITION_DISK_BOOT}'"
-echo "DEBUG: PARTITION_FS_BOOT='${PARTITION_DISK_BOOT}'"
-echo "DEBUG: PARTITION_DISK_HOME='${PARTITION_DISK_HOME}'"
-echo "DEBUG: PARTITION_FS_HOME='${PARTITION_FS_HOME}'"
-echo "DEBUG: PARTITION_DISK_TMP='${PARTITION_DISK_TMP}'"
-echo "DEBUG: PARTITION_FS_TMP='${PARTITION_FS_TMP}'"
-echo "DEBUG: PARTITION_DISK_USER='${PARTITION_DISK_USER}'"
-echo "DEBUG: PARTITION_FS_USER='${PARTITION_FS_USER}'"
-echo "DEBUG: PARTITION_DISK_VAR='${PARTITION_DISK_VAR}'"
-echo "DEBUG: PARTITION_FS_VAR='${PARTITION_FS_VAR}'"
-echo "DEBUG: PARTITION_DISK_SVR='${PARTITION_DISK_SVR}'"
-echo "DEBUG: PARTITION_FS_SVR='${PARTITION_FS_SVR}'"
-echo "DEBUG: PARTITION_DISK_OPT='${PARTITION_DISK_OPT}'"
-echo "DEBUG: PARTITION_FS_OPT='${PARTITION_FS_OPT}'"
-echo "DEBUG: PARTITION_DISK_SWAP='${PARTITION_DISK_SWAP}'"
+debug "RECEIVED: PARTITION_DISK_SETUP='${PARTITION_DISK_SETUP}'"
+debug "RECEIVED: PARTITION_DISK_ROOT='${PARTITION_DISK_ROOT}'"
+debug "RECEIVED: PARTITION_FS_ROOT='${PARTITION_FS_ROOT}'"
+debug "RECEIVED: PARTITION_DISK_BOOT='${PARTITION_DISK_BOOT}'"
+debug "RECEIVED: PARTITION_FS_BOOT='${PARTITION_DISK_BOOT}'"
+debug "RECEIVED: PARTITION_DISK_HOME='${PARTITION_DISK_HOME}'"
+debug "RECEIVED: PARTITION_FS_HOME='${PARTITION_FS_HOME}'"
+debug "RECEIVED: PARTITION_DISK_TMP='${PARTITION_DISK_TMP}'"
+debug "RECEIVED: PARTITION_FS_TMP='${PARTITION_FS_TMP}'"
+debug "RECEIVED: PARTITION_DISK_USER='${PARTITION_DISK_USER}'"
+debug "RECEIVED: PARTITION_FS_USER='${PARTITION_FS_USER}'"
+debug "RECEIVED: PARTITION_DISK_VAR='${PARTITION_DISK_VAR}'"
+debug "RECEIVED: PARTITION_FS_VAR='${PARTITION_FS_VAR}'"
+debug "RECEIVED: PARTITION_DISK_SVR='${PARTITION_DISK_SVR}'"
+debug "RECEIVED: PARTITION_FS_SVR='${PARTITION_FS_SVR}'"
+debug "RECEIVED: PARTITION_DISK_OPT='${PARTITION_DISK_OPT}'"
+debug "RECEIVED: PARTITION_FS_OPT='${PARTITION_FS_OPT}'"
+debug "RECEIVED: PARTITION_DISK_SWAP='${PARTITION_DISK_SWAP}'"
+debug "RECEIVED: 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}'"
+debug "RECEIVED: ROOT_PASSWORD='${ROOT_PASSWORD}'"
+debug "RECEIVED: USER_NAME='${USER_NAME}'"
+debug "RECEIVED: USER_PASSWORD='${USER_PASSWORD}'"
+
+main_install
+
+# end of everything
+rundialog FINISH
 
 exit 0