From 6edf983eef653bb64cbd6370e806eb069cc1219a Mon Sep 17 00:00:00 2001
From: Dieter Plaetinck <dieter@plaetinck.be>
Date: Tue, 9 Dec 2008 16:06:21 +0100
Subject: moving some code around to make some stuff prettier

---
 src/aif.sh                                     | 4 ++--
 src/core/procedures/base                       | 7 +++++++
 src/core/procedures/interactive                | 2 +-
 unofficial/modules/dieter/procedures/automatic | 1 +
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/aif.sh b/src/aif.sh
index 492fbdc..32c1173 100755
--- a/src/aif.sh
+++ b/src/aif.sh
@@ -249,8 +249,6 @@ stop_installer ()
 
 ###### perform actual logic ######
 echo "Welcome to $TITLE"
-log "################## START OF INSTALLATION ##################"
-[ -z "$1" ] && usage && exit 1
 
 mount -o remount,rw / &>/dev/null 
 
@@ -315,6 +313,8 @@ load_procedure "$module" "$procedure"
 PACMAN=pacman
 PACMAN_TARGET="pacman --root $var_TARGET_DIR --config /tmp/pacman.conf"
 
+log "################## START OF INSTALLATION ##################"
+
 start_process
 
 stop_installer
diff --git a/src/core/procedures/base b/src/core/procedures/base
index c163a0e..374f5ff 100644
--- a/src/core/procedures/base
+++ b/src/core/procedures/base
@@ -10,6 +10,7 @@ var_UI_TYPE="cli" # set to cli or dia for dialog
 phase_preparation=(\
 	configure \
 	intro \
+	sysprep \
 	select_source \
 	runtime_network \
 	runtime_packages)
@@ -45,6 +46,12 @@ worker_intro ()
 }
 
 
+worker_sysprep ()
+{
+	mount -o remount,rw / &>/dev/null
+}
+
+
 worker_configure ()
 {
 	var_UI_TYPE=${arg_ui_type:-cli}
diff --git a/src/core/procedures/interactive b/src/core/procedures/interactive
index c01c0fa..3abbfa9 100644
--- a/src/core/procedures/interactive
+++ b/src/core/procedures/interactive
@@ -36,8 +36,8 @@ start_process ()
 	## begin execution ##
 
 	execute worker configure
-
 	execute worker intro
+	execute worken sysprep
 
 	# menu item tracker- autoselect the next item
 	NEXTITEM="1"
diff --git a/unofficial/modules/dieter/procedures/automatic b/unofficial/modules/dieter/procedures/automatic
index 9a093fa..3420232 100644
--- a/unofficial/modules/dieter/procedures/automatic
+++ b/unofficial/modules/dieter/procedures/automatic
@@ -7,6 +7,7 @@ var_RUNTIME_PACKAGES="svn"
 phase_preparation=(\
 	configure \
 	intro \
+	sysprep \
 	msg_manual \
 	runtime_network \
 	runtime_svn \
-- 
cgit v1.2.3-54-g00ecf