* Make all "local" variables lowercase.
* Move HELPER_EXTRA_PKGS from snf-image-update-helper to common.sh
* Protect all variables from spaces and other special chars
* Remove extra X's from mktemp template names (only 6 are supported).
* Make sure pipelines fail if any command (not only the rightmost)
fails
CLEANUP=( )
+add_cleanup() {
+ local cmd=""
+ for arg; do cmd+=$(printf "%q " "$arg"); done
+ CLEANUP+=("$cmd")
+}
+
log_error() {
echo "ERROR: $@" | tee $RESULT >&2
exit 1
. @commondir@/common.sh
set -e
+set -o pipefail
# terminate helper vm when the script exits
-CLEANUP+=("telinit 0")
+add_cleanup telinit 0
-if [ ! -b $FLOPPY_DEV ]; then
+if [ ! -b "$FLOPPY_DEV" ]; then
log_error "Floppy device is not present!"
fi
-floppy=$(mktemp -d --tmpdir floppy.XXXXXXXX)
-CLEANUP+=("rmdir $floppy")
+floppy=$(mktemp -d --tmpdir floppy.XXXXXX)
+add_cleanup rmdir "$floppy"
mount $FLOPPY_DEV $floppy
-CLEANUP+=("umount $floppy")
+add_cleanup umount "$floppy"
-if [ -f $floppy/rules ]; then
- source $floppy/rules
+if [ -f "$floppy/rules" ]; then
+ source "$floppy/rules"
else
log_error "Floppy does not contain \`rules\' file"
fi
# Image mount point...
-target=$(mktemp -d --tmpdir target.XXXXXXXX)
-CLEANUP+=("rmdir $target")
+target=$(mktemp -d --tmpdir target.XXXXXX)
+add_cleanup rmdir "$target"
-export SNF_IMAGE_TARGET=$target
+export SNF_IMAGE_TARGET="$target"
if [ ! -d "@tasksdir@" ]; then
log_error "snf-image/tasks directory is missing"
# If something goes wrong with the tasks, try to umount the target filesystem
# in case it is left mounted...
-trap '{ umount $target; }' ERR
+trap '{ umount "$target"; }' ERR
-echo "Execute all snf-image tasks...."
+echo "Execute all snf-image tasks...."
$RUN_PARTS -v --exit-on-error "@tasksdir@"
# Disable the trap. If code reaches here, the filesystem is unmounted.
trap - ERR
-echo "SUCCESS" > $RESULT
+echo "SUCCESS" > "$RESULT"
cleanup
trap - EXIT
### END TAST INFO
set -e
-. @commondir@/common.sh
+. "@commondir@/common.sh"
if [ ! -b "$SNF_IMAGE_DEV" ]; then
log_error "Device file:\`${SNF_IMAGE_DEV}' is not a block device"
fi
if [ "$SNF_IMAGE_TYPE" = "extdump" ]; then
- $RESIZE2FS $SNF_IMAGE_DEV
+ "$RESIZE2FS" "$SNF_IMAGE_DEV"
fi
exit 0
### END TAST INFO
set -e
-. @commondir@/common.sh
+. "@commondir@/common.sh"
if [ ! -d "$SNF_IMAGE_TARGET" ]; then
log_error "Target dir:\`$SNF_IMAGE_TARGET' is missing"
log_error "Device file:\`$SNF_IMAGE_DEV' is not a block device"
fi
-mount $SNF_IMAGE_DEV $SNF_IMAGE_TARGET
+mount "$SNF_IMAGE_DEV" "$SNF_IMAGE_TARGET"
exit 0
### END TAST INFO
set -e
-. @commondir@/common.sh
+. "@commondir@/common.sh"
if [ ! -d "$SNF_IMAGE_TARGET" ]; then
log_error "Target dir: \`$SNF_IMAGE_TARGET' is missing"
### END TAST INFO
set -e
-. @commondir@/common.sh
+. "@commondir@/common.sh"
if [ ! -d "$SNF_IMAGE_TARGET" ]; then
log_error "Target dir: \`$SNF_IMAGE_TARGET' is missing."
DSA_KEY="/etc/ssh/ssh_host_dsa_key"
for key in $HOST_KEY $RSA_KEY $DSA_KEY ; do
- if [ -f "${SNF_IMAGE_TARGET}/${key}" ] ; then
- rm -f ${SNF_IMAGE_TARGET}/${key}*
+ if [ -f "$SNF_IMAGE_TARGET/$key" ] ; then
+ rm -f "$SNF_IMAGE_TARGET"/$key*
fi
done
fi
### END TAST INFO
set -e
-. @commondir@/common.sh
+. "@commondir@/common.sh"
if [ -z "$SNF_IMAGE_TARGET" ]; then
log_error "Target dir: \`$SNF_IMAGE_TARGET' is missing"
exit 0
fi
-if [ -f @commondir@/unattend.xml ]; then
- cat @commondir@/unattend.xml > $SNF_IMAGE_TARGET/Unattend.xml
+if [ -f "@commondir@/unattend.xml" ]; then
+ cat "@commondir@/unattend.xml" > "$SNF_IMAGE_TARGET/Unattend.xml"
else
log_error "File \`@commondir@/unattend.xml' is missing."
fi
### END TAST INFO
set -e
-. @commondir@/common.sh
+. "@commondir@/common.sh"
if [ ! -d "$SNF_IMAGE_TARGET" ]; then
log_error "Target directory \`$SNF_IMAGE_TARGET' is missing"
### END TAST INFO
set -e
-. @commondir@/common.sh
+. "@commondir@/common.sh"
if [ ! -d "$SNF_IMAGE_TARGET" ]; then
log_error "Target dir: \`$SNF_IMAGE_TARGET' is missing"
# we have to force a filesystem relabeling for SELinux after messing
# around with the filesystem in redhat derived OSs
echo "Enforce an automatic relabeling in the initial boot process..."
- touch $SNF_IMAGE_TARGET/.autorelabel
+ touch "$SNF_IMAGE_TARGET/.autorelabel"
fi
fi
### END TAST INFO
set -e
-. @commondir@/common.sh
+. "@commondir@/common.sh"
windows_hostname() {
- local target=$1
- local password=$2
+ local target="$1"
+ local password="$2"
local tmp_unattend=`mktemp` || exit 1
- CLEANUP+=("rm $tmp_unattend")
+ add_cleanup rm "$tmp_unattend"
echo -n "Assigning new computer name..."
local namespace="urn:schemas-microsoft-com:unattend"
- $XMLSTARLET ed -N x=$namespace -u "/x:unattend/x:settings/x:component/x:ComputerName" -v $password "$target/Unattend.xml" > $tmp_unattend
+ "$XMLSTARLET" ed -N x=$namespace -u "/x:unattend/x:settings/x:component/x:ComputerName" -v "$password" "$target/Unattend.xml" > "$tmp_unattend"
- cat $tmp_unattend > "$target/Unattend.xml"
+ cat "$tmp_unattend" > "$target/Unattend.xml"
echo done
}
linux_hostname() {
- local target=$1
- local hostname=$2
+ local target="$1"
+ local hostname="$2"
- local distro=$(get_base_distro $target)
+ local distro=$(get_base_distro "$target")
case "$distro" in
debian)
- echo "$hostname" > $target/etc/hostname;;
+ echo "$hostname" > "$target/etc/hostname";;
redhat)
- sed -ie "s/HOSTNAME=.*$/HOSTNAME=$hostname/g" $target/etc/sysconfig/network;;
+ sed -ie "s/HOSTNAME=.*$/HOSTNAME=$hostname/g" "$target/etc/sysconfig/network";;
slackware|suse)
#local domain=$(sed -e 's/^[^\.]*//g' < /etc/HOSTNAME)
# In slackware hostname and domain name are joined together. For now I
# will not retain the domain name.
- echo $hostname > ${target}/etc/HOSTNAME;;
+ echo "$hostname" > "${target}/etc/HOSTNAME";;
gentoo)
- sed -ie "s/\(\(HOSTNAME\)\|\(hostname\)\)=.*$/\1=\"$hostname\"/" $target/etc/conf.d/hostname;;
+ sed -ie "s/\(\(HOSTNAME\)\|\(hostname\)\)=.*$/\1=\"$hostname\"/" "$target/etc/conf.d/hostname";;
esac
# Some Linux distributions assign the hostname to 127.0.1.1 in order to be
# resolvable to an IP address. Lets replace this if found in /etc/hosts
- sed -ie "s/^[[:blank:]]*127\.0\.1\.1[[:blank:]].\+$/127.0.1.1\t$hostname/" $target/etc/hosts
+ sed -ie "s/^[[:blank:]]*127\.0\.1\.1[[:blank:]].\+$/127.0.1.1\t$hostname/" "$target/etc/hosts"
}
if [ ! -d "$SNF_IMAGE_TARGET" ]; then
fi
if [ "$SNF_IMAGE_TYPE" = "ntfsdump" ]; then
- windows_hostname $SNF_IMAGE_TARGET $SNF_IMAGE_HOSTNAME
+ windows_hostname "$SNF_IMAGE_TARGET" "$SNF_IMAGE_HOSTNAME"
elif [ "$SNF_IMAGE_TYPE" = "extdump" ]; then
- linux_hostname $SNF_IMAGE_TARGET $SNF_IMAGE_HOSTNAME
+ linux_hostname "$SNF_IMAGE_TARGET" "$SNF_IMAGE_HOSTNAME"
fi
cleanup
### END TAST INFO
set -e
-. @commondir@/common.sh
+. "@commondir@/common.sh"
windows_password() {
- local target=$1
- local password=$2
+ local target="$1"
+ local password="$2"
- local tmp_unattend=`mktemp` || exit 1
- CLEANUP+=("rm $tmp_unattend")
+ local tmp_unattend="$(mktemp)"
+ add_cleanup rm "$tmp_unattend"
echo -n "Installing new admin password..."
local namespace="urn:schemas-microsoft-com:unattend"
- $XMLSTARLET ed -N x=$namespace -u "/x:unattend/x:settings/x:component/x:UserAccounts/x:AdministratorPassword/x:Value" -v $password "$target/Unattend.xml" > $tmp_unattend
+ "$XMLSTARLET" ed -N x=$namespace -u "/x:unattend/x:settings/x:component/x:UserAccounts/x:AdministratorPassword/x:Value" -v "$password" "$target/Unattend.xml" > "$tmp_unattend"
- cat $tmp_unattend > "$target/Unattend.xml"
+ cat "$tmp_unattend" > "$target/Unattend.xml"
echo done
}
linux_password() {
- local target=$1
- local password=$2
+ local target="$1"
+ local password="$2"
- local hash=$(@scriptsdir@/snf-passtohash.py $password)
- if [ ! -e ${target}/etc/shadow ]; then
+ local hash=$("@scriptsdir@/snf-passtohash.py" "$password")
+ if [ ! -e "$target/etc/shadow" ]; then
log_error "No /etc/shadow found!"
fi
fi
for i in $(seq 0 1 $((${#users[@]}-1))); do
- local tmp_shadow=$(mktemp)
- CLEANUP+=("rm $tmp_shadow")
+ local tmp_shadow="$(mktemp)"
+ add_cleanup rm "$tmp_shadow"
echo -n "Setting ${users[$i]} password..."
- echo "${users[$i]}:$hash:15103:0:99999:7:::" > $tmp_shadow
- grep -v "${users[$i]}" ${TARGET}/etc/shadow >> $tmp_shadow
- cat $tmp_shadow > ${target}/etc/shadow
+ echo "${users[$i]}:$hash:15103:0:99999:7:::" > "$tmp_shadow"
+ grep -v "${users[$i]}" "$target/etc/shadow" >> "$tmp_shadow"
+ cat "$tmp_shadow" > "$target/etc/shadow"
echo "done"
done
}
fi
if [ "$SNF_IMAGE_TYPE" = "ntfsdump" ]; then
- windows_password $SNF_IMAGE_TARGET $SNF_IMAGE_PASSWORD
+ windows_password "$SNF_IMAGE_TARGET" "$SNF_IMAGE_PASSWORD"
elif [ "$SNF_IMAGE_TYPE" = "extdump" ]; then
- linux_password $SNF_IMAGE_TARGET $SNF_IMAGE_PASSWORD
+ linux_password "$SNF_IMAGE_TARGET" "$SNF_IMAGE_PASSWORD"
fi
echo "done"
### END TAST INFO
set -e
-. @commondir@/common.sh
+. "@commondir@/common.sh"
if [ ! -d "$SNF_IMAGE_TARGET" ]; then
log_error "Target dir:\`$SNF_IMAGE_TARGET' is missing"
fi
-umount $SNF_IMAGE_TARGET
+umount "$SNF_IMAGE_TARGET"
cleanup
trap - EXIT
CLEANUP=( )
+add_cleanup() {
+ local cmd=""
+ for arg; do cmd+=$(printf "%q " "$arg"); done
+ CLEANUP+=("$cmd")
+}
+
log_error() {
echo "$@" >&2
}
log_error "Cannot interpret kpartx output and get partition mapping"
exit 1
fi
- $KPARTX -a -p- $blockdev > /dev/null
+ $KPARTX -a -p- "$blockdev" > /dev/null
filesystem_dev="/dev/mapper/${filesystem_dev_base/%-1/}"
if [ ! -b "/dev/mapper/$filesystem_dev_base" ]; then
log_error "Can't find kpartx mapped partition:" \
}
unmap_disk0() {
- $KPARTX -d -p- $1
+ $KPARTX -d -p- "$1"
}
format_disk0() {
create_floppy() {
local img=$1
- local target=$(mktemp -d) || exit 1
- CLEANUP+=("rmdir $target")
+ local target=$(mktemp -d)
+ add_cleanup rmdir "$target"
- dd bs=512 count=2880 if=/dev/zero of=$img
- mkfs.ext2 -F $img > /dev/null
- mount $img $target -o loop
+ dd bs=512 count=2880 if=/dev/zero of="$img"
+ mkfs.ext2 -F "$img" > /dev/null
+ mount "$img" "$target" -o loop
set | egrep ^snf_export_\\w+=|sed -e 's/^snf_export_/SNF_IMAGE_/' | \
while read line; do
- echo "export $line" >> $target/rules
+ echo "export $line" >> "$target/rules"
done
- umount $target
+ umount "$target"
}
# this one is only to be called by create
: ${HELPER_KERNEL:="@HELPER_KERNEL@"}
: ${HELPER_INITRD:="@HELPER_INITRD@"}
: ${HELPER_PKG:="@HELPER_DIR@/snf-image-helper.deb"}
-: ${HELPER_SOFT_TIMEOUT=15}
-: ${HELPER_HARD_TIMEOUT=5}
-: ${HELPER_USER="nobody"}
+: ${HELPER_SOFT_TIMEOUT:=15}
+: ${HELPER_HARD_TIMEOUT:=5}
+: ${HELPER_USER:="nobody"}
+: ${HELPER_CACHE_FILE:="@HELPER_DIR@/cache.tar"}
+: ${HELPER_EXTRA_PKGS:="linux-image-amd64,e2fsprogs,ntfs-3g,ntfsprogs,xmlstarlet,python"}
+
SCRIPT_NAME=$(basename $0)
# policies, either expressed or implied, of GRNET S.A.
set -e
+set -o pipefail
. common.sh
case "$IMAGE_TYPE" in
extdump)
- IMAGE_FILE="${IMAGE_DIR}/${IMAGE_NAME}-${ARCH}.extdump";;
+ image_file="$IMAGE_DIR/$IMAGE_NAME-$ARCH.extdump";;
ntfsdump)
- IMAGE_FILE="${IMAGE_DIR}/${IMAGE_NAME}-${ARCH}.ntfsdump";;
+ image_file="$IMAGE_DIR/$IMAGE_NAME-$ARCH.ntfsdump";;
*)
log_error "Unknown image type: \`$IMAGE_TYPE'.";
exit 1
esac
-if [ ! -e "$IMAGE_FILE" ]; then
- log_error "Image file \`$IMAGE_FILE' does not exit."
+if [ ! -e "$image_file" ]; then
+ log_error "Image file \`$image_file' does not exit."
exit 1
fi
-MONITOR="" #Empty if progress monitor support is disabled
+monitor="" #Empty if progress monitor support is disabled
if [ "$progress_monitor_support" = "yes" ]; then
- IMAGE_SIZE="$(stat -L -c %s ${IMAGE_FILE})"
- MONITOR="$PROGRESS_MONITOR -i ${INSTANCE_NAME} -r ${IMAGE_SIZE}"
+ image_size="$(stat -L -c %s "$IMAGE_FILE")"
+ monitor="$(printf "%q" "$PROGRESS_MONITOR") \
+ -i $(printf "%q" "$INSTANCE_NAME") -r $image_size"
fi
# If the target device is not a real block device we'll first losetup it.
# This is needed for file disks.
-if [ ! -b $blockdev ]; then
- ORIGINAL_BLOCKDEV=$blockdev
- blockdev=$($LOSETUP -sf $blockdev)
- CLEANUP+=("$LOSETUP -d $blockdev")
+if [ ! -b "$blockdev" ]; then
+ original_blockdev="$blockdev"
+ blockdev=$("$LOSETUP" -sf "$blockdev")
+ add_cleanup "$LOSETUP" -d "$blockdev"
fi
-format_disk0 $blockdev ${IMAGE_TYPE}
+format_disk0 "$blockdev" "$IMAGE_TYPE"
-filesystem_dev=$(map_disk0 $blockdev)
-CLEANUP+=("unmap_disk0 $blockdev")
+filesystem_dev=$(map_disk0 "$blockdev")
+add_cleanup unmap_disk0 "$blockdev"
root_dev="${filesystem_dev}-1"
# Deploying an image file on a target block device is a streaming
# copy operation. Enable the direct I/O flag on the output fd to
# avoid polluting the host cache with useless data.
-$MONITOR dd bs=4M if=$IMAGE_FILE of=$root_dev oflag=direct
+$monitor dd bs=4M if="$IMAGE_FILE" of="$root_dev" oflag=direct
# Create a floppy image
-floppy=$(mktemp --tmpdir floppy.XXXXXXXX)
-CLEANUP+=("rm -f $floppy")
+floppy=$(mktemp --tmpdir floppy.XXXXXX)
+add_cleanup rm "$floppy"
snf_export_DEV=/dev/vda
-snf_export_TYPE=${IMG_FORMAT}
-snf_export_PASSWORD=${IMG_PASSWD}
-snf_export_HOSTNAME=${instance}
+snf_export_TYPE="$IMG_FORMAT"
+snf_export_PASSWORD="$IMG_PASSWD"
+snf_export_HOSTNAME="$instance"
if [ -n "$IMG_PERSONALITY" ]; then
- snf_export_PERSONALITY=${IMG_PERSONALITY}
+ snf_export_PERSONALITY="$IMG_PERSONALITY"
fi
-create_floppy $floppy
+create_floppy "$floppy"
# Invoke the helper vm to do the dirty job...
-result_file=$(mktemp --tmpdir result.XXXXXXXX)
-CLEANUP+=("rm -f $result_file")
+result_file=$(mktemp --tmpdir result.XXXXXX)
+add_cleanup rm "$result_file"
-image_file=$(mktemp --tmpdir helperXXXXXXXX.img)
-CLEANUP+=("rm -f $image_file")
+snapshot=$(mktemp --tmpdir helperXXXXXX.img)
+add_cleanup rm "$snapshot"
-$QEMU_IMG create -f qcow2 -b ${HELPER_IMG} $image_file
+"$QEMU_IMG" create -f qcow2 -b "$HELPER_IMG" "$snapshot"
-$TIMELIMIT -t $HELPER_SOFT_TIMEOUT -T $HELPER_HARD_TIMEOUT \
- kvm -runas $HELPER_USER -drive file=${image_file} \
- -drive file=$root_dev,format=raw,if=virtio,cache=none \
- -boot c -serial stdio -serial file:$result_file -fda $floppy \
- -vga none -nographic -parallel none -monitor null -nographic \
- -kernel ${HELPER_KERNEL} -initrd ${HELPER_INITRD} \
+"$TIMELIMIT" -t "$HELPER_SOFT_TIMEOUT" -T "$HELPER_HARD_TIMEOUT" \
+ kvm -runas "$HELPER_USER" -drive file="$snapshot" \
+ -drive file="$root_dev",format=raw,if=virtio,cache=none \
+ -boot c -serial stdio -serial file:"$result_file" \
+ -fda "$floppy" -vga none -nographic -parallel none -monitor null \
+ -kernel "$HELPER_KERNEL" -initrd "$HELPER_INITRD" \
-append "quiet ro root=/dev/sda1 console=ttyS0,9600n8" \
2>&1 | sed 's|^|HELPER: |g'
fi
# Read the first line. This will remove \r and \n chars
-result=$(sed 's|\r||g' $result_file | xargs echo)
+result=$(sed 's|\r||g' "$result_file" | xargs echo)
if [ "x$result" != "xSUCCESS" ]; then
log_error "Helper VM returned error"
fi
# Install a new MBR
-$INSTALL_MBR -p 1 -i n ${blockdev}
+"$INSTALL_MBR" -p 1 -i n "$blockdev"
# Execute cleanups
cleanup
# user the helper vm should run as is specifies by HELPER_USR variable.
# HELPER_USER="nobody"
+# HELPER_CACHE_FILE: Cache file update-helper script uses to avoid running
+# `debootstrap' all the time.
+# HELPER_CACHE_FILE=$(HELPER_DIR)/cache.tar
+
+# HELPER_EXTRA_PKGS: Extra packages that will need to be supplied to de supplied
+# to debootstrap to make the resulting helper image workable
+# HELPER_EXTRA_PKGS="linux-image-amd64,e2fsprogs,ntfs-3g,ntfsprogs,xmlstarlet,python"
+
# Paths for needed programs. Uncommend and change the variables below, if you
# don't want to use the default one.
# LOSETUP="losetup"
#!/bin/bash
set -e
+set -o pipefail
. @osdir@/common.sh
-CACHE_FILE="$HELPER_DIR/cache.tar"
-ARCH=amd64
-EXTRA_PKGS="linux-image-amd64,e2fsprogs,ntfs-3g,ntfsprogs,xmlstarlet,python"
-
if [ ! -e "$HELPER_PKG" ]; then
log_error "Helper package \`$HELPER_PKG' not found."
log_error "You need to provide this for the script to work"
exit 1
fi
+
cat >&1 <<EOF
This program will overwrite the following files:
\`$HELPER_DIR/initrd'
rm -f "$HELPER_DIR/initrd" "$HELPER_DIR/kernel" "$HELPER_DIR/image"
echo -n "Allocating space for helper disk image..."
-helper_img=$(mktemp $HELPER_DIR/image.XXXXXXXX)
+helper_img=$(mktemp "$HELPER_DIR/image.XXXXXX")
-dd if=/dev/zero of=$helper_img bs=1k count=400000 &> /dev/null
+dd if=/dev/zero of="$helper_img" bs=1k count=400000 &> /dev/null
echo "done"
+echo "Creating partitions..."
blockdev=$(losetup -sf $helper_img)
-CLEANUP+=("losetup -d $blockdev")
+add_cleanup losetup -d "$blockdev"
sleep 1 # sometimes losetup returns and the device is still busy..
-echo "Creating partitions..."
-format_disk0 $blockdev "extdump" 2>&1 | sed -e 's/^/CFDISK: /g'
+format_disk0 "$blockdev" "extdump" 2>&1 | sed -e 's/^/CFDISK: /g'
-root_dev=$(map_disk0 $blockdev)-1
-CLEANUP+=("unmap_disk0 $blockdev")
+root_dev=$(map_disk0 "$blockdev")-1
+add_cleanup unmap_disk0 "$blockdev"
echo Creating and configuring filesystem...
-mkfs.ext3 $root_dev 2>&1 | sed -e 's/^/MKFS.EXT3: /g'
+mkfs.ext3 "$root_dev" 2>&1 | sed -e 's/^/MKFS.EXT3: /g'
# The helper vm should never do filesystem checks...
-tune2fs -i 0 -c 0 $root_dev 2>&1 | sed -e 's/^/TUNE2FS: /g'
+tune2fs -i 0 -c 0 "$root_dev" 2>&1 | sed -e 's/^/TUNE2FS: /g'
-TMPDIR=$(mktemp -d)
-CLEANUP+=("rmdir $TMPDIR")
+target=$(mktemp -d)
+add_cleanup rmdir "$target"
-mount $root_dev $TMPDIR
-CLEANUP+=("umount $root_dev")
+mount "$root_dev" "$target"
+add_cleanup umount "$root_dev"
-echo -n "Checking for cached root filesystem file \`$CACHE_FILE'..."
-if [ -f "$CACHE_FILE" ]; then
+echo -n "Checking for cached root filesystem file \`$HELPER_CACHE_FILE'..."
+if [ -f "$HELPER_CACHE_FILE" ]; then
echo "found"
- tar xf "$CACHE_FILE" -C $TMPDIR
+ tar xf "$HELPER_CACHE_FILE" -C "$target"
else
echo "not found"
echo "Debootstraping to create a new root filesystem:"
- debootstrap --arch "$ARCH" --include $EXTRA_PKGS --variant=minbase \
- squeeze $TMPDIR 2>&1 | sed -e 's/^/DEBOOTSTRAP: /g'
+ debootstrap --arch amd64 --include "$HELPER_EXTRA_PKGS" \
+ --variant=minbase squeeze "$target" 2>&1 | sed -e 's/^/DEBOOTSTRAP: /g'
# remove the downloaded debs, as they are no longer needed
- find "$TMPDIR/var/cache/apt/archives" -type f -name '*.deb' -print0 | \
+ find "$target/var/cache/apt/archives" -type f -name '*.deb' -print0 | \
xargs -r0 rm -f
- TMP_CACHE=$(mktemp "${CACHE_FILE}.XXXXXX")
- tar cf "$TMP_CACHE" -C $TMPDIR .
- mv -f "$TMP_CACHE" "$CACHE_FILE"
+ tmp_cache=$(mktemp "$HELPER_CACHE_FILE.XXXXXX")
+ tar cf "$tmp_cache" -C "$target" . || { rm "$tmp_cache"; false; }
+ mv -f "$tmp_cache" "$HELPER_CACHE_FILE"
fi
echo -n "Configuring the helper image..."
-echo snf-image-helper > $TMPDIR/etc/hostname
+echo snf-image-helper > "$target/etc/hostname"
-cat > $TMPDIR/etc/fstab <<EOF
+cat > "$target/etc/fstab" <<EOF
# /etc/fstab: static file system information.
#
# <file system> <mount point> <type> <options> <dump> <pass>
echo "done"
echo -n "Extracting kernel..."
-if [ ! -L "$TMPDIR/vmlinuz" -o ! -L "$TMPDIR/vmlinuz" ]; then
-
- log_error "vmlinuz or initrd.img link in root is missing."
- log_error "I don't know how to find a usable kernel/initrd pair."
- exit 1
+if [ ! -L "$target/vmlinuz" -o ! -L "$target/vmlinuz" ]; then
+ echo -e "\033[1;31mfailed\033[0m"
+ log_error "vmlinuz or initrd.img link in root is missing."
+ log_error "I don't know how to find a usable kernel/initrd pair."
+ exit 1
fi
echo "done"
-kernel=$(readlink -en $TMPDIR/vmlinuz)
-initrd=$(readlink -en $TMPDIR/initrd.img)
+kernel=$(readlink -en "$target/vmlinuz")
+initrd=$(readlink -en "$target/initrd.img")
-echo "Moving $(basename $kernel) and $(basename $initrd) to $HELPER_DIR"
-mv $kernel $initrd $HELPER_DIR
+echo "Moving $(basename "$kernel") and $(basename "$initrd") to \`$HELPER_DIR'"
+mv "$kernel" "$initrd" "$HELPER_DIR"
-kernel=$(basename $kernel)
-initrd=$(basename $initrd)
+kernel=$(basename "$kernel")
+initrd=$(basename "$initrd")
-(cd $HELPER_DIR; ln -fs $kernel kernel; ln -fs $initrd initrd)
+(cd "$HELPER_DIR"; ln -fs "$kernel" kernel; ln -fs "$initrd" initrd)
-rm $TMPDIR/vmlinuz $TMPDIR/initrd.img
+rm "$target/vmlinuz" "$target/initrd.img"
echo "Installing snf-image-helper pkg in the new image..."
-cp $HELPER_PKG $TMPDIR/tmp/
-pkg_name=$(basename "$HELPER_PKG")
-CLEANUP+=("rm $TMPDIR/tmp/$pkg_name")
-chroot ${TMPDIR} dpkg -i /tmp/$pkg_name 2>&1 | sed -e 's/^/DPKG: /g'
+cp "$HELPER_PKG" "$target/tmp/"
+pkg_name=$(basename "$HELPER_PKG")
+add_cleanup rm "$target/tmp/$pkg_name"
+chroot "$target" dpkg -i "/tmp/$pkg_name" 2>&1 | sed -e 's/^/DPKG: /g'
-cat > ${TMPDIR}/etc/rc.local <<EOF
+cat > "$target/etc/rc.local" <<EOF
#!/bin/sh -e
#
# rc.local
exit 0
EOF
-chmod +x ${TMPDIR}/etc/rc.local
+chmod +x "$target/etc/rc.local"
echo "done"
cleanup
-mv $helper_img $HELPER_DIR/image
+mv "$helper_img" "$HELPER_DIR/image"
trap - EXIT
projects / snf-image / commitdiff