Change all occurrences of $prefix in hooks and roles with $TARGET

"target" is also the name used in the debian installer for the
installation target while "prefix" is too ambiguous.

hooks/centos-5/25-setup-kernel

@@ -3,7 +3,7 @@
 #  This script sets up the kernel and fstab for CentOS 5.
 #
 
-prefix=$1
+TARGET=$1
 
 #
 #  Source our common functions
@@ -21,16 +21,16 @@ fi
 logMessage Script $0 starting
 
 # Make the console work
-sed -i "/Cancelled/ {G;s/$/co:2345:respawn:\/sbin\/mingetty console/;}" ${prefix}/etc/inittab
+sed -i "/Cancelled/ {G;s/$/co:2345:respawn:\/sbin\/mingetty console/;}" ${TARGET}/etc/inittab
-sed -i "s/^1:2345/#1:2345/" ${prefix}/etc/inittab
+sed -i "s/^1:2345/#1:2345/" ${TARGET}/etc/inittab
 
 # MAKEDEV is needed at this point
-chroot ${prefix} ln -s /sbin/MAKEDEV /dev/MAKEDEV
+chroot ${TARGET} ln -s /sbin/MAKEDEV /dev/MAKEDEV
-chroot ${prefix} /sbin/MAKEDEV sda sdb sdc sdd
+chroot ${TARGET} /sbin/MAKEDEV sda sdb sdc sdd
 
 # Create fstab
 logMessage Create /etc/fstab
-cat > ${prefix}/etc/fstab << EOF
+cat > ${TARGET}/etc/fstab << EOF
 # /etc/fstab: static file system information.
 #
 # <file system> <mount point>   <type>  <options>       <dump>  <pass>
@@ -39,26 +39,26 @@ none            /dev/pts        devpts  mode=0620       0       0
 EOF
 
 for i in `seq 1 $NUMPARTITIONS`; do
-  echo -n "/dev/xvde$i " >> ${prefix}/etc/fstab
+  echo -n "/dev/xvde$i " >> ${TARGET}/etc/fstab
   eval part=\$PARTITION$i
   if [ ! -z "`echo $part | grep swap`" ]; then
-     echo "none swap ws 0 0" >> ${prefix}/etc/fstab
+     echo "none swap ws 0 0" >> ${TARGET}/etc/fstab
   else
-     echo $part | awk -F: '{print $4,$3,$5,0,1}' >> ${prefix}/etc/fstab
+     echo $part | awk -F: '{print $4,$3,$5,0,1}' >> ${TARGET}/etc/fstab
   fi
 done
 
 # Install the kernel, grub and perl
-chroot ${prefix} yum clean expire-cache
+chroot ${TARGET} yum clean expire-cache
-chroot ${prefix} yum -y install kernel-xen grub.x86_64 perl.x86_64
+chroot ${TARGET} yum -y install kernel-xen grub.x86_64 perl.x86_64
 
-KERNELVERSION=`ls ${prefix}/boot/vmlinuz-* | sed "s#$prefix/boot/vmlinuz-##"`
+KERNELVERSION=`ls ${TARGET}/boot/vmlinuz-* | sed "s#${TARGET}/boot/vmlinuz-##"`
 logMessage "Kernel $KERNELVERSION found"
 
 # Create grub's menu.list
 logMessage "Creating /boot/grub/menu.lst"
-mkdir -p ${prefix}/boot/grub
+mkdir -p ${TARGET}/boot/grub
-cat > ${prefix}/boot/grub/menu.lst << EOF
+cat > ${TARGET}/boot/grub/menu.lst << EOF
 # WARNING : Don't forget to update this when you upgrade kernel !
 # You can also exclude kernel-xen from updates by putting
 # exclude=kernel-xen in in [main] in yum.conf

hooks/centos-6/25-setup-kernel

@@ -3,7 +3,7 @@
 #  This script sets up the kernel and fstab for CentOS 5.
 #
 
-prefix=$1
+TARGET=$1
 
 #
 #  Source our common functions
@@ -21,16 +21,16 @@ fi
 logMessage Script $0 starting
 
 # Make the console work
-sed -i "/Cancelled/ {G;s/$/co:2345:respawn:\/sbin\/mingetty console/;}" ${prefix}/etc/inittab
+sed -i "/Cancelled/ {G;s/$/co:2345:respawn:\/sbin\/mingetty console/;}" ${TARGET}/etc/inittab
-sed -i "s/^1:2345/#1:2345/" ${prefix}/etc/inittab
+sed -i "s/^1:2345/#1:2345/" ${TARGET}/etc/inittab
 
 # MAKEDEV is needed at this point
-chroot ${prefix} ln -s /sbin/MAKEDEV /dev/MAKEDEV
+chroot ${TARGET} ln -s /sbin/MAKEDEV /dev/MAKEDEV
-chroot ${prefix} /sbin/MAKEDEV sda sdb sdc sdd
+chroot ${TARGET} /sbin/MAKEDEV sda sdb sdc sdd
 
 # Create fstab
 logMessage Create /etc/fstab
-cat > ${prefix}/etc/fstab << EOF
+cat > ${TARGET}/etc/fstab << EOF
 # /etc/fstab: static file system information.
 #
 # <file system> <mount point>   <type>  <options>       <dump>  <pass>
@@ -39,26 +39,26 @@ none            /dev/pts        devpts  mode=0620       0       0
 EOF
 
 for i in `seq 1 $NUMPARTITIONS`; do
-  echo -n "/dev/sda$i " >> ${prefix}/etc/fstab
+  echo -n "/dev/sda$i " >> ${TARGET}/etc/fstab
   eval part=\$PARTITION$i
   if [ ! -z "`echo $part | grep swap`" ]; then
-     echo "none swap ws 0 0" >> ${prefix}/etc/fstab
+     echo "none swap ws 0 0" >> ${TARGET}/etc/fstab
   else
-     echo $part | awk -F: '{print $4,$3,$5,0,1}' >> ${prefix}/etc/fstab
+     echo $part | awk -F: '{print $4,$3,$5,0,1}' >> ${TARGET}/etc/fstab
   fi
 done
 
 # Install the kernel, grub and perl
-chroot ${prefix} yum clean expire-cache
+chroot ${TARGET} yum clean expire-cache
-chroot ${prefix} yum -y install kernel-xen grub.x86_64 perl.x86_64
+chroot ${TARGET} yum -y install kernel-xen grub.x86_64 perl.x86_64
 
-KERNELVERSION=`ls ${prefix}/boot/vmlinuz-* | sed "s#$prefix/boot/vmlinuz-##"`
+KERNELVERSION=`ls ${TARGET}/boot/vmlinuz-* | sed "s#${TARGET}/boot/vmlinuz-##"`
 logMessage "Kernel $KERNELVERSION found"
 
 # Create grub's menu.list
 logMessage "Creating /boot/grub/menu.lst"
-mkdir -p ${prefix}/boot/grub
+mkdir -p ${TARGET}/boot/grub
-cat > ${prefix}/boot/grub/menu.lst << EOF
+cat > ${TARGET}/boot/grub/menu.lst << EOF
 # WARNING : Don't forget to update this when you upgrade kernel !
 # You can also exclude kernel-xen from updates by putting
 # exclude=kernel-xen in in [main] in yum.conf
@@ -71,10 +71,10 @@ initrd        /boot/initramfs-$KERNELVERSION.img
 EOF
 
 # Some use lvm but mkinitrd will generate a wrong initrd when these are present.
-rm -f ${prefix}/etc/lvm/backup/* ${prefix}/etc/lvm/archive/*
+rm -f ${TARGET}/etc/lvm/backup/* ${TARGET}/etc/lvm/archive/*
 
 # Generate a correct initrd.
-chroot ${prefix} mkinitrd --with=xenblk --with=xennet --preload=xenblk --preload=xennet\
+chroot ${TARGET} mkinitrd --with=xenblk --with=xennet --preload=xenblk --preload=xennet\
  -f /boot/initramfs-$KERNELVERSION.img $KERNELVERSION
 
 #

hooks/common.sh

@@ -64,51 +64,51 @@ assert ()
 #
 installDebianPackage ()
 {
-    prefix=$1
+    TARGET=$1
     shift
 
     #
     # Log our options
     #
-    logMessage "Installing Debian packages $@ to prefix ${prefix}"
+    logMessage "Installing Debian packages $@ to target ${TARGET}"
 
     #
-    #  We require a package + prefix
+    #  We require a package + target
     #
-    assert "$LINENO" "${prefix}"
+    assert "$LINENO" "${TARGET}"
 
     #
-    # Prefix must be a directory.
+    # Target must be a directory.
     #
-    assert "$LINENO" -d ${prefix}
+    assert "$LINENO" -d ${TARGET}
 
     #
     #  Use policy-rc to stop any daemons from starting.
     #
-    printf '#!/bin/sh\nexit 101\n' > ${prefix}/usr/sbin/policy-rc.d
+    printf '#!/bin/sh\nexit 101\n' > ${TARGET}/usr/sbin/policy-rc.d
-    chmod +x ${prefix}/usr/sbin/policy-rc.d
+    chmod +x ${TARGET}/usr/sbin/policy-rc.d
 
     #
     # Disable the start-stop-daemon - this shouldn't be necessary
     # with the policy-rc.d addition above, however leaving it in
     # place won't hurt ..
     #
-    disableStartStopDaemon ${prefix}
+    disableStartStopDaemon ${TARGET}
 
     #
     # Install the packages
     #
-    DEBIAN_FRONTEND=noninteractive chroot ${prefix} /usr/bin/apt-get --yes --force-yes --no-install-recommends install "$@"
+    DEBIAN_FRONTEND=noninteractive chroot ${TARGET} /usr/bin/apt-get --yes --force-yes --no-install-recommends install "$@"
 
     #
     #  Remove the policy-rc.d script.
     #
-    rm -f ${prefix}/usr/sbin/policy-rc.d
+    rm -f ${TARGET}/usr/sbin/policy-rc.d
 
     #
     # Re-enable the start-stop-daemon
     #
-    enableStartStopDaemon ${prefix}
+    enableStartStopDaemon ${TARGET}
 
 }
 
@@ -118,7 +118,7 @@ installDebianPackage ()
 #
 generateDebianGrubMenuLst ()
 {
-    prefix="$1"
+    TARGET="$1"
     DOMU_ISSUE="$2"
     DOMU_KERNEL="$3"
     DOMU_RAMDISK="$4"
@@ -126,27 +126,27 @@ generateDebianGrubMenuLst ()
     #
     # Log our options
     #
-    logMessage "Generating a legacy GRUB menu.lst into prefix ${prefix}"
+    logMessage "Generating a legacy GRUB menu.lst into target ${TARGET}"
 
     #
     #  We require at least 3 parameters
     #
-    assert "$LINENO" "${prefix}"
+    assert "$LINENO" "${TARGET}"
     assert "$LINENO" "${DOMU_ISSUE}"
     assert "$LINENO" "${DOMU_KERNEL}"
 
     #
-    # Prefix must be a directory, kernel a file
+    # Target must be a directory, kernel a file
     #
-    assert "$LINENO" -d ${prefix}
+    assert "$LINENO" -d ${TARGET}
-    assert "$LINENO" -f "${prefix}/boot/${DOMU_KERNEL}"
+    assert "$LINENO" -f "${TARGET}/boot/${DOMU_KERNEL}"
 
     #
     # Generate a menu.lst for pygrub
     #
 
-    mkdir -p ${prefix}/boot/grub
+    mkdir -p ${TARGET}/boot/grub
-    cat << E_O_MENU > ${prefix}/boot/grub/menu.lst
+    cat << E_O_MENU > ${TARGET}/boot/grub/menu.lst
 default         0
 timeout         2
 
@@ -256,10 +256,10 @@ E_O_MENU
 #
 disableStartStopDaemon ()
 {
-   local prefix="$1"
+   local TARGET="$1"
-   assert "$LINENO" "${prefix}"
+   assert "$LINENO" "${TARGET}"
    for starter in start-stop-daemon initctl; do
-      local daemonfile="${prefix}/sbin/${starter}"
+      local daemonfile="${TARGET}/sbin/${starter}"
 
       mv "${daemonfile}" "${daemonfile}.REAL"
       echo '#!/bin/sh' > "${daemonfile}"
@@ -277,10 +277,10 @@ disableStartStopDaemon ()
 #
 enableStartStopDaemon ()
 {
-   local prefix=$1
+   local TARGET=$1
-   assert "$LINENO" "${prefix}"
+   assert "$LINENO" "${TARGET}"
    for starter in start-stop-daemon initctl; do
-      local daemonfile="${prefix}/sbin/${starter}"
+      local daemonfile="${TARGET}/sbin/${starter}"
 
       #
       #  If the disabled file is present then enable it.
@@ -301,28 +301,28 @@ enableStartStopDaemon ()
 #
 removeDebianPackage ()
 {
-    prefix=$1
+    TARGET=$1
     shift
 
     #
     # Log our options
     #
-    logMessage "Purging Debian package ${package} from prefix ${prefix}"
+    logMessage "Purging Debian package ${package} from target ${TARGET}"
 
     #
-    #  We require a prefix
+    #  We require a target
     #
-    assert "$LINENO" "${prefix}"
+    assert "$LINENO" "${TARGET}"
 
     #
-    # Prefix must be a directory.
+    # Target must be a directory.
     #
-    assert "$LINENO" -d ${prefix}
+    assert "$LINENO" -d ${TARGET}
 
     #
     # Purge the packages we've been given.
     #
-    chroot ${prefix} /usr/bin/apt-get remove --yes --purge "$@"
+    chroot ${TARGET} /usr/bin/apt-get remove --yes --purge "$@"
 
 }
 
@@ -332,29 +332,29 @@ removeDebianPackage ()
 #
 installRPMPackage ()
 {
-    prefix=$1
+    TARGET=$1
     package=$2
 
     #
     # Log our options
     #
-    logMessage "Installing RPM ${package} to prefix ${prefix}"
+    logMessage "Installing RPM ${package} to target ${TARGET}"
 
     #
-    #  We require a package + prefix
+    #  We require a package + target
     #
     assert "$LINENO" "${package}"
-    assert "$LINENO" "${prefix}"
+    assert "$LINENO" "${TARGET}"
 
     #
-    # Prefix must be a directory.
+    # Target must be a directory.
     #
-    assert "$LINENO" -d ${prefix}
+    assert "$LINENO" -d ${TARGET}
 
     #
     # Install the package
     #
-    chroot ${prefix} /usr/bin/yum -y install ${package}
+    chroot ${TARGET} /usr/bin/yum -y install ${package}
 }
 
 # Backwards Compatibility Function
@@ -373,7 +373,7 @@ isYum() ( [ -x $1/usr/bin/yum ] )
 #
 installPackage ()
 {
-        prefix=$1
+        TARGET=$1
         package=$2
 
         if isDeb ; then
@@ -396,13 +396,13 @@ installPackage ()
 #
 installGentooPackage ()
 {
-    prefix=$1
+    TARGET=$1
     package=$2
 
     #
     # Log our options
     #
-    logMessage "Installing Gentoo package ${package} to prefix ${prefix}"
+    logMessage "Installing Gentoo package ${package} to target ${TARGET}"
 
     logMessage "NOTE: Not doing anything - this is a stub - FIXME"
 

hooks/common/01-disable-daemons

@@ -8,7 +8,7 @@
 # http://www.steve.org.uk/
 
 
-prefix=$1
+TARGET=$1
 
 
 #
@@ -30,20 +30,20 @@ logMessage Script $0 starting
 #
 #  Make sure we have a directory.
 #
-if [ ! -d "${prefix}/usr/sbin" ]; then
+if [ ! -d "${TARGET}/usr/sbin" ]; then
 
-    mkdir -p "${prefix}/usr/sbin"
+    mkdir -p "${TARGET}/usr/sbin"
 
-    logMessage "created missing directory: ${prefix}/usr/sbin"
+    logMessage "created missing directory: ${TARGET}/usr/sbin"
 fi
 
 
 #
 #  Add the script.
 #
-echo '#!/bin/sh' >  ${prefix}/usr/sbin/policy-rc.d
+echo '#!/bin/sh' >  ${TARGET}/usr/sbin/policy-rc.d
-echo 'exit 101'  >> ${prefix}/usr/sbin/policy-rc.d
+echo 'exit 101'  >> ${TARGET}/usr/sbin/policy-rc.d
-chmod 755           ${prefix}/usr/sbin/policy-rc.d
+chmod 755           ${TARGET}/usr/sbin/policy-rc.d
 
 
 

hooks/common/05-shadowconfig-on

@@ -7,7 +7,7 @@
 # http://www.steve.org.uk/
 
 
-prefix=$1
+TARGET=$1
 
 
 #
@@ -29,9 +29,9 @@ logMessage Script $0 starting
 #
 # Enable the shadow passwords if the command is found.
 #
-if [ -x ${prefix}/sbin/shadowconfig ]; then
+if [ -x ${TARGET}/sbin/shadowconfig ]; then
 
-   chroot ${prefix} /sbin/shadowconfig on
+   chroot ${TARGET} /sbin/shadowconfig on
 else
 
    logMessage "/sbin/shadowconfig not found.  skipping."

hooks/common/10-disable-tls

@@ -8,7 +8,7 @@
 
 
 
-prefix=$1
+TARGET=$1
 
 
 #
@@ -37,8 +37,8 @@ if [ "`uname -m`" = "x86_64" ]; then
 else
 
     logMessage "Disabling TLS"
-    mv ${prefix}/lib/tls ${prefix}/lib/tls.disabled
+    mv ${TARGET}/lib/tls ${TARGET}/lib/tls.disabled
-    mkdir ${prefix}/lib/tls
+    mkdir ${TARGET}/lib/tls
 fi
 
 

hooks/common/15-disable-hwclock

@@ -7,7 +7,7 @@
 # http://www.steve.org.uk/
 
 
-prefix=$1
+TARGET=$1
 
 
 #
@@ -29,7 +29,7 @@ logMessage Script $0 starting
 #
 #  Disable the startup scripts from all runlevels.
 #
-chroot ${prefix} /usr/sbin/update-rc.d -f hwclock.sh remove
+chroot ${TARGET} /usr/sbin/update-rc.d -f hwclock.sh remove
 
 #
 # Log our finish

hooks/common/20-setup-apt

@@ -8,7 +8,7 @@
 #
 
 
-prefix=$1
+TARGET=$1
 
 
 #
@@ -33,17 +33,17 @@ logMessage Script $0 starting
 # the setting to the proxy guess file.
 #
 if [ ${apt_proxy} ]; then
-  echo "Acquire::http::Proxy \"${apt_proxy}\";" > ${prefix}/etc/apt/apt.conf.d/01proxy
+  echo "Acquire::http::Proxy \"${apt_proxy}\";" > ${TARGET}/etc/apt/apt.conf.d/01proxy
 else
   logMessage The use of a proxy detected.
-  apt-config dump | grep -i Acquire::HTTP::Proxy > ${prefix}/etc/apt/apt.conf.d/01proxy
+  apt-config dump | grep -i Acquire::HTTP::Proxy > ${TARGET}/etc/apt/apt.conf.d/01proxy
 fi
 
 
 #
 # Setup the sources.list file for new installations of Ubuntu GNU/Linux.
 #
-cat <<E_O_APT > ${prefix}/etc/apt/sources.list
+cat <<E_O_APT > ${TARGET}/etc/apt/sources.list
 #
 #  /etc/apt/sources.list
 #
@@ -66,7 +66,7 @@ E_O_APT
 #
 #  Now that the sources have been setup make sure the system is up to date.
 #
-chroot ${prefix} /usr/bin/apt-get update
+chroot ${TARGET} /usr/bin/apt-get update
 
 
 #
@@ -76,7 +76,7 @@ chroot ${prefix} /usr/bin/apt-get update
 if [ "$arch" = 'i386' -a "$dist" != 'dapper' ]; then
 
     logMessage "Installing libc6-xen"
-    installDebianPackage ${prefix} libc6-xen
+    installDebianPackage ${TARGET} libc6-xen
 
 fi
 

hooks/common/20-setup-yum

@@ -7,7 +7,7 @@
 # http://www.steve.org.uk/
 
 
-prefix=$1
+TARGET=$1
 
 
 #
@@ -29,12 +29,12 @@ logMessage Script $0 starting
 #
 # Update yum
 #
-if [ ! -d ${prefix}/proc ]; then
+if [ ! -d ${TARGET}/proc ]; then
-    mkdir -p ${prefix}/proc
+    mkdir -p ${TARGET}/proc
 fi
-mount -o bind /proc ${prefix}/proc
+mount -o bind /proc ${TARGET}/proc
-chroot ${prefix} /usr/bin/yum update
+chroot ${TARGET} /usr/bin/yum update
-umount ${prefix}/proc
+umount ${TARGET}/proc
 
 
 #

hooks/common/25-generate-locale

@@ -7,7 +7,7 @@
 
 
 
-prefix=$1
+TARGET=$1
 
 
 #
@@ -31,7 +31,7 @@ logMessage Script $0 starting
 #
 #  NOTE:  Failure to support your favourite language is *not* a bug.
 #
-installDebianPackage ${prefix} language-pack-en
+installDebianPackage ${TARGET} language-pack-en
 
 
 #

hooks/common/30-disable-gettys

@@ -6,7 +6,7 @@
 #
 
 
-prefix=$1
+TARGET=$1
 
 
 #
@@ -30,20 +30,20 @@ logMessage Script $0 starting
 #
 
 # Upstart on Ubuntu newer than 8.04
-rm -f ${prefix}/etc/init/tty[!1].conf
+rm -f ${TARGET}/etc/init/tty[!1].conf
-[ -f ${prefix}/etc/init/tty1.conf ] && {
+[ -f ${TARGET}/etc/init/tty1.conf ] && {
-    sed -i -e s/tty1/hvc0/ ${prefix}/etc/init/tty1.conf
+    sed -i -e s/tty1/hvc0/ ${TARGET}/etc/init/tty1.conf
-    mv ${prefix}/etc/init/tty1.conf  ${prefix}/etc/init/hvc0.conf
+    mv ${TARGET}/etc/init/tty1.conf  ${TARGET}/etc/init/hvc0.conf
 }
 # Upstart on Ubuntu 8.04 or older
-rm -f ${prefix}/etc/event.d/tty[!1]
+rm -f ${TARGET}/etc/event.d/tty[!1]
-[ -f ${prefix}/etc/event.d/tty1 ] && {
+[ -f ${TARGET}/etc/event.d/tty1 ] && {
-    sed -i -e s/tty1/hvc0/ ${prefix}/etc/event.d/tty1
+    sed -i -e s/tty1/hvc0/ ${TARGET}/etc/event.d/tty1
-    mv ${prefix}/etc/event.d/tty1 ${prefix}/etc/event.d/hvc0
+    mv ${TARGET}/etc/event.d/tty1 ${TARGET}/etc/event.d/hvc0
 }
 
 # Inittab
-[ -f ${prefix}/etc/inittab ] && sed -i -e 's/^\([2-6].*:respawn*\)/#\1/' -e 's/^T/#\t/' -e 's/tty1$/hvc0/' ${prefix}/etc/inittab
+[ -f ${TARGET}/etc/inittab ] && sed -i -e 's/^\([2-6].*:respawn*\)/#\1/' -e 's/^T/#\t/' -e 's/tty1$/hvc0/' ${TARGET}/etc/inittab
 
 
 #
@@ -59,21 +59,21 @@ if [ ! -z "${serial_device}" ]; then
     # replace existing device.
 
     # Upstart on Ubuntu newer than 8.04
-    [ -f ${prefix}/etc/init/hvc0.conf ] && {
+    [ -f ${TARGET}/etc/init/hvc0.conf ] && {
-        mv ${prefix}/etc/init/hvc0.conf  ${prefix}/etc/init/${serial_device}.conf
+        mv ${TARGET}/etc/init/hvc0.conf  ${TARGET}/etc/init/${serial_device}.conf
-        sed -i -e s/hvc0/${serial_device}/ ${prefix}/etc/init/${serial_device}.conf
+        sed -i -e s/hvc0/${serial_device}/ ${TARGET}/etc/init/${serial_device}.conf
     }
     # Upstart on Ubuntu 8.04 or older
-    [ -f ${prefix}/etc/event.d/hvc0 ] && {
+    [ -f ${TARGET}/etc/event.d/hvc0 ] && {
-        mv ${prefix}/etc/event.d/hvc0  ${prefix}/etc/event.d/${serial_device}
+        mv ${TARGET}/etc/event.d/hvc0  ${TARGET}/etc/event.d/${serial_device}
-        sed -i -e s/hvc0/${serial_device}/ ${prefix}/etc/event.d/${serial_device}
+        sed -i -e s/hvc0/${serial_device}/ ${TARGET}/etc/event.d/${serial_device}
     }
 
     # Inittab
-    [ -f ${prefix}/etc/inittab ] && sed -i -e s/hvc0/${serial_device}/ ${prefix}/etc/inittab
+    [ -f ${TARGET}/etc/inittab ] && sed -i -e s/hvc0/${serial_device}/ ${TARGET}/etc/inittab
 
     # make sure that it is allowed to login.
-    echo $serial_device >> ${prefix}/etc/securetty
+    echo $serial_device >> ${TARGET}/etc/securetty
 fi
 
 

hooks/common/40-setup-networking-deb

@@ -8,7 +8,7 @@
 # http://www.steve.org.uk/
 
 
-prefix=$1
+TARGET=$1
 
 #
 #  Source our common functions
@@ -29,7 +29,7 @@ logMessage Script $0 starting
 #
 #  Make sure we have an /etc/network directory.
 #
-mkdir -p ${prefix}/etc/network
+mkdir -p ${TARGET}/etc/network
 
 
 #
@@ -40,7 +40,7 @@ setupDynamicNetworking ()
     #
     # The host is using DHCP.
     #
-    cat <<E_O_DHCP > ${prefix}/etc/network/interfaces
+    cat <<E_O_DHCP > ${TARGET}/etc/network/interfaces
 # This file describes the network interfaces available on your system
 # and how to activate them. For more information, see interfaces(5).
 
@@ -88,7 +88,7 @@ setupStaticNetworking ()
     #
     # We have a static IP address
     #
-    cat <<E_O_STATIC >${prefix}/etc/network/interfaces
+    cat <<E_O_STATIC >${TARGET}/etc/network/interfaces
 # This file describes the network interfaces available on your system
 # and how to activate them. For more information, see interfaces(5).
 
@@ -122,7 +122,7 @@ E_O_STATIC
 
         logMessage Adding etho:${interface}
 
-        cat <<E_O_STATIC >>${prefix}/etc/network/interfaces
+        cat <<E_O_STATIC >>${TARGET}/etc/network/interfaces
 auto eth0:${interface}
 iface eth0:${interface} inet static
  address ${value}
@@ -139,12 +139,12 @@ E_O_STATIC
     # will be restored after hooks are run.
     #
     if [ '' != "$nameserver" ]; then
-        rm -f ${prefix}/etc/resolv.conf.old
+        rm -f ${TARGET}/etc/resolv.conf.old
         for ns in $nameserver; do
-            echo "nameserver $ns" >>${prefix}/etc/resolv.conf.old
+            echo "nameserver $ns" >>${TARGET}/etc/resolv.conf.old
         done
     else
-        cp /etc/resolv.conf ${prefix}/etc/resolv.conf.old
+        cp /etc/resolv.conf ${TARGET}/etc/resolv.conf.old
     fi
 }
 

hooks/common/40-setup-networking-rpm

@@ -7,7 +7,7 @@
 # http://www.steve.org.uk/
 
 
-prefix=$1
+TARGET=$1
 
 
 #
@@ -29,7 +29,7 @@ logMessage Script $0 starting
 #
 #  Make sure we have an /etc/sysconfig/network-scripts directory.
 #
-mkdir -p ${prefix}/etc/sysconfig/network-scripts/
+mkdir -p ${TARGET}/etc/sysconfig/network-scripts/
 
 
 #
@@ -40,7 +40,7 @@ if [ -z "${dhcp}" ]; then
     #
     #  Setup the initial interface
     #
-    cat <<E_O_STATIC >${prefix}/etc/sysconfig/network-scripts/ifcfg-eth0
+    cat <<E_O_STATIC >${TARGET}/etc/sysconfig/network-scripts/ifcfg-eth0
 DEVICE=eth0
 ONBOOT=yes
 BOOTPROTO=static
@@ -62,7 +62,7 @@ E_O_STATIC
 
          logMessage Adding etho:${interface}
 
-         cat <<E_O_STATIC >${prefix}/etc/sysconfig/network-scripts/ifcfg-eth0:${interface}
+         cat <<E_O_STATIC >${TARGET}/etc/sysconfig/network-scripts/ifcfg-eth0:${interface}
 DEVICE=eth0:${interface}
 ONBOOT=yes
 BOOTPROTO=static
@@ -79,27 +79,27 @@ E_O_STATIC
     # will be restored after hooks are run.
     #
     if [ '' != "$nameserver" ]; then
-        rm -f ${prefix}/etc/resolv.conf.old
+        rm -f ${TARGET}/etc/resolv.conf.old
         for ns in $nameserver; do
-            echo "nameserver $ns" >>${prefix}/etc/resolv.conf.old
+            echo "nameserver $ns" >>${TARGET}/etc/resolv.conf.old
         done
     else
-        cp /etc/resolv.conf ${prefix}/etc/resolv.conf.old
+        cp /etc/resolv.conf ${TARGET}/etc/resolv.conf.old
     fi
 else
-    cat <<E_O_DHCP >${prefix}/etc/sysconfig/network-scripts/ifcfg-eth0
+    cat <<E_O_DHCP >${TARGET}/etc/sysconfig/network-scripts/ifcfg-eth0
 DEVICE=eth0
 BOOTPROTO=dhcp
 ONBOOT=yes
 E_O_DHCP
-    chroot ${prefix} /usr/bin/yum -y install dhclient
+    chroot ${TARGET} /usr/bin/yum -y install dhclient
 fi
 
 
 #
 #  Don't forget to setup the default route.
 #
-cat <<EOF >${prefix}/etc/sysconfig/network
+cat <<EOF >${TARGET}/etc/sysconfig/network
 NETWORKING=yes
 GATEWAY=${gateway}
 HOSTNAME=${hostname}

hooks/common/50-setup-hostname-deb

@@ -9,7 +9,7 @@
 
 
 
-prefix=$1
+TARGET=$1
 
 
 #
@@ -43,8 +43,8 @@ umask 022
 #
 #  Setup the mailname + hostname files.
 #
-echo $GUEST_HOSTNAME > ${prefix}/etc/hostname
+echo $GUEST_HOSTNAME > ${TARGET}/etc/hostname
-echo $GUEST_FQDN > ${prefix}/etc/mailname
+echo $GUEST_FQDN > ${TARGET}/etc/mailname
 
 
 #
@@ -55,7 +55,7 @@ if [ -z "${copyhosts}" ]; then
     #
     #  Copy localhost
     #
-    cat > ${prefix}/etc/hosts <<EOF
+    cat > ${TARGET}/etc/hosts <<EOF
 127.0.0.1    localhost
 EOF
     #
@@ -65,21 +65,21 @@ EOF
         #
         #  If dhcp is diabled, FQDN should resolve to our IP
         #
-        cat >> ${prefix}/etc/hosts <<EOF
+        cat >> ${TARGET}/etc/hosts <<EOF
 ${ip1}    $GUEST_FQDN $GUEST_HOSTNAME
 EOF
     else
-        cat >> ${prefix}/etc/hosts <<EOF
+        cat >> ${TARGET}/etc/hosts <<EOF
 127.0.1.1    $GUEST_FQDN $GUEST_HOSTNAME
 EOF
     fi
 
-    cat >> ${prefix}/etc/hosts <<EOF
+    cat >> ${TARGET}/etc/hosts <<EOF
 
 # The following lines are desirable for IPv6 capable hosts
 ::1     ip6-localhost ip6-loopback
 fe00::0 ip6-localnet
-ff00::0 ip6-mcastprefix
+ff00::0 ip6-mcastTARGET
 ff02::1 ip6-allnodes
 ff02::2 ip6-allrouters
 ff02::3 ip6-allhosts
@@ -88,23 +88,23 @@ EOF
 
 else
     # Non-IPv6 stuff.
-    grep -v '\(::\|IPv6\)' /etc/hosts > ${prefix}/etc/hosts
+    grep -v '\(::\|IPv6\)' /etc/hosts > ${TARGET}/etc/hosts
 
     # New entry.
     if [ -z "${dhcp}" ]; then
-        cat >> ${prefix}/etc/hosts <<EOF
+        cat >> ${TARGET}/etc/hosts <<EOF
 ${ip1}    $GUEST_FQDN $GUEST_HOSTNAME
 
 EOF
     else
-    cat >> ${prefix}/etc/hosts <<EOF
+    cat >> ${TARGET}/etc/hosts <<EOF
 127.0.1.1    $GUEST_FQDN $GUEST_HOSTNAME
 
 EOF
     fi
 
     # IPv6 stuff.
-    grep '\(::\|IPv6\)' /etc/hosts >> ${prefix}/etc/hosts
+    grep '\(::\|IPv6\)' /etc/hosts >> ${TARGET}/etc/hosts
 fi
 
 

hooks/common/50-setup-hostname-rpm

@@ -9,7 +9,7 @@
 
 
 
-prefix=$1
+TARGET=$1
 
 
 #
@@ -37,8 +37,8 @@ umask 022
 #
 #  Setup the mailname + hostname files.
 #
-echo ${hostname} | sed 's/^\([^\.]*\)\..*/\1/' > ${prefix}/etc/hostname
+echo ${hostname} | sed 's/^\([^\.]*\)\..*/\1/' > ${TARGET}/etc/hostname
-echo ${hostname} > ${prefix}/etc/mailname
+echo ${hostname} > ${TARGET}/etc/mailname
 
 
 #
@@ -48,21 +48,21 @@ echo ${hostname} > ${prefix}/etc/mailname
 if [ -z "${dhcp}" ]; then
 
     # Non-IPv6 stuff.
-    grep -v '\(::\|IPv6\)' /etc/hosts > ${prefix}/etc/hosts
+    grep -v '\(::\|IPv6\)' /etc/hosts > ${TARGET}/etc/hosts
 
     # New entry.
-    echo "${ip1}    ${hostname}" >> ${prefix}/etc/hosts
+    echo "${ip1}    ${hostname}" >> ${TARGET}/etc/hosts
-    echo " " >> ${prefix}/etc/hosts
+    echo " " >> ${TARGET}/etc/hosts
 
     # IPv6 stuff.
-    grep '\(::\|IPv6\)' /etc/hosts >> ${prefix}/etc/hosts
+    grep '\(::\|IPv6\)' /etc/hosts >> ${TARGET}/etc/hosts
 
 else
 
     #
     #  Stub /etc/hosts for DHCP clients.
     #
-    cat >> ${prefix}/etc/hosts <<EOF
+    cat >> ${TARGET}/etc/hosts <<EOF
 127.0.0.1       localhost
 
 # The following lines are desirable for IPv6 capable hosts

hooks/common/55-create-dev

@@ -8,7 +8,7 @@
 # http://www.steve.org.uk/
 
 
-prefix=$1
+TARGET=$1
 
 
 #
@@ -32,8 +32,8 @@ logMessage Script $0 starting
 MAKEDEV=''
 MAKEDEV_PATHS="/sbin/MAKEDEV /dev/MAKEDEV"
 for MAKEDEV_PATH in ${MAKEDEV_PATHS}; do
-    if [ -x "${prefix}${MAKEDEV_PATH}" ]; then
+    if [ -x "${TARGET}${MAKEDEV_PATH}" ]; then
-    MAKEDEV="${prefix}${MAKEDEV_PATH}"
+    MAKEDEV="${TARGET}${MAKEDEV_PATH}"
     break
     fi
 done
@@ -44,11 +44,11 @@ if [ -n "${MAKEDEV}" ]; then
 # Early termination if we have a couple of common devices present
 # should speed up installs which use --copy/--tar
 #
-if ( test `ls -1 ${prefix}/dev | wc -l` -gt 10 ); then
+if ( test `ls -1 ${TARGET}/dev | wc -l` -gt 10 ); then
     #
     # We still need to make sure the basic devices are present
     #
-    cd ${prefix}/dev
+    cd ${TARGET}/dev
     ${MAKEDEV} std
     ${MAKEDEV} hda
     ${MAKEDEV} sda
@@ -62,7 +62,7 @@ fi
 #
 #  Make the device nodes.
 #
-cd ${prefix}/dev
+cd ${TARGET}/dev
 ${MAKEDEV} generic
 ${MAKEDEV} std
 

hooks/common/60-copy-host-files

@@ -5,7 +5,7 @@
 #
 
 
-prefix=$1
+TARGET=$1
 
 
 #
@@ -27,8 +27,8 @@ logMessage Script $0 starting
 #
 # Copy "required" files from our host.
 #
-cp /etc/timezone    ${prefix}/etc
+cp /etc/timezone    ${TARGET}/etc
-cp /etc/localtime   ${prefix}/etc
+cp /etc/localtime   ${TARGET}/etc
 
 
 #

hooks/common/65-copy-user-files

@@ -5,7 +5,7 @@
 #
 
 
-prefix=$1
+TARGET=$1
 
 
 #
@@ -32,7 +32,7 @@ if [ -d /etc/xen-tools/skel ]; then
 
     logMessage Copying files from /etc/xen-tools/skel
 
-    (cd /etc/xen-tools/skel; tar -cf - . ) | (cd ${prefix}/; tar -xpf -)
+    (cd /etc/xen-tools/skel; tar -cf - . ) | (cd ${TARGET}/; tar -xpf -)
 
     logMessage Finished
 

hooks/common/70-install-ssh-deb

@@ -10,7 +10,7 @@
 # --
 # http://nedos.net/
 
-prefix=$1
+TARGET=$1
 
 #
 #  Source our common functions
@@ -31,13 +31,13 @@ logMessage Script $0 starting
 #
 #  First, create an ssh directory
 #
-mkdir -p ${prefix}/etc/ssh
+mkdir -p ${TARGET}/etc/ssh
 
 #
 #  Second, Generate the Host RSA Key
 #
-if [ ! -f ${prefix}/etc/ssh/ssh_host_rsa_key ]; then
+if [ ! -f ${TARGET}/etc/ssh/ssh_host_rsa_key ]; then
-if ssh-keygen -t rsa -N "" -f ${prefix}/etc/ssh/ssh_host_rsa_key -C "root@${hostname}"; then
+if ssh-keygen -t rsa -N "" -f ${TARGET}/etc/ssh/ssh_host_rsa_key -C "root@${hostname}"; then
     logMessage "successfully generated RSA host key"
 else
     logMessage "failed to generate RSA host key"
@@ -47,8 +47,8 @@ fi
 #
 #  Third, Generate the Host DSA Key
 #
-if [ ! -f ${prefix}/etc/ssh/ssh_host_dsa_key ]; then
+if [ ! -f ${TARGET}/etc/ssh/ssh_host_dsa_key ]; then
-if ssh-keygen -t dsa -N "" -f ${prefix}/etc/ssh/ssh_host_dsa_key -C "root@${hostname}"; then
+if ssh-keygen -t dsa -N "" -f ${TARGET}/etc/ssh/ssh_host_dsa_key -C "root@${hostname}"; then
     logMessage "successfully generated DSA host key"
 else
     logMessage "failed to generate DSA host key"
@@ -58,7 +58,7 @@ fi
 #
 #  Install ssh
 #
-installDebianPackage ${prefix} openssh-server
+installDebianPackage ${TARGET} openssh-server
 
 #
 # Log our finish

hooks/common/70-install-ssh-rpm

@@ -7,7 +7,7 @@
 # http://www.steve.org.uk/
 
 
-prefix=$1
+TARGET=$1
 
 
 #
@@ -28,12 +28,12 @@ logMessage Script $0 starting
 #
 # Install the OpenSSH server.
 #
-if [ ! -d ${prefix}/proc ]; then
+if [ ! -d ${TARGET}/proc ]; then
-    mkdir -p ${prefix}/proc
+    mkdir -p ${TARGET}/proc
 fi
-mount -o bind /proc ${prefix}/proc
+mount -o bind /proc ${TARGET}/proc
-chroot ${prefix} /usr/bin/yum  -y install openssh-server passwd
+chroot ${TARGET} /usr/bin/yum  -y install openssh-server passwd
-umount ${prefix}/proc
+umount ${TARGET}/proc
 
 
 #

hooks/common/75-fixup-securetty

@@ -8,7 +8,7 @@
 # http://www.steve.org.uk/
 
 
-prefix=$1
+TARGET=$1
 
 
 #
@@ -29,7 +29,7 @@ logMessage Script $0 starting
 #
 # If the file doesn't exist exit early.
 #
-if [ ! -e ${prefix}/etc/securetty ]; then
+if [ ! -e ${TARGET}/etc/securetty ]; then
     logMessage /etc/securetty not found.
     exit
 fi
@@ -43,13 +43,13 @@ for i in xvc0 hvc0 ; do
     #
     #  Only append if not presnt.
     #
-    if ( grep $i ${prefix}/etc/securetty > /dev/null ) ; then
+    if ( grep $i ${TARGET}/etc/securetty > /dev/null ) ; then
 
         logMessage Host already has $i entry
 
     else
         
-        echo $i >> ${prefix}/etc/securetty
+        echo $i >> ${TARGET}/etc/securetty
     fi
 
 done

hooks/common/80-install-modules-deb

@@ -12,7 +12,7 @@
 # http://www.steve.org.uk/
 
 
-prefix=$1
+TARGET=$1
 
 
 
@@ -50,16 +50,16 @@ if [ -n "${modules}" -a -d "${modules}" ]; then
     #
     logMessage "Copying modules from ${modules}"
 
-    mkdir -p ${prefix}/lib/modules
+    mkdir -p ${TARGET}/lib/modules
-    cp -au ${modules} ${prefix}/lib/modules
+    cp -au ${modules} ${TARGET}/lib/modules
-elif chroot ${prefix} /usr/bin/apt-cache show ${linux_modules_package} >/dev/null 2>/dev/null; then
+elif chroot ${TARGET} /usr/bin/apt-cache show ${linux_modules_package} >/dev/null 2>/dev/null; then
 
     logMessage "Package '${linux_modules_package}' is available - installing"
 
     #
     # If it worked then we can install the package.
     #
-    installDebianPackage ${prefix} ${linux_modules_package}
+    installDebianPackage ${TARGET} ${linux_modules_package}
 else
 
     #
@@ -69,8 +69,8 @@ else
     logMessage "Package '${linux_modules_package}' is not available"
     logMessage "Copying modules from /lib/modules/$(uname -r)"
 
-    mkdir -p ${prefix}/lib/modules
+    mkdir -p ${TARGET}/lib/modules
-    cp -au /lib/modules/$(uname -r) ${prefix}/lib/modules
+    cp -au /lib/modules/$(uname -r) ${TARGET}/lib/modules
 fi
 
 fi # if pygrub

hooks/common/80-install-modules-rpm

@@ -12,7 +12,7 @@
 # http://www.steve.org.uk/
 
 
-prefix=$1
+TARGET=$1
 
 
 
@@ -36,8 +36,8 @@ logMessage Script $0 starting
 #  Copy the modules from the host to the new system - we should only
 # really copy the *correct* modules, but we don't know what they are.
 #
-mkdir -p ${prefix}/lib/modules
+mkdir -p ${TARGET}/lib/modules
-cp -au /lib/modules/*/ ${prefix}/lib/modules
+cp -au /lib/modules/*/ ${TARGET}/lib/modules
 
 
 #

hooks/common/81-install-modules-init-tools

@@ -6,7 +6,7 @@
 # can't really do anything bad; just waste a bit of space.
 #
 
-prefix=$1
+TARGET=$1
 
 
 
@@ -28,14 +28,14 @@ logMessage Script $0 starting
 #
 #  Install either kmod or module-init-tools package.
 #
-if chroot ${prefix} /usr/bin/apt-cache show module-init-tools >/dev/null 2>/dev/null; then
+if chroot ${TARGET} /usr/bin/apt-cache show module-init-tools >/dev/null 2>/dev/null; then
-    if chroot ${prefix} /usr/bin/apt-cache show module-init-tools | fgrep -qi transitional; then
+    if chroot ${TARGET} /usr/bin/apt-cache show module-init-tools | fgrep -qi transitional; then
-        installDebianPackage ${prefix} kmod
+        installDebianPackage ${TARGET} kmod
     else
-        installDebianPackage ${prefix} module-init-tools
+        installDebianPackage ${TARGET} module-init-tools
     fi
 else
-    installDebianPackage ${prefix} kmod
+    installDebianPackage ${TARGET} kmod
 fi
 
 #

hooks/common/82-install-grub-legacy

@@ -7,7 +7,7 @@
 # really do anything bad; just waste a bit of space.
 
 
-prefix=$1
+TARGET=$1
 
 
 
@@ -31,16 +31,16 @@ if [ ${pygrub} ]; then
 #
 #  Install the grub 0.9x package ("grub-legacy" on Debian, "grub" on Ubuntu)
 #
-if chroot ${prefix} /usr/bin/apt-cache show grub-legacy 2>/dev/null | egrep -qi 'GRand Unified Bootloader.*Legacy'; then
+if chroot ${TARGET} /usr/bin/apt-cache show grub-legacy 2>/dev/null | egrep -qi 'GRand Unified Bootloader.*Legacy'; then
-    installDebianPackage ${prefix} grub-legacy
+    installDebianPackage ${TARGET} grub-legacy
 else
-    installDebianPackage ${prefix} grub
+    installDebianPackage ${TARGET} grub
 fi
 
-if [ ! -e ${prefix}/boot/grub/default ]; then
+if [ ! -e ${TARGET}/boot/grub/default ]; then
-    echo default > ${prefix}/boot/grub/default
+    echo default > ${TARGET}/boot/grub/default
 fi
-chroot ${prefix} /usr/sbin/update-grub
+chroot ${TARGET} /usr/sbin/update-grub
 
 else
     logMessage "pygrub not set, skipping grub-legacy installation"

hooks/common/90-make-fstab

@@ -12,7 +12,7 @@
 # http://www.steve.org.uk/
 
 
-prefix=$1
+TARGET=$1
 
 #
 #  Source our common functions
@@ -62,7 +62,7 @@ logMessage "Root device is /dev/$device"
 has_xfs=0
 has_reiserfs=0
 has_btrfs=0
-cat <<E_O_FSTAB > ${prefix}/etc/fstab
+cat <<E_O_FSTAB > ${TARGET}/etc/fstab
 # /etc/fstab: static file system information.
 #
 # <file system> <mount point>   <type>  <options>       <dump>  <pass>
@@ -93,9 +93,9 @@ for part in `seq 1 ${NUMPARTITIONS}`; do
     esac
 
     if [ "${partdata2}" = "swap" ]; then
-        echo "/dev/${device}${part} none swap sw 0 0" >> ${prefix}/etc/fstab
+        echo "/dev/${device}${part} none swap sw 0 0" >> ${TARGET}/etc/fstab
     else
-        echo "/dev/${device}${part} ${partdata3} ${partdata2} ${partdata4} 0 1" >> ${prefix}/etc/fstab
+        echo "/dev/${device}${part} ${partdata3} ${partdata2} ${partdata4} 0 1" >> ${TARGET}/etc/fstab
     fi
 done
 
@@ -106,7 +106,7 @@ logMessage Checking for filesystem tools to install
 #  Install any required packages for the given root filesystem
 #
 if [ "$has_xfs" -eq 1 ]; then
-    installPackage ${prefix} xfsprogs
+    installPackage ${TARGET} xfsprogs
 fi
 if [ "$has_reiserfs" -eq 1 ]; then
     if isAPT; then

hooks/common/99-clean-image-deb

@@ -7,7 +7,7 @@
 # http://www.steve.org.uk/
 
 
-prefix=$1
+TARGET=$1
 
 
 #
@@ -29,7 +29,7 @@ logMessage Script $0 starting
 #
 #  Clean the APT package cache for Debian GNU/Linux.
 #
-chroot ${prefix} /usr/bin/apt-get clean
+chroot ${TARGET} /usr/bin/apt-get clean
 
 
 #

hooks/common/99-clean-image-rpm

@@ -7,7 +7,7 @@
 # http://www.steve.org.uk/
 
 
-prefix=$1
+TARGET=$1
 
 #
 #  Source our common functions
@@ -29,20 +29,20 @@ logMessage Script $0 starting
 # Clean up RPM files.
 #
 logMessage Cleaning .rpm* files.
-find ${prefix}/ -name '*.rpmorig' -exec rm -f \{\} \;
+find ${TARGET}/ -name '*.rpmorig' -exec rm -f \{\} \;
-find ${prefix}/ -name '*.rpmnew' -exec rm -f \{\} \;
+find ${TARGET}/ -name '*.rpmnew' -exec rm -f \{\} \;
 
 #
 #  Clean yum
 #
 logMessage Cleaning Yum Repository
 
-if [ ! -d ${prefix}/proc ]; then
+if [ ! -d ${TARGET}/proc ]; then
-    mkdir -p ${prefix}/proc
+    mkdir -p ${TARGET}/proc
 fi
-mount -o bind /proc ${prefix}/proc
+mount -o bind /proc ${TARGET}/proc
-chroot ${prefix} /usr/bin/yum clean all
+chroot ${TARGET} /usr/bin/yum clean all
-umount ${prefix}/proc
+umount ${TARGET}/proc
 
 #
 #  Log our finish

hooks/common/99-enable-daemons

@@ -8,7 +8,7 @@
 
 
 
-prefix=$1
+TARGET=$1
 
 
 #
@@ -30,11 +30,11 @@ logMessage Script $0 starting
 #
 #  Remove the script if present.
 #
-if [ -x "${prefix}/usr/sbin/policy-rc.d" ]; then
+if [ -x "${TARGET}/usr/sbin/policy-rc.d" ]; then
 
-    rm -f "${prefix}/usr/sbin/policy-rc.d"
+    rm -f "${TARGET}/usr/sbin/policy-rc.d"
 
-    logMessage "Removed: ${prefix}/usr/sbin/policy-rc.d"
+    logMessage "Removed: ${TARGET}/usr/sbin/policy-rc.d"
 
 fi
 

hooks/debian/20-setup-apt

@@ -8,7 +8,7 @@
 #
 
 
-prefix=$1
+TARGET=$1
 
 
 #
@@ -33,17 +33,17 @@ logMessage Script $0 starting
 # the setting to the proxy guess file.
 #
 if [ ${apt_proxy} ]; then
-  echo "Acquire::http::Proxy \"${apt_proxy}\";" > ${prefix}/etc/apt/apt.conf.d/01proxy
+  echo "Acquire::http::Proxy \"${apt_proxy}\";" > ${TARGET}/etc/apt/apt.conf.d/01proxy
 else
   logMessage The use of a proxy detected.
-  apt-config dump | grep -i Acquire::HTTP::Proxy > ${prefix}/etc/apt/apt.conf.d/01proxy
+  apt-config dump | grep -i Acquire::HTTP::Proxy > ${TARGET}/etc/apt/apt.conf.d/01proxy
 fi
 
 
 #
 # Setup the sources.list file for new installations of Debian GNU/Linux.
 #
-cat <<E_O_APT > ${prefix}/etc/apt/sources.list
+cat <<E_O_APT > ${TARGET}/etc/apt/sources.list
 #
 #  /etc/apt/sources.list
 #
@@ -66,7 +66,7 @@ if ( test "${dist}" "!=" "sid" && test "${dist}" "!=" "unstable" && \
      test -e /etc/apt/sources.list && \
      grep ^deb.*security -r /etc/apt/sources.list /etc/apt/sources.list.d >/dev/null 2>/dev/null ) ; then
 
-    cat <<E_O_APT >> ${prefix}/etc/apt/sources.list
+    cat <<E_O_APT >> ${TARGET}/etc/apt/sources.list
 # 
 #  Security updates
 # 
@@ -75,7 +75,7 @@ deb-src http://security.debian.org/ ${dist}/updates  main contrib non-free
 E_O_APT
 
 else
-    cat <<E_O_APT >> ${prefix}/etc/apt/sources.list
+    cat <<E_O_APT >> ${TARGET}/etc/apt/sources.list
 # 
 #  Security updates - Uncomment to enable.
 # 
@@ -88,7 +88,7 @@ fi
 #
 #  Now that the sources have been setup make sure the system is up to date.
 #
-chroot ${prefix} /usr/bin/apt-get update
+chroot ${TARGET} /usr/bin/apt-get update
 
 #
 # For all systems after Sarge we install libc6-xen on i386
@@ -98,11 +98,11 @@ chroot ${prefix} /usr/bin/apt-get update
 if [ "${arch}" = "i386" ]; then
     if [ "${dist}" = 'sarge' ]; then
         logMessage "Disabling TLS"
-        mv ${prefix}/lib/tls ${prefix}/lib/tls.disabled
+        mv ${TARGET}/lib/tls ${TARGET}/lib/tls.disabled
-        mkdir ${prefix}/lib/tls
+        mkdir ${TARGET}/lib/tls
     else
         logMessage "Installing xen-aware libc6"
-        installDebianPackage ${prefix} libc6-xen
+        installDebianPackage ${TARGET} libc6-xen
     fi
 fi
 

hooks/debian/80-install-kernel

@@ -9,7 +9,7 @@
 # --
 # http://nedos.net
 
-prefix=$1
+TARGET=$1
 
 #
 #  Source our common functions
@@ -62,19 +62,19 @@ KERNEL_XEN_PKG="linux-image-xen-$XEN_ARCH"
 KERNEL_PKG="linux-image-$XEN_ARCH"
 
 logMessage Attempting to install the $KERNEL_XEN_PKG kernel image
-if chroot ${prefix} /usr/bin/apt-cache show $KERNEL_XEN_PKG > /dev/null 2>&1; then
+if chroot ${TARGET} /usr/bin/apt-cache show $KERNEL_XEN_PKG > /dev/null 2>&1; then
     logMessage Package $KERNEL_XEN_PKG is available - installing
-    installDebianPackage ${prefix} initramfs-tools
+    installDebianPackage ${TARGET} initramfs-tools
-    installDebianPackage ${prefix} $KERNEL_XEN_PKG
+    installDebianPackage ${TARGET} $KERNEL_XEN_PKG
 
 else
     logMessage Package $KERNEL_XEN_PKG is not available
     logMessage Attempting to install the $KERNEL_PKG kernel image
     logMessage WARNING: This kernel may not have pvops
-    if chroot ${prefix} /usr/bin/apt-cache show $KERNEL_PKG > /dev/null 2>&1; then
+    if chroot ${TARGET} /usr/bin/apt-cache show $KERNEL_PKG > /dev/null 2>&1; then
         logMessage Package $KERNEL_PKG is available - installing
-        installDebianPackage ${prefix} initramfs-tools
+        installDebianPackage ${TARGET} initramfs-tools
-        installDebianPackage ${prefix} $KERNEL_PKG
+        installDebianPackage ${TARGET} $KERNEL_PKG
     else
         logMessage Package $KERNEL_PKG is not available
         logMessage pygrub set, but kernel could not be installed
@@ -83,27 +83,27 @@ else
     fi
 fi
 
-DOMU_KERNEL=$(basename $(ls -1 ${prefix}/boot/vmlinuz* | tail -n 1))
+DOMU_KERNEL=$(basename $(ls -1 ${TARGET}/boot/vmlinuz* | tail -n 1))
 KERNEL_REV=$(echo $DOMU_KERNEL | sed "s/vmlinuz-//g")
 DOMU_RAMDISK="initrd.img-$KERNEL_REV"
-DOMU_ISSUE=$(sed -re "s/ *\\\.*//g" -e1q < ${prefix}/etc/issue)
+DOMU_ISSUE=$(sed -re "s/ *\\\.*//g" -e1q < ${TARGET}/etc/issue)
 
 #
 # Generate initrd if it does not exist
 #
 
-if [ -f ${prefix}/boot/$DOMU_RAMDISK ]; then
+if [ -f ${TARGET}/boot/$DOMU_RAMDISK ]; then
     logMessage initrd exists, skipping generation
 else
     logMessage initrd missing, generating
-    chroot ${prefix} update-initramfs -c -k $KERNEL_REV
+    chroot ${TARGET} update-initramfs -c -k $KERNEL_REV
 fi
 
 #
 # Generate a menu.lst for pygrub
 #
 
-generateDebianGrubMenuLst "${prefix}" "$DOMU_ISSUE" "$DOMU_KERNEL" "$DOMU_RAMDISK"
+generateDebianGrubMenuLst "${TARGET}" "$DOMU_ISSUE" "$DOMU_KERNEL" "$DOMU_RAMDISK"
 
 
 else

hooks/debian/95-configure-locales

@@ -6,7 +6,7 @@
 # --
 # http://www.steve.org.uk/
 
-prefix=$1
+TARGET=$1
 
 
 #
@@ -29,15 +29,15 @@ logMessage Script $0 starting
 # Default to the same locale as the host.
 #
 if [ -e /etc/locale.gen ]; then
-   cp /etc/locale.gen ${prefix}/etc
+   cp /etc/locale.gen ${TARGET}/etc
 fi
 
 #
 #  Install the package
 #
-installDebianPackage ${prefix} locales
+installDebianPackage ${TARGET} locales
-installDebianPackage ${prefix} util-linux-locales
+installDebianPackage ${TARGET} util-linux-locales
-chroot ${prefix} /usr/sbin/update-locale LANG=C
+chroot ${TARGET} /usr/sbin/update-locale LANG=C
 
 
 #

hooks/edgy/80-install-kernel

@@ -9,7 +9,7 @@
 # --
 # http://nedos.net
 
-prefix=$1
+TARGET=$1
 
 #
 #  Source our common functions
@@ -37,19 +37,19 @@ KERNEL_XEN_PKG="linux-image-xen"
 KERNEL_PKG="linux-image-server"
 
 logMessage Attempting to install the $KERNEL_XEN_PKG kernel image
-if chroot ${prefix} /usr/bin/apt-cache show $KERNEL_XEN_PKG > /dev/null 2>&1; then
+if chroot ${TARGET} /usr/bin/apt-cache show $KERNEL_XEN_PKG > /dev/null 2>&1; then
     logMessage Package $KERNEL_XEN_PKG is available - installing
-    installDebianPackage ${prefix} initramfs-tools
+    installDebianPackage ${TARGET} initramfs-tools
-    installDebianPackage ${prefix} $KERNEL_XEN_PKG
+    installDebianPackage ${TARGET} $KERNEL_XEN_PKG
 
 else
     logMessage Package $KERNEL_XEN_PKG is not available
     logMessage Attempting to install the $KERNEL_PKG kernel image
     logMessage WARNING: This kernel may not have pvops
-    if chroot ${prefix} /usr/bin/apt-cache show $KERNEL_PKG > /dev/null 2>&1; then
+    if chroot ${TARGET} /usr/bin/apt-cache show $KERNEL_PKG > /dev/null 2>&1; then
         logMessage Package $KERNEL_PKG is available - installing
-        installDebianPackage ${prefix} initramfs-tools
+        installDebianPackage ${TARGET} initramfs-tools
-        installDebianPackage ${prefix} $KERNEL_PKG
+        installDebianPackage ${TARGET} $KERNEL_PKG
     else
         logMessage Package $KERNEL_PKG is not available
         logMessage pygrub set, but kernel could not be installed
@@ -58,27 +58,27 @@ else
     fi
 fi
 
-DOMU_KERNEL=$(basename $(ls -1 ${prefix}/boot/vmlinuz* | tail -n 1))
+DOMU_KERNEL=$(basename $(ls -1 ${TARGET}/boot/vmlinuz* | tail -n 1))
 KERNEL_REV=$(echo $DOMU_KERNEL | sed "s/vmlinuz-//g")
 DOMU_RAMDISK="initrd.img-$KERNEL_REV"
-DOMU_ISSUE=$(sed -re "s/ *\\\.*//g" -e1q < ${prefix}/etc/issue)
+DOMU_ISSUE=$(sed -re "s/ *\\\.*//g" -e1q < ${TARGET}/etc/issue)
 
 #
 # Generate initrd if it does not exist
 #
 
-if [ -f ${prefix}/boot/$DOMU_RAMDISK ]; then
+if [ -f ${TARGET}/boot/$DOMU_RAMDISK ]; then
     logMessage initrd exists, skipping generation
 else
     logMessage initrd missing, generating
-    chroot ${prefix} update-initramfs -c -k $KERNEL_REV
+    chroot ${TARGET} update-initramfs -c -k $KERNEL_REV
 fi
 
 #
 # Generate a menu.lst for pygrub
 #
 
-generateDebianGrubMenuLst "${prefix}" "$DOMU_ISSUE" "$DOMU_KERNEL" "$DOMU_RAMDISK"
+generateDebianGrubMenuLst "${TARGET}" "$DOMU_ISSUE" "$DOMU_KERNEL" "$DOMU_RAMDISK"
 
 
 else

hooks/gentoo/20-enable-su

@@ -7,7 +7,7 @@
 # http://www.steve.org.uk/
 
 
-prefix=$1
+TARGET=$1
 
 #
 #  Source our common functions
@@ -27,14 +27,14 @@ logMessage Script $0 starting
 #
 # Remove lines matching 'group' or 'wheel'.
 #
-grep -v wheel ${prefix}/etc/pam.d/su     > ${prefix}/etc/pam.d/su.tmp
+grep -v wheel ${TARGET}/etc/pam.d/su     > ${TARGET}/etc/pam.d/su.tmp
-grep -v group ${prefix}/etc/pam.d/su.tmp > ${prefix}/etc/pam.d/su
+grep -v group ${TARGET}/etc/pam.d/su.tmp > ${TARGET}/etc/pam.d/su
 
 #
 # Make sure permissions are correct.
 #
-chown root:root ${prefix}/etc/pam.d/su
+chown root:root ${TARGET}/etc/pam.d/su
-chmod 600       ${prefix}/etc/pam.d/su
+chmod 600       ${TARGET}/etc/pam.d/su
 
 #
 #  Log our finish

hooks/gentoo/40-setup-networking

@@ -7,7 +7,7 @@
 # http://www.steve.org.uk/
 
 
-prefix=$1
+TARGET=$1
 
 #
 #  Source our common functions
@@ -28,7 +28,7 @@ logMessage Script $0 starting
 #
 #  Make sure we have an /etc/conf.d directory.
 #
-mkdir -p ${prefix}/etc/conf.d
+mkdir -p ${TARGET}/etc/conf.d
 
 
 #
@@ -39,7 +39,7 @@ setupDynamicNetworking ()
     #
     # The host is using DHCP.
     #
-    cat <<E_O_DHCP > ${prefix}/etc/conf.d/net
+    cat <<E_O_DHCP > ${TARGET}/etc/conf.d/net
 # /etc/conf.d/net:
 # Global config file for net.* rc-scripts
 #
@@ -70,7 +70,7 @@ setupStaticNetworking ()
     #
     # We have a static IP address
     #
-    cat <<E_O_STATIC >${prefix}/etc/conf.d/net
+    cat <<E_O_STATIC >${TARGET}/etc/conf.d/net
 #
 #  First ethernet interface
 #
@@ -89,7 +89,7 @@ E_O_STATIC
 
         logMessage Adding etho:${interface}
 
-        cat <<E_O_STATIC >>${prefix}/etc/conf.d/net
+        cat <<E_O_STATIC >>${TARGET}/etc/conf.d/net
 config_eth0:${interface}=( "{value} netmask "${netmask}" )
 
 E_O_STATIC
@@ -103,12 +103,12 @@ E_O_STATIC
     # will be restored after hooks are run.
     #
     if [ '' != "$nameserver" ]; then
-        rm -f ${prefix}/etc/resolv.conf.old
+        rm -f ${TARGET}/etc/resolv.conf.old
         for ns in $nameserver; do
-            echo "nameserver $ns" >>${prefix}/etc/resolv.conf.old
+            echo "nameserver $ns" >>${TARGET}/etc/resolv.conf.old
         done
     else
-        cp /etc/resolv.conf ${prefix}/etc/resolv.conf.old
+        cp /etc/resolv.conf ${TARGET}/etc/resolv.conf.old
     fi
 }
 

hooks/gentoo/50-setup-hostname

@@ -9,7 +9,7 @@
 
 
 
-prefix=$1
+TARGET=$1
 
 
 #
@@ -44,8 +44,8 @@ umask 022
 #
 #  Setup the hostname + domain names.
 #
-echo HOSTNAME=\"${name}\" >> ${prefix}/etc/conf.d/hostname
+echo HOSTNAME=\"${name}\" >> ${TARGET}/etc/conf.d/hostname
-echo DNSDOMAIN=\"${domain}\" >> ${prefix}/etc/conf.d/domainname
+echo DNSDOMAIN=\"${domain}\" >> ${TARGET}/etc/conf.d/domainname
 
 
 #
@@ -55,21 +55,21 @@ echo DNSDOMAIN=\"${domain}\" >> ${prefix}/etc/conf.d/domainname
 if [ -z "${dhcp}" ]; then
 
     # Non-IPv6 stuff.
-    grep -v '\(::\|IPv6\)' /etc/hosts > ${prefix}/etc/hosts
+    grep -v '\(::\|IPv6\)' /etc/hosts > ${TARGET}/etc/hosts
 
     # New entry.
-    echo "${ip1}    ${hostname}" >> ${prefix}/etc/hosts
+    echo "${ip1}    ${hostname}" >> ${TARGET}/etc/hosts
-    echo " " >> ${prefix}/etc/hosts
+    echo " " >> ${TARGET}/etc/hosts
 
     # IPv6 stuff.
-    grep '\(::\|IPv6\)' /etc/hosts >> ${prefix}/etc/hosts
+    grep '\(::\|IPv6\)' /etc/hosts >> ${TARGET}/etc/hosts
 
 else
 
     #
     #  Stub /etc/hosts for DHCP clients.
     #
-    cat >> ${prefix}/etc/hosts <<EOF
+    cat >> ${TARGET}/etc/hosts <<EOF
 127.0.0.1       localhost
 
 # The following lines are desirable for IPv6 capable hosts

hooks/gentoo/70-install-ssh

@@ -10,7 +10,7 @@
 # http://www.steve.org.uk/
 
 
-prefix=$1
+TARGET=$1
 
 
 #
@@ -32,14 +32,14 @@ logMessage Script $0 starting
 #
 #  Install ssh
 #
-installGentooPackage ${prefix} ssh
+installGentooPackage ${TARGET} ssh
 
 
 #
 #  Make sure sshd isn't running, this will cause our unmounting of the
 # disk image to fail..
 #
-chroot ${prefix} /etc/init.d/ssh stop
+chroot ${TARGET} /etc/init.d/ssh stop
 
 
 #

hooks/intrepid/80-install-kernel

@@ -9,7 +9,7 @@
 # --
 # http://nedos.net
 
-prefix=$1
+TARGET=$1
 
 #
 #  Source our common functions
@@ -37,10 +37,10 @@ KERNEL_PKG="linux-image-virtual"
 
 logMessage Attempting to install the $KERNEL_PKG kernel image
 logMessage WARNING: This kernel may not have pvops
-if chroot ${prefix} /usr/bin/apt-cache show $KERNEL_PKG > /dev/null 2>&1; then
+if chroot ${TARGET} /usr/bin/apt-cache show $KERNEL_PKG > /dev/null 2>&1; then
     logMessage Package $KERNEL_PKG is available - installing
-    installDebianPackage ${prefix} initramfs-tools
+    installDebianPackage ${TARGET} initramfs-tools
-    installDebianPackage ${prefix} $KERNEL_PKG
+    installDebianPackage ${TARGET} $KERNEL_PKG
 else
     logMessage Package $KERNEL_PKG is not available
     logMessage pygrub set, but kernel could not be installed
@@ -48,27 +48,27 @@ else
     exit 1
 fi
 
-DOMU_KERNEL=$(basename $(ls -1 ${prefix}/boot/vmlinuz* | tail -n 1))
+DOMU_KERNEL=$(basename $(ls -1 ${TARGET}/boot/vmlinuz* | tail -n 1))
 KERNEL_REV=$(echo $DOMU_KERNEL | sed "s/vmlinuz-//g")
 DOMU_RAMDISK="initrd.img-$KERNEL_REV"
-DOMU_ISSUE=$(sed -re "s/ *\\\.*//g" -e1q < ${prefix}/etc/issue)
+DOMU_ISSUE=$(sed -re "s/ *\\\.*//g" -e1q < ${TARGET}/etc/issue)
 
 #
 # Generate initrd if it does not exist
 #
 
-if [ -f ${prefix}/boot/$DOMU_RAMDISK ]; then
+if [ -f ${TARGET}/boot/$DOMU_RAMDISK ]; then
     logMessage initrd exists, skipping generation
 else
     logMessage initrd missing, generating
-    chroot ${prefix} update-initramfs -c -k $KERNEL_REV
+    chroot ${TARGET} update-initramfs -c -k $KERNEL_REV
 fi
 
 #
 # Generate a menu.lst for pygrub
 #
 
-generateDebianGrubMenuLst "${prefix}" "$DOMU_ISSUE" "$DOMU_KERNEL" "$DOMU_RAMDISK"
+generateDebianGrubMenuLst "${TARGET}" "$DOMU_ISSUE" "$DOMU_KERNEL" "$DOMU_RAMDISK"
 
 else
     logMessage pygrub not set, skipping kernel install

hooks/karmic/80-install-kernel

@@ -9,7 +9,7 @@
 # --
 # http://nedos.net
 
-prefix=$1
+TARGET=$1
 
 #
 #  Source our common functions
@@ -38,27 +38,27 @@ linux_kernel_type="virtual"
 linux_kernel_package="linux-image-${linux_kernel_type}"
 
 logMessage "Installing the ${linux_kernel_package} kernel image"
-if chroot ${prefix} /usr/bin/apt-cache show ${linux_kernel_package} >/dev/null 2>/dev/null; then
+if chroot ${TARGET} /usr/bin/apt-cache show ${linux_kernel_package} >/dev/null 2>/dev/null; then
     logMessage "Package '${linux_kernel_package}' is available - installing"
-    installDebianPackage ${prefix} initramfs-tools
+    installDebianPackage ${TARGET} initramfs-tools
-    installDebianPackage ${prefix} ${linux_kernel_package}
+    installDebianPackage ${TARGET} ${linux_kernel_package}
 
 # Force initrd if none exists
-echo ${prefix}/boot/initrd* | grep -q 2\\.6
+echo ${TARGET}/boot/initrd* | grep -q 2\\.6
 if [ $? -ne 0 ]; then
-    chroot ${prefix} update-initramfs -c -k `ls -1 ${prefix}/lib/modules/ | head -n 1`
+    chroot ${TARGET} update-initramfs -c -k `ls -1 ${TARGET}/lib/modules/ | head -n 1`
 fi
 
 # Generate grub menu.lst
-DOMU_KERNEL=$(basename $(ls -1 ${prefix}/boot/vmlinuz* | tail -n 1))
+DOMU_KERNEL=$(basename $(ls -1 ${TARGET}/boot/vmlinuz* | tail -n 1))
-DOMU_RAMDISK=$(basename $(ls -1 ${prefix}/boot/initrd*|tail -n 1))
+DOMU_RAMDISK=$(basename $(ls -1 ${TARGET}/boot/initrd*|tail -n 1))
-DOMU_ISSUE=$(head -n 1 ${prefix}/etc/issue | awk -F '\' '{ print $1 }' | sed 's/[ \t]*$//')
+DOMU_ISSUE=$(head -n 1 ${TARGET}/etc/issue | awk -F '\' '{ print $1 }' | sed 's/[ \t]*$//')
 
 #
 # Generate a menu.lst for pygrub
 #
 
-generateDebianGrubMenuLst "${prefix}" "$DOMU_ISSUE" "$DOMU_KERNEL" "$DOMU_RAMDISK"
+generateDebianGrubMenuLst "${TARGET}" "$DOMU_ISSUE" "$DOMU_KERNEL" "$DOMU_RAMDISK"
 
 
 else

roles/builder

@@ -8,7 +8,7 @@
 #
 
 
-prefix=$1
+TARGET=$1
 
 
 
@@ -28,16 +28,16 @@ fi
 #
 #  Update APT lists.
 #
-chroot ${prefix} /usr/bin/apt-get update
+chroot ${TARGET} /usr/bin/apt-get update
 
 
 #
 #  Install the packages
 #
-installDebianPackage ${prefix} dpkg-dev
+installDebianPackage ${TARGET} dpkg-dev
-installDebianPackage ${prefix} devscripts
+installDebianPackage ${TARGET} devscripts
-installDebianPackage ${prefix} fakeroot
+installDebianPackage ${TARGET} fakeroot
-installDebianPackage ${prefix} debhelper
+installDebianPackage ${TARGET} debhelper
-installDebianPackage ${prefix} build-essential
+installDebianPackage ${TARGET} build-essential
-installDebianPackage ${prefix} lintian
+installDebianPackage ${TARGET} lintian
-installDebianPackage ${prefix} linda
+installDebianPackage ${TARGET} linda

roles/cfengine

@@ -6,7 +6,7 @@
 # otherwise the temporary mounted directory will not be unmountable.
 #
 
-prefix=$1
+TARGET=$1
 
 #
 #  Source our common functions - this will let us install a Debian package.
@@ -28,20 +28,20 @@ logMessage Script $0 starting
 #
 #  Install CFengine
 #
-installDebianPackage ${prefix} cfengine2
+installDebianPackage ${TARGET} cfengine2
 
 
 #
 #  Make sure the CFengine server isn't running, this will cause our
 # unmounting of the disk image to fail..
 #
-chroot ${prefix} /etc/init.d/cfengine2 stop
+chroot ${TARGET} /etc/init.d/cfengine2 stop
 
 #
 #  Copy cfengine update.conf & defaults from Dom0
 #
-cp /etc/cfengine/update.conf ${prefix}/etc/cfengine/
+cp /etc/cfengine/update.conf ${TARGET}/etc/cfengine/
-cp /etc/default/cfengine2 ${prefix}/etc/default/
+cp /etc/default/cfengine2 ${TARGET}/etc/default/
 
 #
 #  Log our finish

roles/editor

@@ -21,9 +21,9 @@
 
 
 #
-#  Our installation directory + our prefix for finding scripts from.
+#  Our installation directory + our target for finding scripts from.
 #
-prefix=$1
+TARGET=$1
 source=/etc/xen-tools/sed.d/
 
 
@@ -59,7 +59,7 @@ fi
 for i in `find ${source} -name '*.sed' -print`; do
 
    #
-   #  Get the name of the file, minus the source prefix
+   #  Get the name of the file, minus the source target
    #
    file=${i#$source}
 
@@ -71,17 +71,17 @@ for i in `find ${source} -name '*.sed' -print`; do
    #
    #  Does the file exist in the new install?
    #
-   if [ -e "${prefix}/${file}" ]; then
+   if [ -e "${TARGET}/${file}" ]; then
 
        #
        #  Log it.
        #
-       logMessage "Running script $i - against ${prefix}/${file}"
+       logMessage "Running script $i - against ${TARGET}/${file}"
 
        #
        #  Invoke it.
        #
-       sed -i~ -f $i "${prefix}/${file}"
+       sed -i~ -f $i "${TARGET}/${file}"
    fi
 done
 

roles/gdm

@@ -8,7 +8,7 @@
 #
 
 
-prefix=$1
+TARGET=$1
 
 
 
@@ -28,24 +28,24 @@ fi
 #
 #  Update APT lists.
 #
-chroot ${prefix} /usr/bin/apt-get update
+chroot ${TARGET} /usr/bin/apt-get update
 
 #
 #  Install the packages
 #
-installDebianPackage ${prefix} xserver-xfree86
+installDebianPackage ${TARGET} xserver-xfree86
-installDebianPackage ${prefix} vncserver
+installDebianPackage ${TARGET} vncserver
-installDebianPackage ${prefix} xfonts-100dpi
+installDebianPackage ${TARGET} xfonts-100dpi
-installDebianPackage ${prefix} xfonts-75dpi
+installDebianPackage ${TARGET} xfonts-75dpi
-installDebianPackage ${prefix} xfonts-base
+installDebianPackage ${TARGET} xfonts-base
-installDebianPackage ${prefix} rxvt
+installDebianPackage ${TARGET} rxvt
-installDebianPackage ${prefix} gdm
+installDebianPackage ${TARGET} gdm
-installDebianPackage ${prefix} icewm-experimental
+installDebianPackage ${TARGET} icewm-experimental
 
 #
 #  Add a new section to the GDM configuration file.
 #
-cat <<EOF >> ${prefix}/etc/gdm/gdm.conf
+cat <<EOF >> ${TARGET}/etc/gdm/gdm.conf
 [server-VNC]
 name=VNC server
 command=/usr/bin/Xvnc -geometry 800x600 -depth 24
@@ -56,4 +56,4 @@ EOF
 #
 #  Make the new section the default
 #
-perl -pi.bak -e 's/^0=Standard\n//g ; s/^\[servers\]/\[servers\]\n0=VNC/g' ${prefix}/etc/gdm/gdm.conf 
+perl -pi.bak -e 's/^0=Standard\n//g ; s/^\[servers\]/\[servers\]\n0=VNC/g' ${TARGET}/etc/gdm/gdm.conf 

roles/minimal

@@ -9,7 +9,7 @@
 #
 
 
-prefix=$1
+TARGET=$1
 
 
 
@@ -28,12 +28,12 @@ fi
 #
 #  Install some new packages - do this first to avoid dependency errors.
 #
-installDebianPackage ${prefix} syslog-ng 
+installDebianPackage ${TARGET} syslog-ng 
-installDebianPackage ${prefix} deborphan
+installDebianPackage ${TARGET} deborphan
-installDebianPackage ${prefix} less
+installDebianPackage ${TARGET} less
-installDebianPackage ${prefix} screen
+installDebianPackage ${TARGET} screen
-installDebianPackage ${prefix} sudo
+installDebianPackage ${TARGET} sudo
-installDebianPackage ${prefix} vim
+installDebianPackage ${TARGET} vim
 
 
 #
@@ -41,28 +41,28 @@ installDebianPackage ${prefix} vim
 #
 
 # PPP stuff.
-removeDebianPackage ${prefix} pppconfig
+removeDebianPackage ${TARGET} pppconfig
-removeDebianPackage ${prefix} pppoeconf
+removeDebianPackage ${TARGET} pppoeconf
-removeDebianPackage ${prefix} pppoe
+removeDebianPackage ${TARGET} pppoe
-removeDebianPackage ${prefix} ppp
+removeDebianPackage ${TARGET} ppp
-removeDebianPackage ${prefix} libpcap0.7
+removeDebianPackage ${TARGET} libpcap0.7
 
 # Editors
-removeDebianPackage ${prefix} nano
+removeDebianPackage ${TARGET} nano
-removeDebianPackage ${prefix} ed
+removeDebianPackage ${TARGET} ed
-removeDebianPackage ${prefix} nvi
+removeDebianPackage ${TARGET} nvi
 
 # Syslog
-removeDebianPackage ${prefix} klogd
+removeDebianPackage ${TARGET} klogd
-removeDebianPackage ${prefix} sysklogd
+removeDebianPackage ${TARGET} sysklogd
 
 # manpages
-removeDebianPackage ${prefix} manpages  
+removeDebianPackage ${TARGET} manpages  
-removeDebianPackage ${prefix} man-db 
+removeDebianPackage ${TARGET} man-db 
-removeDebianPackage ${prefix} info
+removeDebianPackage ${TARGET} info
 
 # misc
-removeDebianPackage ${prefix} tasksel tasksel-data
+removeDebianPackage ${TARGET} tasksel tasksel-data
-removeDebianPackage ${prefix} pciutils
+removeDebianPackage ${TARGET} pciutils
-removeDebianPackage ${prefix} fdutils
+removeDebianPackage ${TARGET} fdutils
-removeDebianPackage ${prefix} cpio
+removeDebianPackage ${TARGET} cpio

roles/puppet

@@ -6,7 +6,7 @@
 # otherwise the temporary mounted directory will not be unmountable.
 #
 
-prefix=$1
+TARGET=$1
 
 #
 #  Source our common functions - this will let us install a Debian package.
@@ -26,14 +26,14 @@ logMessage Script $0 starting
 #
 #  Install ssh
 #
-installDebianPackage ${prefix} puppet
+installDebianPackage ${TARGET} puppet
 
 
 #
 #  Make sure sshd isn't running, this will cause our unmounting of the
 # disk image to fail..
 #
-chroot ${prefix} /etc/init.d/puppet stop
+chroot ${TARGET} /etc/init.d/puppet stop
 
 #
 #  Log our finish

roles/resolv

@@ -3,7 +3,7 @@
 #  This role helps to customize guest's /etc/resolv.conf
 #
 
-prefix=$1
+TARGET=$1
 
 #
 #  Source our common functions - this will let us install a Debian package.
@@ -33,7 +33,7 @@ logMessage Script $0 starting
 #
 # Create Guest's resolv.conf as resolv.conf.old (see WARNING before) :
 #
-cat <<RESOLV_CONF_EOF >${prefix}/etc/resolv.conf.old
+cat <<RESOLV_CONF_EOF >${TARGET}/etc/resolv.conf.old
 nameserver 192.168.1.1
 #search domain.tld
 RESOLV_CONF_EOF

roles/sudoers

@@ -3,7 +3,7 @@
 #  This role installs sudo with host sudoers file.
 #
 
-prefix=$1
+TARGET=$1
 
 #
 #  Source our common functions - this will let us install a Debian package.
@@ -24,7 +24,7 @@ logMessage Script $0 starting
 #
 # Install sudo package
 #
-installDebianPackage ${prefix} sudo
+installDebianPackage ${TARGET} sudo
 
 #
 # WARNING :
@@ -36,9 +36,9 @@ installDebianPackage ${prefix} sudo
 #
 # Copy dom0's file to domU.
 #
-cp /etc/sudoers ${prefix}/etc/
+cp /etc/sudoers ${TARGET}/etc/
-chown root:root ${prefix}/etc/sudoers
+chown root:root ${TARGET}/etc/sudoers
-chmod 440 ${prefix}/etc/sudoers
+chmod 440 ${TARGET}/etc/sudoers
 
 #
 #  Log our finish

roles/tmpfs

@@ -7,7 +7,7 @@
 # --
 #
 
-prefix=$1
+TARGET=$1
 
 #
 #  Source our common functions
@@ -28,7 +28,7 @@ logMessage Script $0 starting
 #
 #  Now let's fixup the fstab
 #
-cat <<END_OF_TMPFS_FSTAB >> ${prefix}/etc/fstab
+cat <<END_OF_TMPFS_FSTAB >> ${TARGET}/etc/fstab
 tmpfs           /tmp            tmpfs   rw,nosuid,nodev 0 0
 tmpfs           /var/run        tmpfs   rw,nosuid,nodev,noexec,mode=1755 0 0
 tmpfs           /var/lock       tmpfs   rw,nosuid,nodev,noexec 0 0

roles/udev

@@ -8,7 +8,7 @@
 #
 
 
-prefix=$1
+TARGET=$1
 
 
 
@@ -25,11 +25,11 @@ fi
 #
 #  Install udev.
 #
-installDebianPackage ${prefix} udev
+installDebianPackage ${TARGET} udev
 
 
 #
 #  Update APT lists.
 #
-chroot ${prefix} /usr/bin/apt-get update
+chroot ${TARGET} /usr/bin/apt-get update
 

roles/xdm

@@ -8,7 +8,7 @@
 #
 
 
-prefix=$1
+TARGET=$1
 
 
 
@@ -27,29 +27,29 @@ fi
 #
 #  Update APT lists.
 #
-chroot ${prefix} /usr/bin/apt-get update
+chroot ${TARGET} /usr/bin/apt-get update
 
 #
 #  Install the packages
 #
-installDebianPackage ${prefix} xserver-xfree86
+installDebianPackage ${TARGET} xserver-xfree86
-installDebianPackage ${prefix} vncserver
+installDebianPackage ${TARGET} vncserver
-installDebianPackage ${prefix} xfonts-100dpi
+installDebianPackage ${TARGET} xfonts-100dpi
-installDebianPackage ${prefix} xfonts-75dpi
+installDebianPackage ${TARGET} xfonts-75dpi
-installDebianPackage ${prefix} xfonts-base
+installDebianPackage ${TARGET} xfonts-base
-installDebianPackage ${prefix} rxvt
+installDebianPackage ${TARGET} rxvt
-installDebianPackage ${prefix} xdm
+installDebianPackage ${TARGET} xdm
-installDebianPackage ${prefix} icewm-experimental
+installDebianPackage ${TARGET} icewm-experimental
 
 
 #
 #  Remove the default settings.
 #
-rm ${prefix}/etc/X11/xdm/Xserver
+rm ${TARGET}/etc/X11/xdm/Xserver
-rm ${prefix}/etc/X11/xdm/Xservers
+rm ${TARGET}/etc/X11/xdm/Xservers
 
 #
 #  Setup XDM to use the VNC server we installed.
 #
 /bin/echo ':0 /usr/bin/Xvnc /usr/bin/Xvnc -geometry 1024x768 -depth 24' > \
-  ${prefix}/etc/X11/xdm/Xservers
+  ${TARGET}/etc/X11/xdm/Xservers