From cc2a6d4e4173704769df31b3ccaa86620f3560af Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Thu, 18 Apr 2013 21:01:19 +0200 Subject: [PATCH] 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 | 28 +++---- hooks/centos-6/25-setup-kernel | 32 ++++---- hooks/common.sh | 86 +++++++++++----------- hooks/common/01-disable-daemons | 14 ++-- hooks/common/05-shadowconfig-on | 6 +- hooks/common/10-disable-tls | 6 +- hooks/common/15-disable-hwclock | 4 +- hooks/common/20-setup-apt | 12 +-- hooks/common/20-setup-yum | 12 +-- hooks/common/25-generate-locale | 4 +- hooks/common/30-disable-gettys | 36 ++++----- hooks/common/40-setup-networking-deb | 16 ++-- hooks/common/40-setup-networking-rpm | 20 ++--- hooks/common/50-setup-hostname-deb | 24 +++--- hooks/common/50-setup-hostname-rpm | 16 ++-- hooks/common/55-create-dev | 12 +-- hooks/common/60-copy-host-files | 6 +- hooks/common/65-copy-user-files | 4 +- hooks/common/70-install-ssh-deb | 14 ++-- hooks/common/70-install-ssh-rpm | 12 +-- hooks/common/75-fixup-securetty | 8 +- hooks/common/80-install-modules-deb | 14 ++-- hooks/common/80-install-modules-rpm | 6 +- hooks/common/81-install-modules-init-tools | 12 +-- hooks/common/82-install-grub-legacy | 14 ++-- hooks/common/90-make-fstab | 10 +-- hooks/common/99-clean-image-deb | 4 +- hooks/common/99-clean-image-rpm | 16 ++-- hooks/common/99-enable-daemons | 8 +- hooks/debian/20-setup-apt | 20 ++--- hooks/debian/80-install-kernel | 24 +++--- hooks/debian/95-configure-locales | 10 +-- hooks/edgy/80-install-kernel | 24 +++--- hooks/gentoo/20-enable-su | 10 +-- hooks/gentoo/40-setup-networking | 16 ++-- hooks/gentoo/50-setup-hostname | 16 ++-- hooks/gentoo/70-install-ssh | 6 +- hooks/intrepid/80-install-kernel | 18 ++--- hooks/karmic/80-install-kernel | 20 ++--- roles/builder | 18 ++--- roles/cfengine | 10 +-- roles/editor | 12 +-- roles/gdm | 24 +++--- roles/minimal | 48 ++++++------ roles/puppet | 6 +- roles/resolv | 4 +- roles/sudoers | 10 +-- roles/tmpfs | 4 +- roles/udev | 6 +- roles/xdm | 26 +++---- 50 files changed, 394 insertions(+), 394 deletions(-) diff --git a/hooks/centos-5/25-setup-kernel b/hooks/centos-5/25-setup-kernel index c65979e..116ab60 100755 --- a/hooks/centos-5/25-setup-kernel +++ b/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 "s/^1:2345/#1:2345/" ${prefix}/etc/inittab +sed -i "/Cancelled/ {G;s/$/co:2345:respawn:\/sbin\/mingetty console/;}" ${TARGET}/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 ${prefix} /sbin/MAKEDEV sda sdb sdc sdd +chroot ${TARGET} ln -s /sbin/MAKEDEV /dev/MAKEDEV +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. # # @@ -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 ${prefix} yum -y install kernel-xen grub.x86_64 perl.x86_64 +chroot ${TARGET} yum clean expire-cache +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 -cat > ${prefix}/boot/grub/menu.lst << EOF +mkdir -p ${TARGET}/boot/grub +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 diff --git a/hooks/centos-6/25-setup-kernel b/hooks/centos-6/25-setup-kernel index 2c99703..f158bd6 100755 --- a/hooks/centos-6/25-setup-kernel +++ b/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 "s/^1:2345/#1:2345/" ${prefix}/etc/inittab +sed -i "/Cancelled/ {G;s/$/co:2345:respawn:\/sbin\/mingetty console/;}" ${TARGET}/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 ${prefix} /sbin/MAKEDEV sda sdb sdc sdd +chroot ${TARGET} ln -s /sbin/MAKEDEV /dev/MAKEDEV +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. # # @@ -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 ${prefix} yum -y install kernel-xen grub.x86_64 perl.x86_64 +chroot ${TARGET} yum clean expire-cache +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 -cat > ${prefix}/boot/grub/menu.lst << EOF +mkdir -p ${TARGET}/boot/grub +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 # diff --git a/hooks/common.sh b/hooks/common.sh index d6893cb..cb88bd9 100755 --- a/hooks/common.sh +++ b/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 - chmod +x ${prefix}/usr/sbin/policy-rc.d + printf '#!/bin/sh\nexit 101\n' > ${TARGET}/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" -f "${prefix}/boot/${DOMU_KERNEL}" + assert "$LINENO" -d ${TARGET} + assert "$LINENO" -f "${TARGET}/boot/${DOMU_KERNEL}" # # Generate a menu.lst for pygrub # - mkdir -p ${prefix}/boot/grub - cat << E_O_MENU > ${prefix}/boot/grub/menu.lst + mkdir -p ${TARGET}/boot/grub + cat << E_O_MENU > ${TARGET}/boot/grub/menu.lst default 0 timeout 2 @@ -256,10 +256,10 @@ E_O_MENU # disableStartStopDaemon () { - local prefix="$1" - assert "$LINENO" "${prefix}" + local TARGET="$1" + 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 - assert "$LINENO" "${prefix}" + local TARGET=$1 + 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" diff --git a/hooks/common/01-disable-daemons b/hooks/common/01-disable-daemons index 6e1a888..ce3904b 100755 --- a/hooks/common/01-disable-daemons +++ b/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 'exit 101' >> ${prefix}/usr/sbin/policy-rc.d -chmod 755 ${prefix}/usr/sbin/policy-rc.d +echo '#!/bin/sh' > ${TARGET}/usr/sbin/policy-rc.d +echo 'exit 101' >> ${TARGET}/usr/sbin/policy-rc.d +chmod 755 ${TARGET}/usr/sbin/policy-rc.d diff --git a/hooks/common/05-shadowconfig-on b/hooks/common/05-shadowconfig-on index 72da2b5..5790f25 100755 --- a/hooks/common/05-shadowconfig-on +++ b/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." diff --git a/hooks/common/10-disable-tls b/hooks/common/10-disable-tls index a501f96..35447a6 100755 --- a/hooks/common/10-disable-tls +++ b/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 - mkdir ${prefix}/lib/tls + mv ${TARGET}/lib/tls ${TARGET}/lib/tls.disabled + mkdir ${TARGET}/lib/tls fi diff --git a/hooks/common/15-disable-hwclock b/hooks/common/15-disable-hwclock index 3495e75..6a1b02c 100755 --- a/hooks/common/15-disable-hwclock +++ b/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 diff --git a/hooks/common/20-setup-apt b/hooks/common/20-setup-apt index 9b6a6ce..e06ff61 100755 --- a/hooks/common/20-setup-apt +++ b/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 < ${prefix}/etc/apt/sources.list +cat < ${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 diff --git a/hooks/common/20-setup-yum b/hooks/common/20-setup-yum index 65968cb..c76a535 100755 --- a/hooks/common/20-setup-yum +++ b/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 - mkdir -p ${prefix}/proc +if [ ! -d ${TARGET}/proc ]; then + mkdir -p ${TARGET}/proc fi -mount -o bind /proc ${prefix}/proc -chroot ${prefix} /usr/bin/yum update -umount ${prefix}/proc +mount -o bind /proc ${TARGET}/proc +chroot ${TARGET} /usr/bin/yum update +umount ${TARGET}/proc # diff --git a/hooks/common/25-generate-locale b/hooks/common/25-generate-locale index f03e12f..e1f7f60 100755 --- a/hooks/common/25-generate-locale +++ b/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 # diff --git a/hooks/common/30-disable-gettys b/hooks/common/30-disable-gettys index 6edc80b..318ed39 100755 --- a/hooks/common/30-disable-gettys +++ b/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 -[ -f ${prefix}/etc/init/tty1.conf ] && { - sed -i -e s/tty1/hvc0/ ${prefix}/etc/init/tty1.conf - mv ${prefix}/etc/init/tty1.conf ${prefix}/etc/init/hvc0.conf +rm -f ${TARGET}/etc/init/tty[!1].conf +[ -f ${TARGET}/etc/init/tty1.conf ] && { + sed -i -e s/tty1/hvc0/ ${TARGET}/etc/init/tty1.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] -[ -f ${prefix}/etc/event.d/tty1 ] && { - sed -i -e s/tty1/hvc0/ ${prefix}/etc/event.d/tty1 - mv ${prefix}/etc/event.d/tty1 ${prefix}/etc/event.d/hvc0 +rm -f ${TARGET}/etc/event.d/tty[!1] +[ -f ${TARGET}/etc/event.d/tty1 ] && { + sed -i -e s/tty1/hvc0/ ${TARGET}/etc/event.d/tty1 + 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 ] && { - mv ${prefix}/etc/init/hvc0.conf ${prefix}/etc/init/${serial_device}.conf - sed -i -e s/hvc0/${serial_device}/ ${prefix}/etc/init/${serial_device}.conf + [ -f ${TARGET}/etc/init/hvc0.conf ] && { + mv ${TARGET}/etc/init/hvc0.conf ${TARGET}/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 ] && { - mv ${prefix}/etc/event.d/hvc0 ${prefix}/etc/event.d/${serial_device} - sed -i -e s/hvc0/${serial_device}/ ${prefix}/etc/event.d/${serial_device} + [ -f ${TARGET}/etc/event.d/hvc0 ] && { + mv ${TARGET}/etc/event.d/hvc0 ${TARGET}/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 diff --git a/hooks/common/40-setup-networking-deb b/hooks/common/40-setup-networking-deb index d8785ae..65d945a 100755 --- a/hooks/common/40-setup-networking-deb +++ b/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 < ${prefix}/etc/network/interfaces + cat < ${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 <${prefix}/etc/network/interfaces + cat <${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 <>${prefix}/etc/network/interfaces + cat <>${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 } diff --git a/hooks/common/40-setup-networking-rpm b/hooks/common/40-setup-networking-rpm index 4b1b577..b0662e1 100755 --- a/hooks/common/40-setup-networking-rpm +++ b/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 <${prefix}/etc/sysconfig/network-scripts/ifcfg-eth0 + cat <${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 <${prefix}/etc/sysconfig/network-scripts/ifcfg-eth0:${interface} + cat <${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 <${prefix}/etc/sysconfig/network-scripts/ifcfg-eth0 + cat <${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 <${prefix}/etc/sysconfig/network +cat <${TARGET}/etc/sysconfig/network NETWORKING=yes GATEWAY=${gateway} HOSTNAME=${hostname} diff --git a/hooks/common/50-setup-hostname-deb b/hooks/common/50-setup-hostname-deb index 65e30d1..da1c36d 100755 --- a/hooks/common/50-setup-hostname-deb +++ b/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_FQDN > ${prefix}/etc/mailname +echo $GUEST_HOSTNAME > ${TARGET}/etc/hostname +echo $GUEST_FQDN > ${TARGET}/etc/mailname # @@ -55,7 +55,7 @@ if [ -z "${copyhosts}" ]; then # # Copy localhost # - cat > ${prefix}/etc/hosts < ${TARGET}/etc/hosts <> ${prefix}/etc/hosts <> ${TARGET}/etc/hosts <> ${prefix}/etc/hosts <> ${TARGET}/etc/hosts <> ${prefix}/etc/hosts <> ${TARGET}/etc/hosts < ${prefix}/etc/hosts + grep -v '\(::\|IPv6\)' /etc/hosts > ${TARGET}/etc/hosts # New entry. if [ -z "${dhcp}" ]; then - cat >> ${prefix}/etc/hosts <> ${TARGET}/etc/hosts <> ${prefix}/etc/hosts <> ${TARGET}/etc/hosts <> ${prefix}/etc/hosts + grep '\(::\|IPv6\)' /etc/hosts >> ${TARGET}/etc/hosts fi diff --git a/hooks/common/50-setup-hostname-rpm b/hooks/common/50-setup-hostname-rpm index 5b1db9d..06dd83a 100755 --- a/hooks/common/50-setup-hostname-rpm +++ b/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} > ${prefix}/etc/mailname +echo ${hostname} | sed 's/^\([^\.]*\)\..*/\1/' > ${TARGET}/etc/hostname +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 " " >> ${prefix}/etc/hosts + echo "${ip1} ${hostname}" >> ${TARGET}/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 <> ${TARGET}/etc/hosts < /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 diff --git a/hooks/common/80-install-modules-deb b/hooks/common/80-install-modules-deb index 2fd731c..313f2fd 100755 --- a/hooks/common/80-install-modules-deb +++ b/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 - cp -au ${modules} ${prefix}/lib/modules -elif chroot ${prefix} /usr/bin/apt-cache show ${linux_modules_package} >/dev/null 2>/dev/null; then + mkdir -p ${TARGET}/lib/modules + cp -au ${modules} ${TARGET}/lib/modules +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 - cp -au /lib/modules/$(uname -r) ${prefix}/lib/modules + mkdir -p ${TARGET}/lib/modules + cp -au /lib/modules/$(uname -r) ${TARGET}/lib/modules fi fi # if pygrub diff --git a/hooks/common/80-install-modules-rpm b/hooks/common/80-install-modules-rpm index d9278ad..9ce776e 100755 --- a/hooks/common/80-install-modules-rpm +++ b/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 -cp -au /lib/modules/*/ ${prefix}/lib/modules +mkdir -p ${TARGET}/lib/modules +cp -au /lib/modules/*/ ${TARGET}/lib/modules # diff --git a/hooks/common/81-install-modules-init-tools b/hooks/common/81-install-modules-init-tools index 51b9ff6..aad7c45 100755 --- a/hooks/common/81-install-modules-init-tools +++ b/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 ${prefix} /usr/bin/apt-cache show module-init-tools | fgrep -qi transitional; then - installDebianPackage ${prefix} kmod +if chroot ${TARGET} /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 | fgrep -qi transitional; then + installDebianPackage ${TARGET} kmod else - installDebianPackage ${prefix} module-init-tools + installDebianPackage ${TARGET} module-init-tools fi else - installDebianPackage ${prefix} kmod + installDebianPackage ${TARGET} kmod fi # diff --git a/hooks/common/82-install-grub-legacy b/hooks/common/82-install-grub-legacy index 5f66da2..3c0b3fc 100755 --- a/hooks/common/82-install-grub-legacy +++ b/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 - installDebianPackage ${prefix} grub-legacy +if chroot ${TARGET} /usr/bin/apt-cache show grub-legacy 2>/dev/null | egrep -qi 'GRand Unified Bootloader.*Legacy'; then + installDebianPackage ${TARGET} grub-legacy else - installDebianPackage ${prefix} grub + installDebianPackage ${TARGET} grub fi -if [ ! -e ${prefix}/boot/grub/default ]; then - echo default > ${prefix}/boot/grub/default +if [ ! -e ${TARGET}/boot/grub/default ]; then + 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" diff --git a/hooks/common/90-make-fstab b/hooks/common/90-make-fstab index 1f6757e..3f087cb 100755 --- a/hooks/common/90-make-fstab +++ b/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 < ${prefix}/etc/fstab +cat < ${TARGET}/etc/fstab # /etc/fstab: static file system information. # # @@ -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 diff --git a/hooks/common/99-clean-image-deb b/hooks/common/99-clean-image-deb index 9340a55..404ff36 100755 --- a/hooks/common/99-clean-image-deb +++ b/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 # diff --git a/hooks/common/99-clean-image-rpm b/hooks/common/99-clean-image-rpm index 2ca250c..f18e33c 100755 --- a/hooks/common/99-clean-image-rpm +++ b/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 ${prefix}/ -name '*.rpmnew' -exec rm -f \{\} \; +find ${TARGET}/ -name '*.rpmorig' -exec rm -f \{\} \; +find ${TARGET}/ -name '*.rpmnew' -exec rm -f \{\} \; # # Clean yum # logMessage Cleaning Yum Repository -if [ ! -d ${prefix}/proc ]; then - mkdir -p ${prefix}/proc +if [ ! -d ${TARGET}/proc ]; then + mkdir -p ${TARGET}/proc fi -mount -o bind /proc ${prefix}/proc -chroot ${prefix} /usr/bin/yum clean all -umount ${prefix}/proc +mount -o bind /proc ${TARGET}/proc +chroot ${TARGET} /usr/bin/yum clean all +umount ${TARGET}/proc # # Log our finish diff --git a/hooks/common/99-enable-daemons b/hooks/common/99-enable-daemons index b13b4f7..1c91e12 100755 --- a/hooks/common/99-enable-daemons +++ b/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 diff --git a/hooks/debian/20-setup-apt b/hooks/debian/20-setup-apt index 464d4f1..f53ff39 100755 --- a/hooks/debian/20-setup-apt +++ b/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 < ${prefix}/etc/apt/sources.list +cat < ${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 <> ${prefix}/etc/apt/sources.list + cat <> ${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 <> ${prefix}/etc/apt/sources.list + cat <> ${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 - mkdir ${prefix}/lib/tls + mv ${TARGET}/lib/tls ${TARGET}/lib/tls.disabled + mkdir ${TARGET}/lib/tls else logMessage "Installing xen-aware libc6" - installDebianPackage ${prefix} libc6-xen + installDebianPackage ${TARGET} libc6-xen fi fi diff --git a/hooks/debian/80-install-kernel b/hooks/debian/80-install-kernel index 03a1190..0f68f01 100755 --- a/hooks/debian/80-install-kernel +++ b/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 ${prefix} $KERNEL_XEN_PKG + installDebianPackage ${TARGET} initramfs-tools + 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 ${prefix} $KERNEL_PKG + installDebianPackage ${TARGET} initramfs-tools + 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 diff --git a/hooks/debian/95-configure-locales b/hooks/debian/95-configure-locales index ba142ef..7567d62 100755 --- a/hooks/debian/95-configure-locales +++ b/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 ${prefix} util-linux-locales -chroot ${prefix} /usr/sbin/update-locale LANG=C +installDebianPackage ${TARGET} locales +installDebianPackage ${TARGET} util-linux-locales +chroot ${TARGET} /usr/sbin/update-locale LANG=C # diff --git a/hooks/edgy/80-install-kernel b/hooks/edgy/80-install-kernel index 1c01911..8a465cd 100755 --- a/hooks/edgy/80-install-kernel +++ b/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 ${prefix} $KERNEL_XEN_PKG + installDebianPackage ${TARGET} initramfs-tools + 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 ${prefix} $KERNEL_PKG + installDebianPackage ${TARGET} initramfs-tools + 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 diff --git a/hooks/gentoo/20-enable-su b/hooks/gentoo/20-enable-su index 62abe68..16a665e 100755 --- a/hooks/gentoo/20-enable-su +++ b/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 group ${prefix}/etc/pam.d/su.tmp > ${prefix}/etc/pam.d/su +grep -v wheel ${TARGET}/etc/pam.d/su > ${TARGET}/etc/pam.d/su.tmp +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 -chmod 600 ${prefix}/etc/pam.d/su +chown root:root ${TARGET}/etc/pam.d/su +chmod 600 ${TARGET}/etc/pam.d/su # # Log our finish diff --git a/hooks/gentoo/40-setup-networking b/hooks/gentoo/40-setup-networking index bbb99ca..8970d08 100755 --- a/hooks/gentoo/40-setup-networking +++ b/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 < ${prefix}/etc/conf.d/net + cat < ${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 <${prefix}/etc/conf.d/net + cat <${TARGET}/etc/conf.d/net # # First ethernet interface # @@ -89,7 +89,7 @@ E_O_STATIC logMessage Adding etho:${interface} - cat <>${prefix}/etc/conf.d/net + cat <>${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 } diff --git a/hooks/gentoo/50-setup-hostname b/hooks/gentoo/50-setup-hostname index 16f0958..d46d5fb 100755 --- a/hooks/gentoo/50-setup-hostname +++ b/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 DNSDOMAIN=\"${domain}\" >> ${prefix}/etc/conf.d/domainname +echo HOSTNAME=\"${name}\" >> ${TARGET}/etc/conf.d/hostname +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 " " >> ${prefix}/etc/hosts + echo "${ip1} ${hostname}" >> ${TARGET}/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 <> ${TARGET}/etc/hosts < /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 ${prefix} $KERNEL_PKG + installDebianPackage ${TARGET} initramfs-tools + 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 diff --git a/hooks/karmic/80-install-kernel b/hooks/karmic/80-install-kernel index f3f2f0e..bcd7158 100755 --- a/hooks/karmic/80-install-kernel +++ b/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 ${prefix} ${linux_kernel_package} + installDebianPackage ${TARGET} initramfs-tools + 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_RAMDISK=$(basename $(ls -1 ${prefix}/boot/initrd*|tail -n 1)) -DOMU_ISSUE=$(head -n 1 ${prefix}/etc/issue | awk -F '\' '{ print $1 }' | sed 's/[ \t]*$//') +DOMU_KERNEL=$(basename $(ls -1 ${TARGET}/boot/vmlinuz* | tail -n 1)) +DOMU_RAMDISK=$(basename $(ls -1 ${TARGET}/boot/initrd*|tail -n 1)) +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 diff --git a/roles/builder b/roles/builder index 8884601..fa9553c 100755 --- a/roles/builder +++ b/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 ${prefix} devscripts -installDebianPackage ${prefix} fakeroot -installDebianPackage ${prefix} debhelper -installDebianPackage ${prefix} build-essential -installDebianPackage ${prefix} lintian -installDebianPackage ${prefix} linda +installDebianPackage ${TARGET} dpkg-dev +installDebianPackage ${TARGET} devscripts +installDebianPackage ${TARGET} fakeroot +installDebianPackage ${TARGET} debhelper +installDebianPackage ${TARGET} build-essential +installDebianPackage ${TARGET} lintian +installDebianPackage ${TARGET} linda diff --git a/roles/cfengine b/roles/cfengine index 47b2f25..cd570f4 100755 --- a/roles/cfengine +++ b/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/default/cfengine2 ${prefix}/etc/default/ +cp /etc/cfengine/update.conf ${TARGET}/etc/cfengine/ +cp /etc/default/cfengine2 ${TARGET}/etc/default/ # # Log our finish diff --git a/roles/editor b/roles/editor index 76e1394..ca6dab2 100755 --- a/roles/editor +++ b/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 diff --git a/roles/gdm b/roles/gdm index 9255092..3621a7f 100755 --- a/roles/gdm +++ b/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 ${prefix} vncserver -installDebianPackage ${prefix} xfonts-100dpi -installDebianPackage ${prefix} xfonts-75dpi -installDebianPackage ${prefix} xfonts-base -installDebianPackage ${prefix} rxvt -installDebianPackage ${prefix} gdm -installDebianPackage ${prefix} icewm-experimental +installDebianPackage ${TARGET} xserver-xfree86 +installDebianPackage ${TARGET} vncserver +installDebianPackage ${TARGET} xfonts-100dpi +installDebianPackage ${TARGET} xfonts-75dpi +installDebianPackage ${TARGET} xfonts-base +installDebianPackage ${TARGET} rxvt +installDebianPackage ${TARGET} gdm +installDebianPackage ${TARGET} icewm-experimental # # Add a new section to the GDM configuration file. # -cat <> ${prefix}/etc/gdm/gdm.conf +cat <> ${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 diff --git a/roles/minimal b/roles/minimal index a52c061..2e25ffd 100755 --- a/roles/minimal +++ b/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 ${prefix} deborphan -installDebianPackage ${prefix} less -installDebianPackage ${prefix} screen -installDebianPackage ${prefix} sudo -installDebianPackage ${prefix} vim +installDebianPackage ${TARGET} syslog-ng +installDebianPackage ${TARGET} deborphan +installDebianPackage ${TARGET} less +installDebianPackage ${TARGET} screen +installDebianPackage ${TARGET} sudo +installDebianPackage ${TARGET} vim # @@ -41,28 +41,28 @@ installDebianPackage ${prefix} vim # # PPP stuff. -removeDebianPackage ${prefix} pppconfig -removeDebianPackage ${prefix} pppoeconf -removeDebianPackage ${prefix} pppoe -removeDebianPackage ${prefix} ppp -removeDebianPackage ${prefix} libpcap0.7 +removeDebianPackage ${TARGET} pppconfig +removeDebianPackage ${TARGET} pppoeconf +removeDebianPackage ${TARGET} pppoe +removeDebianPackage ${TARGET} ppp +removeDebianPackage ${TARGET} libpcap0.7 # Editors -removeDebianPackage ${prefix} nano -removeDebianPackage ${prefix} ed -removeDebianPackage ${prefix} nvi +removeDebianPackage ${TARGET} nano +removeDebianPackage ${TARGET} ed +removeDebianPackage ${TARGET} nvi # Syslog -removeDebianPackage ${prefix} klogd -removeDebianPackage ${prefix} sysklogd +removeDebianPackage ${TARGET} klogd +removeDebianPackage ${TARGET} sysklogd # manpages -removeDebianPackage ${prefix} manpages -removeDebianPackage ${prefix} man-db -removeDebianPackage ${prefix} info +removeDebianPackage ${TARGET} manpages +removeDebianPackage ${TARGET} man-db +removeDebianPackage ${TARGET} info # misc -removeDebianPackage ${prefix} tasksel tasksel-data -removeDebianPackage ${prefix} pciutils -removeDebianPackage ${prefix} fdutils -removeDebianPackage ${prefix} cpio +removeDebianPackage ${TARGET} tasksel tasksel-data +removeDebianPackage ${TARGET} pciutils +removeDebianPackage ${TARGET} fdutils +removeDebianPackage ${TARGET} cpio diff --git a/roles/puppet b/roles/puppet index be9b79a..1575812 100755 --- a/roles/puppet +++ b/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 diff --git a/roles/resolv b/roles/resolv index e8403f6..975e7a6 100755 --- a/roles/resolv +++ b/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 <${prefix}/etc/resolv.conf.old +cat <${TARGET}/etc/resolv.conf.old nameserver 192.168.1.1 #search domain.tld RESOLV_CONF_EOF diff --git a/roles/sudoers b/roles/sudoers index 08a409b..12dc3e3 100755 --- a/roles/sudoers +++ b/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/ -chown root:root ${prefix}/etc/sudoers -chmod 440 ${prefix}/etc/sudoers +cp /etc/sudoers ${TARGET}/etc/ +chown root:root ${TARGET}/etc/sudoers +chmod 440 ${TARGET}/etc/sudoers # # Log our finish diff --git a/roles/tmpfs b/roles/tmpfs index 74f9fc6..befd76d 100755 --- a/roles/tmpfs +++ b/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 <> ${prefix}/etc/fstab +cat <> ${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 diff --git a/roles/udev b/roles/udev index 6e2be83..88703b2 100755 --- a/roles/udev +++ b/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 diff --git a/roles/xdm b/roles/xdm index a57eec8..ff59d6b 100755 --- a/roles/xdm +++ b/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 ${prefix} vncserver -installDebianPackage ${prefix} xfonts-100dpi -installDebianPackage ${prefix} xfonts-75dpi -installDebianPackage ${prefix} xfonts-base -installDebianPackage ${prefix} rxvt -installDebianPackage ${prefix} xdm -installDebianPackage ${prefix} icewm-experimental +installDebianPackage ${TARGET} xserver-xfree86 +installDebianPackage ${TARGET} vncserver +installDebianPackage ${TARGET} xfonts-100dpi +installDebianPackage ${TARGET} xfonts-75dpi +installDebianPackage ${TARGET} xfonts-base +installDebianPackage ${TARGET} rxvt +installDebianPackage ${TARGET} xdm +installDebianPackage ${TARGET} icewm-experimental # # Remove the default settings. # -rm ${prefix}/etc/X11/xdm/Xserver -rm ${prefix}/etc/X11/xdm/Xservers +rm ${TARGET}/etc/X11/xdm/Xserver +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