summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2011-08-25 23:47:30 +0200
committerDaniel Baumann <daniel@debian.org>2011-08-25 23:47:30 +0200
commit5d2fbf5d5adfd82f59b039d914c09e5dbca8296b (patch)
tree5b3558887cd68edba4f157c221dc9e5965f1d592 /scripts
parent40a843bddd72c5222ee5d0983548c63b524326de (diff)
downloadvyos-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')
-rwxr-xr-xscripts/build/lb_binary_rootfs4
-rwxr-xr-xscripts/build/lb_binary_usb10
-rwxr-xr-xscripts/build/lb_binary_virtual-hdd20
-rwxr-xr-xscripts/build/lb_config4
-rwxr-xr-xscripts/build/lb_source_usb4
-rwxr-xr-xscripts/build/lb_source_virtual-hdd21
6 files changed, 23 insertions, 40 deletions
diff --git a/scripts/build/lb_binary_rootfs b/scripts/build/lb_binary_rootfs
index 6ee9d1590..692a28d5a 100755
--- a/scripts/build/lb_binary_rootfs
+++ b/scripts/build/lb_binary_rootfs
@@ -88,9 +88,9 @@ do
done
case "${LB_CHROOT_FILESYSTEM}" in
- ext2|ext3)
+ ext2|ext3|ext4)
# Checking depends
- Check_package chroot/sbin/mkfs.ext2 e2fsprogs
+ Check_package chroot/sbin/mkfs.${LB_BINARY_FILESYSTEM} e2fsprogs
# Restoring cache
Restore_cache cache/packages_binary
diff --git a/scripts/build/lb_binary_usb b/scripts/build/lb_binary_usb
index 96feee499..228827dd0 100755
--- a/scripts/build/lb_binary_usb
+++ b/scripts/build/lb_binary_usb
@@ -51,12 +51,12 @@ Check_package chroot/sbin/parted parted
if [ "${LB_ARCHITECTURES}" = "sparc" ]
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
;;
*)
- Echo_error "Sparc only supports booting from ext2, ext3 (or ufs)"
+ Echo_error "Sparc only supports booting from ext2, ext3, ext4 or ufs."
exit 1
;;
esac
@@ -128,7 +128,7 @@ case "${LB_ARCHITECTURES}" in
esac
case "${LB_BINARY_FILESYSTEM}" in
- ext2|ext3)
+ ext2|ext3|ext4)
PARTITION_TYPE="ext2"
;;
@@ -170,7 +170,7 @@ FREELO="$(${LB_LOSETUP} -f)"
Losetup $FREELO chroot/binary.img 1
case "${LB_BINARY_FILESYSTEM}" in
- ext2|ext3)
+ ext2|ext3|ext4)
MKFS="${LB_BINARY_FILESYSTEM}"
MKFS_OPTIONS="-L DEBIAN_LIVE -m 0"
;;
diff --git a/scripts/build/lb_binary_virtual-hdd b/scripts/build/lb_binary_virtual-hdd
index d24f9f329..f04866309 100755
--- a/scripts/build/lb_binary_virtual-hdd
+++ b/scripts/build/lb_binary_virtual-hdd
@@ -46,8 +46,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_BINARTY_FILESYSTEM} e2fsprogs
;;
esac
fi
@@ -79,24 +79,16 @@ then
fi
case "${LB_BINARY_FILESYSTEM}" in
- ext2)
- Chroot chroot "mkfs.ext2 -F binary-virtual.img"
- ;;
-
- ext3)
- Chroot chroot "mkfs.ext3 -F binary-virtual.img"
+ ext2|ext3|ext4)
+ Chroot chroot "mkfs.${LB_BINARY_FILESYSTEM} -F binary-virtual.img"
;;
esac
mv chroot/binary-virtual.img ./
else
case "${LB_BINARY_FILESYSTEM}" in
- ext2)
- mkfs.ext2 -F binary-virtual.img
- ;;
-
- ext3)
- mkfs.ext3 -F binary-virtual.img
+ ext2|ext3|ext4)
+ mkfs.${LB_BINARTY_FILESYSTEM} . -F binary-virtual.img
;;
esac
fi
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index 5e61c3e84..ff14b431d 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -41,7 +41,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--apt-source-archives true|false]\n\
\t [-a|--architectures ARCHITECTURE]\n\
\t [-b|--binary-images iso|iso-hybrid|net|tar|usb-hdd]\n\
-\t [--binary-filesystem fat16|fat32|ext2]\n\
+\t [--binary-filesystem fat16|fat32|ext2|ext3|ext4]\n\
\t [--bootappend-install PARAMETER|\"PARAMETERS\"]\n\
\t [--bootappend-live PARAMETER|\"PARAMETERS\"]\n\
\t [--bootloader grub|syslinux|yaboot]\n\
@@ -55,7 +55,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--checksums md5|sha1|sha256|none]\n\
\t [--compression bzip2|gzip|lzip|none]\n\
\t [--build-with-chroot true|false]\n\
-\t [--chroot-filesystem ext2|ext3|squashfs|plain|jffs2]\n\
+\t [--chroot-filesystem ext2|ext3|ext4|squashfs|plain|jffs2]\n\
\t [--clean\n\
\t [-c|--conffile FILE]\n\
\t [--debconf-frontend dialog|editor|noninteractive|readline]\n\
diff --git a/scripts/build/lb_source_usb b/scripts/build/lb_source_usb
index 9a598e4f4..1ba7e44e6 100755
--- a/scripts/build/lb_source_usb
+++ b/scripts/build/lb_source_usb
@@ -75,7 +75,7 @@ then
fi
case "${LB_BINARY_FILESYSTEM}" in
- ext2|ext3)
+ ext2|ext3|ext4)
PARTITION_TYPE="ext2"
;;
@@ -98,7 +98,7 @@ Lodetach ${FREELO}
Losetup $FREELO source.img 1
case "${LB_BINARY_FILESYSTEM}" in
- ext2|ext3)
+ ext2|ext3|ext4)
MKFS="${LB_BINARY_FILESYSTEM}"
MKFS_OPTIONS="-L DEBIAN_LIVE -m 0"
;;
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