From 7f9c5b317eb33ffc4be183b50dd636de15f01ae2 Mon Sep 17 00:00:00 2001
From: Dieter Plaetinck <dieter@plaetinck.be>
Date: Sat, 20 Dec 2008 16:03:38 +0100
Subject: cleanup automatic deployment stuff

---
 examples/deployconfig-dieter  | 16 ++++++++++++++++
 src/core/procedures/automatic | 15 ---------------
 src/core/procedures/base      |  2 +-
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/examples/deployconfig-dieter b/examples/deployconfig-dieter
index 00a3396..c626a64 100644
--- a/examples/deployconfig-dieter
+++ b/examples/deployconfig-dieter
@@ -1,6 +1,8 @@
 #!/bin/bash
 # An example config for the deployment procedure
 
+#TODO: install ruby-gems too
+
 var_RUNTIME_PACKAGES="svn"
 
 DEPLOY_CLASS=desktop-a7n8x
@@ -21,6 +23,13 @@ worker_fetch_configs ()
 }
 
 
+worker_package_list ()
+{
+	$SVN export $SVN_BASE/ddm-configs/$DEPLOY_CLASS/trunk/package-list $var_PKG_FILE || die_error "Could not export package list!"
+	# cat -> there are newlines in it -> var=`echo $var` -> not anymore :)
+	TARGET_PACKAGES=`cat $var_PKG_FILE` && TARGET_PACKAGES=`echo $TARGET_PACKAGES` || die_error "Could not cat package list. THIS SHOULD NEVER HAPPEN."
+}
+
 worker_accept_ssl_cert ()
 {
 	mkdir -p /root/.subversion/auth/svn.ssl.server
@@ -40,3 +49,10 @@ https://192.168.1.2:443
 END
 EOF
 }
+
+
+worker_configure_home ()
+{
+	#TODO checkout from svn
+	true
+}
\ No newline at end of file
diff --git a/src/core/procedures/automatic b/src/core/procedures/automatic
index f41d5a9..dc879ee 100644
--- a/src/core/procedures/automatic
+++ b/src/core/procedures/automatic
@@ -104,14 +104,6 @@ worker_prepare_disks ()
 	true	
 }
 
-worker_package_list ()
-{
-	$SVN export $SVN_BASE/ddm-configs/$TARGET_HOST/trunk/package-list $var_PKG_FILE || die_error "Could not export package list!"
-	# cat -> there are newlines in it -> var=`echo $var` -> not anymore :)
-	TARGET_PACKAGES=`cat $var_PKG_FILE` && TARGET_PACKAGES=`echo $TARGET_PACKAGES` || die_error "Could not cat package list. THIS SHOULD NEVER HAPPEN."
-	true
-}
-
 
 worker_install_packages ()
 {
@@ -121,13 +113,6 @@ worker_install_packages ()
 }
 
 
-worker_configure_home ()
-{
-	#checkout from svn
-	true
-}
-
-
 worker_set_clock ()
 {
 	#timezone="Europe/Brussels"
diff --git a/src/core/procedures/base b/src/core/procedures/base
index 632dda7..1c1d640 100644
--- a/src/core/procedures/base
+++ b/src/core/procedures/base
@@ -4,7 +4,7 @@
 var_DEFAULTFS="/boot:32:ext2:+ swap:256:swap /:7500:ext3 /home:*:ext3"
 var_TARGET_DIR="/mnt" # When overriding this, do _not_ add a trailing /.  It's not needed and maybe you could even break something
 var_RUNTIME_PACKAGES=
-var_PKG_FILE=$RUNTIME_DIR/package-list
+var_PKG_FILE=$RUNTIME_DIR/package-list # not used by default in base/interactive. can be used by custom procedures or profiles for the automatic procedure
 var_MIRRORLIST="/etc/pacman.d/mirrorlist"
 var_UI_TYPE="cli" # set to cli or dia for dialog
 var_ARCH=`uname -m` #works for i686 TODO: check if it works for x86_64
-- 
cgit v1.2.3-54-g00ecf