summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Klausen <klausenbusk@hotmail.com>2016-06-17 23:14:41 +0200
committerKristian Klausen <klausenbusk@hotmail.com>2016-06-18 19:36:16 +0200
commit489a09ba92328cef846598a15329e9ff91519e3c (patch)
treedd665d1b5aa1185361bd60ff7bf647a5ebc0fd88
parent5a981664ed77f4780d0e761ab59803861229767e (diff)
downloadvyos-live-build-489a09ba92328cef846598a15329e9ff91519e3c.tar.gz
vyos-live-build-489a09ba92328cef846598a15329e9ff91519e3c.zip
Disable EXT4 64bit features
e2fsprogs 1.43 enabled ext4 "64bit" feature as default, which broke ext4 HDD images as EXTLINUX doesn't support it.
-rwxr-xr-xscripts/build/binary_hdd2
-rwxr-xr-xscripts/build/source_hdd2
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/build/binary_hdd b/scripts/build/binary_hdd
index 616fc07d3..407901a2d 100755
--- a/scripts/build/binary_hdd
+++ b/scripts/build/binary_hdd
@@ -219,7 +219,7 @@ Losetup $FREELO chroot/binary.img 1
case "${LB_BINARY_FILESYSTEM}" in
ext2|ext3|ext4)
MKFS="${LB_BINARY_FILESYSTEM}"
- MKFS_OPTIONS="-L ${LB_HDD_LABEL} -m 0"
+ MKFS_OPTIONS="-L ${LB_HDD_LABEL} -m 0 -O ^64bit"
MOUNT_OPTIONS=""
;;
diff --git a/scripts/build/source_hdd b/scripts/build/source_hdd
index 978f02383..6788c011b 100755
--- a/scripts/build/source_hdd
+++ b/scripts/build/source_hdd
@@ -104,7 +104,7 @@ Losetup $FREELO ${LIVE_IMAGE_NAME}-source.img 1
case "${LB_BINARY_FILESYSTEM}" in
ext2|ext3|ext4)
MKFS="${LB_BINARY_FILESYSTEM}"
- MKFS_OPTIONS="-L ${LB_HDD_LABEL} -m 0"
+ MKFS_OPTIONS="-L ${LB_HDD_LABEL} -m 0 -O ^64bit"
MOUNT_OPTIONS=""
;;