diff options
| author | Daniel Baumann <daniel@debian.org> | 2008-10-28 16:44:06 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:03:43 +0100 |
| commit | 1c1e7db6c44d639fd51ee23061087c7d14b6ef6b (patch) | |
| tree | e20b0cfa3a45140a39be0cadf45410eab5cc22e7 /helpers/lh_binary_usb-hdd | |
| parent | 6696b019fe03a371d69c50a1ef82223e4bb364a7 (diff) | |
| download | vyos-live-build-1c1e7db6c44d639fd51ee23061087c7d14b6ef6b.tar.gz vyos-live-build-1c1e7db6c44d639fd51ee23061087c7d14b6ef6b.zip | |
Generalizing internal Chroot(); by requiring its first argument to be the chroot directory.
Diffstat (limited to 'helpers/lh_binary_usb-hdd')
| -rwxr-xr-x | helpers/lh_binary_usb-hdd | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/helpers/lh_binary_usb-hdd b/helpers/lh_binary_usb-hdd index db3806d45..115321df7 100755 --- a/helpers/lh_binary_usb-hdd +++ b/helpers/lh_binary_usb-hdd @@ -148,10 +148,10 @@ esac case "${LH_CHROOT_BUILD}" in enabled) - Chroot "parted -s ${FREELO} mklabel ${PARTITION_TABLE_TYPE}" || true - Chroot "parted -s ${FREELO} mkpart primary ${PARTITION_TYPE} 0.0 100%" || true - Chroot "parted -s ${FREELO} set 1 boot on" || true - Chroot "parted -s ${FREELO} set 1 lba off" || true + Chroot chroot "parted -s ${FREELO} mklabel ${PARTITION_TABLE_TYPE}" || true + Chroot chroot "parted -s ${FREELO} mkpart primary ${PARTITION_TYPE} 0.0 100%" || true + Chroot chroot "parted -s ${FREELO} set 1 boot on" || true + Chroot chroot "parted -s ${FREELO} set 1 lba off" || true if [ "${LH_BOOTLOADER}" = "syslinux" ] then @@ -196,7 +196,7 @@ esac case "${LH_CHROOT_BUILD}" in enabled) - Chroot "mkfs.${MKFS} ${MKFS_OPTIONS} ${FREELO}" + Chroot chroot "mkfs.${MKFS} ${MKFS_OPTIONS} ${FREELO}" ;; disabled) @@ -226,7 +226,7 @@ find /live/vmlinuz EOM EOF - rootpartition="$(Chroot 'sh grub.sh' 2>/dev/null | grep -A 1 'find /live/vmlinuz' | grep -v 'find /live/vmlinuz')" + rootpartition="$(Chroot chroot 'sh grub.sh' 2>/dev/null | grep -A 1 'find /live/vmlinuz' | grep -v 'find /live/vmlinuz')" usbdev="$(echo $rootpartition | sed -e 's|,[[:digit:]]||')" echo "Root partition is $rootpartition, device is: $usbdev" @@ -239,7 +239,7 @@ EOF #EOM #EOF -#Chroot "sh grub.sh" +#Chroot chroot "sh grub.sh" rm -f chroot/grub.sh fi @@ -252,7 +252,7 @@ if [ "${LH_BOOTLOADER}" = "syslinux" ] then case "${LH_CHROOT_BUILD}" in enabled) - Chroot "syslinux ${FREELO}" + Chroot chroot "syslinux ${FREELO}" ;; disabled) |