more original code processed..

3 files changed, 14 insertions, 85 deletions

diff --git a/src/lib/lib-ui.sh b/src/lib/lib-ui.sh
index 10ad1a1..5cd7ecc 100644
--- a/src/lib/lib-ui.sh
+++ b/src/lib/lib-ui.sh
@@ -37,6 +37,7 @@ gui_geteditor() {
     esac
 }
 
+
 # Get a list of available disks for use in the "Available disks" dialogs. This
 # will print the disks as follows, getting size info from hdparm:
 #   /dev/sda: 640133 MBytes (640 GB)
@@ -46,4 +47,15 @@ gui_getavaildisks()
     # NOTE: to test as non-root, stick in a 'sudo' before the hdparm call
     for i in $(finddisks); do echo -n "$i: "; hdparm -I $i | grep -F '1000*1000' | sed "s/.*1000:[ \t]*\(.*\)/\1/"; echo "\n"; done
 }
+
+
+# taken from setup code. edited to echo the choice, not perform it
+gui_ask_bootloader()
+{
+    DIALOG --colors --menu "Which bootloader would you like to use?  Grub is the Arch default.\n\n" \
+        10 65 2 \
+        "GRUB" "Use the GRUB bootloader (default)" \
+        "None" "\Zb\Z1Warning\Z0\ZB: you must install your own bootloader!" 2>$ANSWER
+	cat $ANSWER
+}
         
\ No newline at end of file
diff --git a/src/lib/setup_TOPROCESS b/src/lib/setup_TOPROCESS
index 14120f1..5ce5cb1 100644
--- a/src/lib/setup_TOPROCESS
+++ b/src/lib/setup_TOPROCESS
@@ -1,16 +1,5 @@
 #!/bin/bash
 
-# taken from setup
-# Disable swap and all mounted partitions for the destination system. Unmount
-# the destination root partition last!
-target_umountall()
-{
-    DIALOG --infobox "Disabling swapspace, unmounting already mounted disk devices..." 0 0
-    swapoff -a >/dev/null 2>&1
-    umount $(mount | grep -v "${TARGET_DIR} " | grep "${TARGET_DIR}" | sed 's|\ .*||g') >/dev/null 2>&1
-    umount $(mount | grep "${TARGET_DIR} " | sed 's|\ .*||g') >/dev/null 2>&1
-}
-
 autoprepare()
 {
     DISCS=$(finddisks)
@@ -1004,77 +993,3 @@ configure_system()
 
     S_CONFIG=1
 }
-
-install_bootloader()
-{
-    DIALOG --colors --menu "Which bootloader would you like to use?  Grub is the Arch default.\n\n" \
-        10 65 2 \
-        "GRUB" "Use the GRUB bootloader (default)" \
-        "None" "\Zb\Z1Warning\Z0\ZB: you must install your own bootloader!" 2>$ANSWER
-    case $(cat $ANSWER) in
-        "GRUB") dogrub ;;
-    esac
-}
-
-mainmenu()
-{
-    if [ -n "$NEXTITEM" ]; then
-        DEFAULT="--default-item $NEXTITEM"
-    else
-        DEFAULT=""
-    fi
-    DIALOG $DEFAULT --title " MAIN MENU " \
-        --menu "Use the UP and DOWN arrows to navigate menus.  Use TAB to switch between buttons and ENTER to select." 16 55 8 \
-        "0" "Select Source" \
-        "1" "Set Clock" \
-        "2" "Prepare Hard Drive" \
-        "3" "Select Packages" \
-        "4" "Install Packages" \
-        "5" "Configure System" \
-        "6" "Install Bootloader" \
-        "7" "Exit Install" 2>$ANSWER
-    NEXTITEM="$(cat $ANSWER)"
-    case $(cat $ANSWER) in
-        "0")
-            select_source ;;
-        "1")
-            set_clock ;;
-        "2")
-            prepare_harddrive ;;
-        "3")
-            select_packages ;;
-        "4")
-            installpkg ;;
-        "5")
-            configure_system ;;
-        "6")
-            install_bootloader ;;
-        "7")
-            echo ""
-            echo "If the install finished successfully, you can now type 'reboot'"
-            echo "to restart the system."
-            echo ""
-            exit 0 ;;
-        *)
-            DIALOG --yesno "Abort Installation?" 6 40 && exit 0
-            ;;
-    esac
-}
-
-#####################
-## begin execution ##
-
-DIALOG --msgbox "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." 14 65
-
-while true; do
-    mainmenu
-done
-
-exit 0
-
-# vim: set ts=4 sw=4 et:
diff --git a/src/profiles/profile-dieter b/src/profiles/profile-dieter
index 8aa1496..a0c369f 100644
--- a/src/profiles/profile-dieter
+++ b/src/profiles/profile-dieter
@@ -23,6 +23,8 @@ phase_preparation ()
 	SVN_BASE=https://192.168.1.2/svn/repos
 	TARGET_HOST=mbp-santa-rosa #TODO: prompt user for this, or let him pass it as cmdline argument
 
+	#TODO: find something against svn's interactive ssl cert checking.  http://www.7php.net/svn-client-certificate-authentication-cache/ might help
+
 	echo "**** From now on. everything will be automatic. Enjoy the show!"
 
         execute worker runtime_packages