e2fsprogs has enabled metadata checksum by default on version 1.43.1

Old kernels can not mount these filesystems, so ignoring unsupported ext options on mounting.
algolia · Jul 9, 2018 · e17fa2c · e17fa2c
1 parent 21d9a38
commit e17fa2c
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 5 deletions.
diff --git a/build-vm b/build-vm
@@ -33,6 +33,8 @@ vm_img_tunefs_ext2='tune2fs -c 0'
 vm_img_mkfs_reiserfs='mkreiserfs -q -f'
 vm_img_mkfs_btrfs='mkfs.btrfs'
 vm_img_mkfs_xfs='mkfs.xfs -f'
+# ignore not backward compatible ext fs options like metadata_csum
+vm_linux_kernel_parameter="ext4.allow_unsupported=1"
 
 # guest visible devices
 VM_ROOTDEV=/dev/hda1

diff --git a/build-vm-ec2 b/build-vm-ec2
@@ -150,7 +150,7 @@ vm_fixup_ec2() {
 	echo ""                                                                               >> "$BUILD_ROOT/boot/grub/menu.lst"
 	echo "title default"                                                                  >> "$BUILD_ROOT/boot/grub/menu.lst"
 	echo "   root (hd0)"                                                                  >> "$BUILD_ROOT/boot/grub/menu.lst"
-	echo "   kernel /boot/vmlinuz root=/dev/sda1 xencons=xvc0 console=xvc0 splash=silent" >> "$BUILD_ROOT/boot/grub/menu.lst"
+	echo "   kernel /boot/vmlinuz root=/dev/sda1 xencons=xvc0 console=xvc0 splash=silent $vm_linux_kernel_parameter" >> "$BUILD_ROOT/boot/grub/menu.lst"
 	echo "   initrd /boot/initrd"                                                         >> "$BUILD_ROOT/boot/grub/menu.lst"
     fi
 }

diff --git a/build-vm-kvm b/build-vm-kvm
@@ -265,7 +265,7 @@ vm_startup_kvm() {
     if test -n "$VMDISK_MOUNT_OPTIONS" ; then
         qemu_append="$qemu_append rootflags=${VMDISK_MOUNT_OPTIONS#-o }"
     fi
-    qemu_append="$qemu_append panic=1 quiet no-kvmclock nmi_watchdog=0 rw rd.driver.pre=binfmt_misc elevator=noop console=$kvm_console init=$vm_init_script"
+    qemu_append="$qemu_append panic=1 quiet no-kvmclock nmi_watchdog=0 rw rd.driver.pre=binfmt_misc $vm_linux_kernel_parameter elevator=noop console=$kvm_console init=$vm_init_script"
     if test -z "$VM_NETOPT" -a -z "$VM_NETDEVOPT"; then
         kvm_options="$kvm_options -net none"
     fi

diff --git a/build-vm-pvm b/build-vm-pvm
@@ -187,7 +187,7 @@ insmod linux
 insmod disk
 insmod elf
 set root='ieee1275//vdevice/v-scsi@30000002/disk@8100000000000000,msdos2'
-linux /.build.kernel.kvm init=/.build/build console=hvc0 root=/dev/sda2 rw elevator=noop
+linux /.build.kernel.kvm init=/.build/build console=hvc0 root=/dev/sda2 rw elevator=noop $vm_linux_kernel_parameter
 initrd /.build.initrd.kvm
 boot
 EOF

diff --git a/build-vm-xen b/build-vm-xen
@@ -82,7 +82,7 @@ vm_startup_xen() {
 	XLDISK=
 	XLDISK="\"${XMROOT#disk=}\""
 	test -n "$XMSWAP" && XLDISK="$XLDISK, \"${XMSWAP#disk=}\""
-	set -- xl create -c $XEN_CONF_FILE name="\"build_$XENID\"" "disk=[ $XLDISK ]" extra=\""panic=1 quiet init="$vm_init_script" rd.driver.pre=binfmt_misc elevator=noop console=$VM_CONSOLE"\"
+	set -- xl create -c $XEN_CONF_FILE name="\"build_$XENID\"" "disk=[ $XLDISK ]" extra=\""panic=1 quiet init="$vm_init_script" rd.driver.pre=binfmt_misc $vm_linux_kernel_parameter elevator=noop console=$VM_CONSOLE"\"
     fi
     if test "$PERSONALITY" != 0 ; then
 	# have to switch back to PER_LINUX to make xm work

diff --git a/build-vm-zvm b/build-vm-zvm
@@ -25,7 +25,7 @@
 # lets go with the default parameters. However zvm_initrd will be a required parameter
 #zvm_kernel=/boot/image
 #zvm_initrd=/boot/initrd_worker
-zvm_param="root=/dev/disk/by-path/ccw-0.0.0150-part1 hvc_iucv=8 console=hvc0"
+zvm_param="root=/dev/disk/by-path/ccw-0.0.0150-part1 hvc_iucv=8 console=hvc0 $vm_linux_kernel_parameter"
 zvm_mult_pass="THR4ME"
 zvm_init_script="/.build/build"