summaryrefslogtreecommitdiff
path: root/helpers
diff options
context:
space:
mode:
authorBas Wijnen <wijnen@debian.org>2008-03-02 08:24:59 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:01:31 +0100
commit1268b8b9570494eeb7dfcfb3b23abe44eab88392 (patch)
treeee70e83d55063c7ada902d4e6b62e3820ba511d5 /helpers
parent20da312cd1e5e53d842049ad26476cd8319da01f (diff)
downloadvyos-live-build-1268b8b9570494eeb7dfcfb3b23abe44eab88392.tar.gz
vyos-live-build-1268b8b9570494eeb7dfcfb3b23abe44eab88392.zip
Making usb-hdd images large enough (Closes: #468855).
When building a very minimal live system on a usb-hdd target, the generated image is too small. A very minimal system is smaller than 50MB, and so this is the same as DU_DIM for such a system. This is too small. Unconditionally adding one solves the problem.
Diffstat (limited to 'helpers')
-rwxr-xr-xhelpers/lh_binary_usb-hdd2
-rwxr-xr-xhelpers/lh_source_usb-hdd2
2 files changed, 2 insertions, 2 deletions
diff --git a/helpers/lh_binary_usb-hdd b/helpers/lh_binary_usb-hdd
index 44eaac534..6298c4c73 100755
--- a/helpers/lh_binary_usb-hdd
+++ b/helpers/lh_binary_usb-hdd
@@ -82,7 +82,7 @@ fi
# Everything which comes here needs to be cleaned up,
DU_DIM="$(du -ms binary | cut -f1)"
-REAL_DIM="$(expr ${DU_DIM} + ${DU_DIM} / 50)" # Just 2% more to be sure, need something more sophistcated here...
+REAL_DIM="$(expr ${DU_DIM} + ${DU_DIM} / 50 + 1)" # Just 2% more to be sure, need something more sophistcated here...
dd if=/dev/zero of=chroot/binary.img bs=1024k count=0 seek=${REAL_DIM}
FREELO="$(${LH_LOSETUP} -f)"
if [ ! -b chroot/${FREELO} ]
diff --git a/helpers/lh_source_usb-hdd b/helpers/lh_source_usb-hdd
index 14b32d8c8..914d1eed2 100755
--- a/helpers/lh_source_usb-hdd
+++ b/helpers/lh_source_usb-hdd
@@ -72,7 +72,7 @@ fi
# Everything which comes here needs to be cleaned up,
DU_DIM="$(du -ms source | cut -f1)"
-REAL_DIM="$(expr ${DU_DIM} + ${DU_DIM} / 50)" # Just 2% more to be sure, need something more sophistcated here...
+REAL_DIM="$(expr ${DU_DIM} + ${DU_DIM} / 50 + 1)" # Just 2% more to be sure, need something more sophistcated here...
dd if=/dev/zero of=source.img bs=1024k count=0 seek=${REAL_DIM}
FREELO="$(${LH_LOSETUP} -f)"
if [ ! -b chroot/${FREELO} ]