support for "intro" worker in all procedures

3 files changed, 30 insertions, 8 deletions

diff --git a/src/core/procedures/base b/src/core/procedures/base
index 7af1452..adb0a39 100644
--- a/src/core/procedures/base
+++ b/src/core/procedures/base
@@ -7,8 +7,8 @@ var_PKG_FILE=/home/arch/aif/runtime/package-list
 var_UI_TYPE="cli" # set to cli or dia for dialog
 
 ###### Phases ( can be overridden by more specific procedures) ######
-#TODO: warn user that this is a low-interactivity 'common-defaults' installation. ask the user if he really, really wants this, we will probably override his data
 phase_preparation=(\
+	intro \
 	select_source \
 	runtime_network \
 	runtime_packages)
@@ -34,6 +34,16 @@ phase_finish=(msg_report)
 
 
 ###### Workers ( can be overridden by more specific procedures) ######
+worker_intro ()
+{
+	ask_yesno "This is a low-interactivity 'common defaults' installation.  Do you really want to do this?  We may overwrite your data."
+	if [ $? -gt 0 ]
+	then
+		die_error "User aborted base profile execution"
+	fi
+}
+
+
 worker_select_source ()
 {
 	var_PKG_SOURCE_TYPE='cd'
diff --git a/src/core/procedures/interactive b/src/core/procedures/interactive
index 1fb3378..6739d75 100644
--- a/src/core/procedures/interactive
+++ b/src/core/procedures/interactive
@@ -1,5 +1,5 @@
 #!/bin/sh
-depend_procedure core base # esp for auto_{network,locale,fstab} workers
+depend_procedure core base # esp for auto_{network,locale,fstab} and intro workers
 
 
 # This is a port of the original /arch/setup script.  It doesn't use aif phases but uses it's own menu-based flow (phase) control
@@ -37,12 +37,7 @@ start_process ()
 
 	var_UI_TYPE=dia
 
-	notify "Welcome to the Arch Linux Installation program. The install \
-	process is fairly straightforward, and you should run through the options in \
-	the order they are presented. If you are unfamiliar with partitioning/making \
-	filesystems, you may want to consult some documentation before continuing. \
-	You can view all output from commands by viewing your VC7 console (ALT-F7). \
-	ALT-F1 will bring you back here."
+	execute worker intro
 
 	# menu item tracker- autoselect the next item
 	NEXTITEM="1"
@@ -194,6 +189,17 @@ worker_select_source ()
 }
 
 
+worker_intro ()
+{
+	notify "Welcome to the Arch Linux Installation program. The install \
+	process is fairly straightforward, and you should run through the options in \
+	the order they are presented. If you are unfamiliar with partitioning/making \
+	filesystems, you may want to consult some documentation before continuing. \
+	You can view all output from commands by viewing your VC7 console (ALT-F7). \
+	ALT-F1 will bring you back here."
+}
+
+
 # select_packages()
 # prompts the user to select packages to install
 worker_package_list() {
diff --git a/unofficial/modules/dieter/procedures/automatic b/unofficial/modules/dieter/procedures/automatic
index b8f15d7..809a8ab 100644
--- a/unofficial/modules/dieter/procedures/automatic
+++ b/unofficial/modules/dieter/procedures/automatic
@@ -5,6 +5,7 @@ depend_procedure core base
 var_RUNTIME_PACKAGES="svn"
 
 phase_preparation=(\
+	intro \
 	msg_manual \
 	runtime_network \
 	runtime_svn \
@@ -16,6 +17,11 @@ phase_preparation=(\
 phase_finish=(configure_home msg_report)
 
 
+worker_intro ()
+{
+	notify "Dieter::automatic procedure running..."
+}
+
 
 worker_msg_manual ()
 {