diff options
| author | Lyndon Brown <jnqnfe@gmail.com> | 2020-04-06 18:43:41 +0100 |
|---|---|---|
| committer | Raphaël Hertzog <hertzog@debian.org> | 2020-04-23 16:54:31 +0000 |
| commit | 83d9145257220d39e487021e993344adafe71b8a (patch) | |
| tree | dfccbf1f040b287f198dc414b3a19f25af59805a /scripts/build/source_hdd | |
| parent | 41738b1932f0830a2b7eb92e62540a2246105a11 (diff) | |
| download | vyos-live-build-83d9145257220d39e487021e993344adafe71b8a.tar.gz vyos-live-build-83d9145257220d39e487021e993344adafe71b8a.zip | |
config: s/LIVE_IMAGE_NAME/LB_IMAGE_NAME/
no backwards compatibility hack for reading the old var from existing
saved config used because this was previously stored in the alternate
format config/build file.
Gbp-Dch: Short
Diffstat (limited to 'scripts/build/source_hdd')
| -rwxr-xr-x | scripts/build/source_hdd | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/build/source_hdd b/scripts/build/source_hdd index 6b10e64d8..613bdc96f 100755 --- a/scripts/build/source_hdd +++ b/scripts/build/source_hdd @@ -51,15 +51,15 @@ Check_package host /sbin/losetup mount Install_package # Remove old source -if [ -f ${LIVE_IMAGE_NAME}-source.img ] +if [ -f ${LB_IMAGE_NAME}-source.img ] then - rm -f ${LIVE_IMAGE_NAME}-source.img + rm -f ${LB_IMAGE_NAME}-source.img fi # Everything which comes here needs to be cleaned up, DU_DIM="$(du -ms source | cut -f1)" REAL_DIM="$(Calculate_partition_size ${DU_DIM} ${LB_BINARY_FILESYSTEM})" -dd if=/dev/zero of=${LIVE_IMAGE_NAME}-source.img bs=1024k count=0 seek=${REAL_DIM} +dd if=/dev/zero of=${LB_IMAGE_NAME}-source.img bs=1024k count=0 seek=${REAL_DIM} MAKEDEV=false FREELO="$(losetup -f)" if [ ! -b chroot/${FREELO} ] @@ -90,12 +90,12 @@ case "${LB_BINARY_FILESYSTEM}" in esac Echo_warning "!!! The following error/warning messages can be ignored !!!" -Losetup $FREELO ${LIVE_IMAGE_NAME}-source.img 0 +Losetup $FREELO ${LB_IMAGE_NAME}-source.img 0 Chroot chroot "parted -s ${FREELO} mklabel msdos" || true Chroot chroot "parted -a optimal -s ${FREELO} mkpart primary ${PARTITION_TYPE} 0.0 100%" || true Lodetach ${FREELO} -Losetup $FREELO ${LIVE_IMAGE_NAME}-source.img 1 +Losetup $FREELO ${LB_IMAGE_NAME}-source.img 1 case "${LB_BINARY_FILESYSTEM}" in ext2|ext3|ext4) @@ -134,7 +134,7 @@ Lodetach ${FREELO} Echo_warning "!!! The above error/warning messages can be ignored !!!" FREELO="$(losetup -f)" -Losetup "$FREELO" ${LIVE_IMAGE_NAME}-source.img 0 +Losetup "$FREELO" ${LB_IMAGE_NAME}-source.img 0 Chroot chroot "parted -s ${FREELO} set 1 lba off" || true Lodetach ${FREELO} |