Use the right paths in cloner

diff --git a/etc/cloner/installer.sh b/etc/cloner/installer.sh
index 2af1ffc..29d4495 100755 (executable)
--- a/etc/cloner/installer.sh
+++ b/etc/cloner/installer.sh
@@ -16,7 +16,7 @@ if [ "${_multicast}" = "1" ]
 then
 
        msg "Starting multicast receiver, server will initiate transfer"
-       /usr/local/bin/udp-receiver --nokbd --pipe 'tar -xvf - -C /cloner/mnt'
+       /usr/bin/udp-receiver --nokbd --pipe 'tar -xvf - -C /cloner/mnt'
 
        if [ "$?" = "0" ]
        then
@@ -63,7 +63,7 @@ else
        #msg "The installation process can take a while, check ${ANSI_RED}[ALT-F4]${ANSI_DONE} to view progress"
 
        msg -n "Syncing data from ${ANSI_BLUE}${_server}${ANSI_DONE} image ${ANSI_BLUE}${_image}${ANSI_DONE}"
-       /usr/local/bin/rsync -avz --numeric-ids \
+       /usr/bin/rsync -avz --numeric-ids \
                ${_server}::${CLONER_IMAGE_PATH}/${_image}/data/  /cloner/mnt/
        if [ "$?" = "0" ]
        then

diff --git a/etc/cloner/prep_disks.sh b/etc/cloner/prep_disks.sh
index 6d2ad8f..17966bc 100755 (executable)
--- a/etc/cloner/prep_disks.sh
+++ b/etc/cloner/prep_disks.sh
@@ -36,7 +36,7 @@ then
        
                msg -n "Partition device ${ANSI_BLUE}${DEVICE}${ANSI_DONE} "
        
-               /usr/local/bin/sfdisk --force --no-reread -uM /dev/${DEVICE} < ${i} \
+               /usr/bin/sfdisk --force --no-reread -uM /dev/${DEVICE} < ${i} \
                        >> /tmp/stdout.log 2>>/tmp/stderr.log
        
                if [ "$?" != "0" ];
@@ -55,7 +55,7 @@ then
        
                msg -n "Partition device ${ANSI_BLUE}${DEVICE}${ANSI_DONE} "
        
-               /usr/local/bin/sfdisk --force --no-reread /dev/${DEVICE} < ${i} \
+               /usr/bin/sfdisk --force --no-reread /dev/${DEVICE} < ${i} \
                        >> /tmp/stdout.log 2>>/tmp/stderr.log
        
                if [ "$?" != "0" ];
@@ -87,7 +87,7 @@ then
                
 
                msg -n "Creating ${ANSI_BLUE}${MD_DEVICE}${ANSI_DONE} - $MD_LEVEL on $MD_DISK_QTY disk(s)"
-               /usr/local/bin/mdadm --create ${MD_DEVICE} --force --run --level=${MD_LEVEL} --chunk=128 --raid-devices=${MD_DISK_QTY} --spare-devices=${MD_SPARE_QTY} ${MD_DISK_STRING} >> /tmp/stdout.log 2>> /tmp/stderr.log
+               /usr/bin/mdadm --create ${MD_DEVICE} --force --run --level=${MD_LEVEL} --chunk=128 --raid-devices=${MD_DISK_QTY} --spare-devices=${MD_SPARE_QTY} ${MD_DISK_STRING} >> /tmp/stdout.log 2>> /tmp/stderr.log
        
        done < /cloner/setup/raidconf
 
@@ -105,7 +105,7 @@ then
                PV_UUID=`echo $line | awk '{print $3}'`
 
                msg -n "Setting UUID on ${ANSI_BLUE}${PV_DEVICE}${ANSI_DONE}"
-               /usr/local/bin/lvm pvcreate -ff -y --uuid ${PV_UUID} \
+               /usr/bin/lvm pvcreate -ff -y --uuid ${PV_UUID} \
                        --restorefile /cloner/setup/lvm.${PV_VG} \
                        ${PV_DEVICE} >> /tmp/stdout.log 2>> /tmp/stderr.log
 
@@ -124,7 +124,7 @@ then
                VG_NAME=`echo $FILENAME | cut -d"." -f2`        
 
                msg -n "Restoring volume group ${ANSI_BLUE}${VG_NAME}${ANSI_DONE}"
-               /usr/local/bin/lvm vgcfgrestore -f $i ${VG_NAME} \
+               /usr/bin/lvm vgcfgrestore -f $i ${VG_NAME} \
                        >> /tmp/stdout.log 2>> /tmp/stderr.log
 
                if [ "$?" != "0" ];
@@ -135,7 +135,7 @@ then
                        ok_msg
                fi
                msg -n "Activating volume group ${ANSI_BLUE}${VG_NAME}${ANSI_DONE}"
-               /usr/local/bin/lvm vgchange -a y ${VG_NAME} \
+               /usr/bin/lvm vgchange -a y ${VG_NAME} \
                        >> /tmp/stdout.log 2>> /tmp/stderr.log
 
                if [ "$?" != "0" ];
@@ -179,10 +179,10 @@ do
                case "${FS_TYPE}"
                in
                        ext3)
-                                       CMD="/usr/local/bin/mke2fs -F -j ${FS_DEVICE}"
+                                       CMD="/usr/bin/mke2fs -F -j ${FS_DEVICE}"
                                        if [ "${FS_LABEL}" != "" ]
                                        then    
-                                               CMD="/usr/local/bin/mke2fs -F -L ${FS_LABEL} -j ${FS_DEVICE}"
+                                               CMD="/usr/bin/mke2fs -F -L ${FS_LABEL} -j ${FS_DEVICE}"
                                        fi
        
                                        $CMD >> /tmp/stdout.log 2>> /tmp/stderr.log
@@ -195,10 +195,10 @@ do
                                        fi
                                ;;
                        ext2)
-                                       CMD="/usr/local/bin/mke2fs -F ${FS_DEVICE}"
+                                       CMD="/usr/bin/mke2fs -F ${FS_DEVICE}"
                                        if [ "${FS_LABEL}" != "" ]
                                        then    
-                                               CMD="/usr/local/bin/mke2fs -F -L ${FS_LABEL} ${FS_DEVICE}"
+                                               CMD="/usr/bin/mke2fs -F -L ${FS_LABEL} ${FS_DEVICE}"
                                        fi
        
                                        $CMD >> /tmp/stdout.log 2>> /tmp/stderr.log
@@ -211,7 +211,7 @@ do
                                        fi
                                ;;
                        xfs)
-                                       /usr/local/bin/mkfs.xfs -f ${FS_DEVICE} \
+                                       /usr/bin/mkfs.xfs -f ${FS_DEVICE} \
                                                >> /tmp/stdout.log 2>> /tmp/stderr.log
                                        if [ "$?" = "0" ]
                                        then
@@ -223,7 +223,7 @@ do
                                ;;
        
                        reiserfs)
-                                       /usr/local/bin/mkreiserfs -ff ${FS_DEVICE} \
+                                       /usr/bin/mkreiserfs -ff ${FS_DEVICE} \
                                                >> /tmp/stdout.log 2>> /tmp/stderr.log
        
                                        if [ "$?" = "0" ]
@@ -235,7 +235,7 @@ do
                                        fi
                                ;;
                        swap)
-                                       /usr/local/bin/mkswap -f ${FS_DEVICE} \
+                                       /usr/bin/mkswap -f ${FS_DEVICE} \
                                                >> /tmp/stdout.log 2>> /tmp/stderr.log
                                        if [ "$?" = "0" ]
                                        then