Updated cloner3 to working state
Kyle Sheumaker [Wed, 25 Apr 2012 23:06:10 +0000 (18:06 -0500)]
etc/cloner3/cloner_server.sh
etc/cloner3/startup.sh
etc/cloner3/test.sh [deleted file]
manifest

index b522c51..4bbfff3 100755 (executable)
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 
-PORT=5555
+PORT=13200
 NETCAT="/usr/bin/nc"
 
 server_log() {
index c9826ab..f0f843c 100755 (executable)
@@ -8,10 +8,10 @@
 # installing from a sourcepath
 if [ "${_srcpath}" != "" ]
 then
-       /etc/cloner2/detect_cd.sh
+       /etc/cloner3/detect_cd.sh
 fi
 
-/etc/cloner2/get_setup.sh
+/etc/cloner3/get_setup.sh
 if [ $? != 0 ]; then
        exit 1
 fi
@@ -20,28 +20,30 @@ fi
 # if we are supposed to automatically format disks
 if [ "${_manualdisk}" = "" ]
 then
-       /etc/cloner2/prep_disks.sh
+       /etc/cloner3/prep_disks.sh
        if [ $? != 0 ]; then
                exit 1
        fi
-       /etc/cloner2/installer.sh
+       /etc/cloner3/installer.sh
        if [ $? != 0 ]; then
                exit 1
        fi
        
+       . /tmp/cmdline.dat
+       header "Cloner install finished"
        server_clone_done "${_node}" "${_nextboot}"
        
        if [ "${_reboot}" != "" ]
        then
                server_log "Rebooting machine" "${_node}"       
+               header "Rebooting machine now"
                reboot
+               exit 1
        fi
-       
 
-       header "Cloner install finished"
        echo -e "The cloner install has finished successfully.  You may now reboot"
        echo -e "the machine.  If you would like to re-mount the destination filesystems"
-       echo -e "to make any changes manually please run ${ANSI_BLUE}/etc/cloner2/remount-fs.sh${ANSI_DONE}"
+       echo -e "to make any changes manually please run ${ANSI_BLUE}/etc/cloner3/remount-fs.sh${ANSI_DONE}"
        echo -e ""
        echo -en "Press ${ANSI_BLUE}[ENTER]${ANSI_DONE} for a command prompt"
        read PROMPT
@@ -51,7 +53,7 @@ else
        header "Partition and format disks"
        echo -e "You have selected to manually partition and format your hard disk drives"
        echo -e "please do that now, and mount them under /cloner/mnt as they will be in"
-       echo -e "the installed OS.  When finished execute /etc/cloner2/installer.sh on the command"
+       echo -e "the installed OS.  When finished execute /etc/cloner3/installer.sh on the command"
        echo -e "line to finish the installation of this system."
 
        echo -en "Press ${ANSI_BLUE}[ENTER]${ANSI_DONE} for a command prompt"
diff --git a/etc/cloner3/test.sh b/etc/cloner3/test.sh
deleted file mode 100755 (executable)
index e408977..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-. /etc/library.sh
-. /etc/cloner3/include.sh
-. /etc/cloner3/cloner_server.sh
-
-
-
-server_clone_done "${_node}" "${_nextboot}"
index e6c814f..49b9e3a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -8,6 +8,15 @@
 755:./etc/cloner/remount-fs.sh
 755:./etc/cloner/startup.sh
 755:./etc/cloner/switch_cd.sh
+755:./etc/cloner3/cloner_server.sh
+755:./etc/cloner3/detect_cd.sh
+755:./etc/cloner3/get_setup.sh
+755:./etc/cloner3/include.sh
+755:./etc/cloner3/installer.sh
+755:./etc/cloner3/prep_disks.sh
+755:./etc/cloner3/remount-fs.sh
+755:./etc/cloner3/startup.sh
+755:./etc/cloner3/switch_cd.sh
 755:./etc/logdev.sh
 644:./etc/mke2fs.conf
 644:./etc/dropbear/dropbear_rsa_host_key