summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2008-03-02 11:12:02 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:01:33 +0100
commit0904d6b37da2afc1dbcd08e03a60375761201086 (patch)
treeae5135bc0487699b242fc94960611441e33da7f6
parent1268b8b9570494eeb7dfcfb3b23abe44eab88392 (diff)
downloadvyos-live-build-0904d6b37da2afc1dbcd08e03a60375761201086.tar.gz
vyos-live-build-0904d6b37da2afc1dbcd08e03a60375761201086.zip
Also handling ext3 in lh_binary_rootfs, thanks to Bas Wijnen <wijnen@debian.org> (Closes: #468902).
-rwxr-xr-xhelpers/lh_binary_rootfs14
1 files changed, 7 insertions, 7 deletions
diff --git a/helpers/lh_binary_rootfs b/helpers/lh_binary_rootfs
index 97cdaabc0..110822859 100755
--- a/helpers/lh_binary_rootfs
+++ b/helpers/lh_binary_rootfs
@@ -94,7 +94,7 @@ do
done
case "${LH_CHROOT_FILESYSTEM}" in
- ext2)
+ ext2|ext3)
# Checking depends
Check_package chroot/usr/bin/genext2fs genext2fs
@@ -104,10 +104,10 @@ case "${LH_CHROOT_FILESYSTEM}" in
# Installing depends
Install_package
- # Remove old ext2 image
- if [ -f binary/${INITFS}/filesystem.ext2 ]
+ # Remove old image
+ if [ -f binary/${INITFS}/filesystem.${LH_CHROOT_FILESYSTEM} ]
then
- rm -f binary/${INITFS}/filesystem.ext2
+ rm -f binary/${INITFS}/filesystem.${LH_CHROOT_FILESYSTEM}
fi
DU_DIM="$(du -ks chroot/chroot | cut -f1)"
@@ -121,15 +121,15 @@ case "${LH_CHROOT_FILESYSTEM}" in
case "${LH_CHROOT_BUILD}" in
enabled)
- Chroot "genext2fs --size-in-blocks=${REAL_DIM} ${RESERVED_PERCENTAGE}=0 --root=chroot filesystem.ext2"
+ Chroot "genext2fs --size-in-blocks=${REAL_DIM} ${RESERVED_PERCENTAGE}=0 --root=chroot filesystem.${LH_CHROOT_FILESYSTEM}"
# Move image
- mv chroot/filesystem.ext2 binary/${INITFS}
+ mv chroot/filesystem.${LH_CHROOT_FILESYSTEM} binary/${INITFS}
rm -rf chroot/chroot
;;
disabled)
- genext2fs --size-in-blocks=${REAL_DIM} ${RESERVED_PERCENTAGE}=0 --root=chroot binary/${INITFS}/filesystem.ext2
+ genext2fs --size-in-blocks=${REAL_DIM} ${RESERVED_PERCENTAGE}=0 --root=chroot binary/${INITFS}/filesystem.${LH_CHROOT_FILESYSTEM}
;;
esac