TEST-40-NBD: relaxed check on ext3 filesystem options

onerror=continue does not seem to be displayed for new kernels
master
Harald Hoyer 2011-09-22 12:56:31 +02:00
parent a025cc17f0
commit 75e8f476e7
3 changed files with 4 additions and 2 deletions

View File

@ -5,6 +5,7 @@ while read dev fs fstype opts rest; do
[ "$dev" = "rootfs" ] && continue [ "$dev" = "rootfs" ] && continue
[ "$fs" != "/" ] && continue [ "$fs" != "/" ] && continue
echo "nbd-OK $fstype $opts" >/dev/sda echo "nbd-OK $fstype $opts" >/dev/sda
echo "nbd-OK $fstype $opts"
break break
done < /proc/mounts done < /proc/mounts
export TERM=linux export TERM=linux

View File

@ -14,6 +14,7 @@ lvm vgcreate dracut /dev/mapper/dracut_crypt_test && \
lvm lvcreate -l 100%FREE -n root dracut && \ lvm lvcreate -l 100%FREE -n root dracut && \
lvm vgchange -ay && \ lvm vgchange -ay && \
mke2fs -j /dev/dracut/root && \ mke2fs -j /dev/dracut/root && \
/sbin/tune2fs -e continue /dev/dracut/root && \
mkdir -p /sysroot && \ mkdir -p /sysroot && \
mount /dev/dracut/root /sysroot && \ mount /dev/dracut/root /sysroot && \
cp -a -t /sysroot /source/* && \ cp -a -t /sysroot /source/* && \

View File

@ -40,7 +40,7 @@ client_test() {
local found opts nbdinfo local found opts nbdinfo


[[ $fstype ]] || fstype=ext3 [[ $fstype ]] || fstype=ext3
[[ $fsopt ]] || fsopt="errors=continue" [[ $fsopt ]] || fsopt="ro"


echo "CLIENT TEST START: $test_name" echo "CLIENT TEST START: $test_name"


@ -198,7 +198,7 @@ make_encrypted_root() {
( (
initdir=overlay initdir=overlay
. $basedir/dracut-functions . $basedir/dracut-functions
dracut_install mke2fs poweroff cp umount dracut_install mke2fs poweroff cp umount tune2fs
inst_hook initqueue 01 ./create-root.sh inst_hook initqueue 01 ./create-root.sh
inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
) )