diff options
| author | Daniel Baumann <daniel@debian.org> | 2011-08-25 23:47:30 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-08-25 23:47:30 +0200 |
| commit | 5d2fbf5d5adfd82f59b039d914c09e5dbca8296b (patch) | |
| tree | 5b3558887cd68edba4f157c221dc9e5965f1d592 /scripts/build/lb_source_virtual-hdd | |
| parent | 40a843bddd72c5222ee5d0983548c63b524326de (diff) | |
| download | vyos-live-build-5d2fbf5d5adfd82f59b039d914c09e5dbca8296b.tar.gz vyos-live-build-5d2fbf5d5adfd82f59b039d914c09e5dbca8296b.zip | |
Adding support for ext4 for binary and chroot filesystem, including partial patch from Ben Howard <ben.howard@canonical.com> (Closes: #639298).
Diffstat (limited to 'scripts/build/lb_source_virtual-hdd')
| -rwxr-xr-x | scripts/build/lb_source_virtual-hdd | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/scripts/build/lb_source_virtual-hdd b/scripts/build/lb_source_virtual-hdd index ed3d2cc99..0f5357341 100755 --- a/scripts/build/lb_source_virtual-hdd +++ b/scripts/build/lb_source_virtual-hdd @@ -51,8 +51,8 @@ Create_lockfile .lock if [ "${LB_BUILD_WITH_CHROOT}" = "true" ] then case "${LB_BINARY_FILESYSTEM}" in - ext2|ext3) - Check_package chroot/sbin/mkfs.ext2 e2fsprogs + ext2|ext3|ext4) + Check_package chroot/sbin/mkfs.${LB_BINARY_FILESYSTEM} e2fsprogs ;; esac fi @@ -76,24 +76,15 @@ then mv source-virtual.img chroot case "${LB_BINARY_FILESYSTEM}" in - ext2) - Chroot chroot "mkfs.ext2 -F -m 0 source-virtual.img" - ;; - - ext3) - Chroot chroot "mkfs.ext3 -F source-virtual.img" - ;; + ext2|ext3|ext4) + Chroot chroot "mkfs.${LB_BINARY_FILESYSTEM} -F -m 0 source-virtual.img" esac mv chroot/source-virtual.img ./ else case "${LB_BINARY_FILESYSTEM}" in - ext2) - mkfs.ext2 -F -m 0 source-virtual.img - ;; - - ext3) - mkfs.ext3 -F -m 0 source-virtual.img + ext2|ext3|ext4) + mkfs.${LB_BINARY_FILESYSTEM} -F -m 0 source-virtual.img ;; esac fi |