From c6236a0794c598d82aa470ca7b358bd1d0986aa1 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 14 Nov 2007 09:55:50 +0100 Subject: Moving lh_losetup into an internal function, avoiding helper failure with return value due to new trap. --- functions/losetup.sh | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100755 functions/losetup.sh (limited to 'functions/losetup.sh') diff --git a/functions/losetup.sh b/functions/losetup.sh new file mode 100755 index 000000000..4ca1d5fe1 --- /dev/null +++ b/functions/losetup.sh @@ -0,0 +1,37 @@ +#!/bin/sh + +# losetup - wrapper around losetup +# Copyright (C) 2006-2007 Daniel Baumann +# +# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. +# This is free software, and you are welcome to redistribute it +# under certain conditions; see COPYING for details. + +set -e + +Losetup () +{ + DEVICE="${1}" + FILE="${2}" + PARTITION="${3:=1}" + + ${LH_ROOT_COMMAND} ${LH_LOSETUP} "${DEVICE}" "${FILE}" + FDISK_OUT="$(LH_FDISK -l -u ${DEVICE} 2>&1)" + ${LH_ROOT_COMMAND} ${LH_LOSETUP} -d "${DEVICE}" + + LOOPDEVICE="$(echo ${DEVICE}p${PARTITION})" + + if [ "${PARTITION}" = "0" ] + then + Echo_message "Mounting ${DEVICE} with offset 0" + + ${LH_ROOT_COMMAND} ${LH_LOSETUP} "${DEVICE}" "${FILE}" + else + CYLINDERS="$(echo "$FDISK_OUT" | sed -ne "s_^$LOOPDEVICE[ *]*\([0-9]*\).*_\1_p")" + OFFSET="$(expr ${CYLINDERS} '*' 512)" + + Echo_message "Mounting ${DEVICE} with offset ${OFFSET}" + + ${LH_ROOT_COMMAND} ${LH_LOSETUP} -o "${OFFSET}" "${DEVICE}" "${FILE}" + fi +} -- cgit v1.2.3