-watchdog i6300esb -watchdog-action poweroff \
-append "panic=1 systemd.crash_reboot root=LABEL=dracut rw systemd.log_level=debug systemd.log_target=console rd.retry=3 rd.debug console=ttyS0,115200n81 rd.shell=0 $DEBUGFAIL" \
-initrd $TESTDIR/initramfs.testing || return 1
- grep -F -m 1 -q dracut-root-block-success $TESTDIR/result || return 1
+ grep -U --binary-files=binary -F -m 1 -q dracut-root-block-success $TESTDIR/result || return 1
}
test_setup() {
-drive format=raw,index=0,media=disk,file=$TESTDIR/root.ext3 \
-append "root=/dev/dracut/root rw rootfstype=ext3 quiet console=ttyS0,115200n81 selinux=0" \
-initrd $TESTDIR/initramfs.makeroot || return 1
- grep -F -m 1 -q dracut-root-block-created $TESTDIR/root.ext3 || return 1
+ grep -U --binary-files=binary -F -m 1 -q dracut-root-block-created $TESTDIR/root.ext3 || return 1
(
-drive format=raw,index=0,media=disk,file=$TESTDIR/root.ext3 \
-append "panic=1 systemd.crash_reboot root=LABEL=dracut rw loglevel=77 systemd.log_level=debug systemd.log_target=console rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 init=/sbin/init rd.shell=0 $DEBUGFAIL" \
-initrd $TESTDIR/initramfs.testing
- grep -F -m 1 -q dracut-root-block-success $TESTDIR/root.ext3 || return 1
+ grep -U --binary-files=binary -F -m 1 -q dracut-root-block-success $TESTDIR/root.ext3 || return 1
}
test_setup() {
-drive format=raw,index=0,media=disk,file=$TESTDIR/root.ext3 \
-append "root=/dev/fakeroot rw rootfstype=ext3 quiet console=ttyS0,115200n81 selinux=0" \
-initrd $TESTDIR/initramfs.makeroot || return 1
- grep -F -m 1 -q dracut-root-block-created $TESTDIR/root.ext3 || return 1
+ grep -U --binary-files=binary -F -m 1 -q dracut-root-block-created $TESTDIR/root.ext3 || return 1
(
-append "panic=1 systemd.crash_reboot root=LABEL=dracut $client_opts loglevel=7 rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.debug rd.shell=0 $DEBUGFAIL" \
-initrd $TESTDIR/initramfs.testing
- if ! grep -F -m 1 -q dracut-root-block-success $TESTDIR/result; then
+ if ! grep -U --binary-files=binary -F -m 1 -q dracut-root-block-success $TESTDIR/result; then
echo "CLIENT TEST END: $test_name [FAILED]"
return 1
fi
-drive format=raw,index=1,media=disk,file=$TESTDIR/usr.btrfs \
-append "root=/dev/dracut/root rw rootfstype=btrfs quiet console=ttyS0,115200n81 selinux=0" \
-initrd $TESTDIR/initramfs.makeroot || return 1
- if ! grep -F -m 1 -q dracut-root-block-created $TESTDIR/root.btrfs; then
+ if ! grep -U --binary-files=binary -F -m 1 -q dracut-root-block-created $TESTDIR/root.btrfs; then
echo "Could not create root filesystem"
return 1
fi
-append "panic=1 systemd.crash_reboot root=LABEL=dracut $client_opts rd.retry=3 console=ttyS0,115200n81 selinux=0 $DEBUGOUT rd.shell=0 $DEBUGFAIL" \
-initrd $TESTDIR/initramfs.testing
- if ! grep -F -m 1 -q dracut-root-block-success $TESTDIR/result; then
+ if ! grep -U --binary-files=binary -F -m 1 -q dracut-root-block-success $TESTDIR/result; then
echo "CLIENT TEST END: $test_name [FAILED]"
return 1
fi
-drive format=raw,index=2,media=disk,file=$TESTDIR/result \
-append "root=/dev/fakeroot rw rootfstype=btrfs quiet console=ttyS0,115200n81 selinux=0" \
-initrd $TESTDIR/initramfs.makeroot || return 1
- if ! grep -F -m 1 -q dracut-root-block-created $TESTDIR/result; then
+ if ! grep -U --binary-files=binary -F -m 1 -q dracut-root-block-created $TESTDIR/result; then
echo "Could not create root filesystem"
return 1
fi
-drive format=raw,index=0,media=disk,file=$DISKIMAGE \
-append "panic=1 systemd.crash_reboot root=/dev/dracut/root rd.auto rw rd.retry=10 console=ttyS0,115200n81 selinux=0 rd.shell=0 $DEBUGFAIL" \
-initrd $TESTDIR/initramfs.testing
- grep -F -m 1 -q dracut-root-block-success $DISKIMAGE || return 1
+ grep -U --binary-files=binary -F -m 1 -q dracut-root-block-success $DISKIMAGE || return 1
}
test_setup() {
-drive format=raw,index=0,media=disk,file=$DISKIMAGE \
-append "root=/dev/cannotreach rw rootfstype=ext2 console=ttyS0,115200n81 selinux=0" \
-initrd $TESTDIR/initramfs.makeroot || return 1
- grep -F -m 1 -q dracut-root-block-created $DISKIMAGE || return 1
+ grep -U --binary-files=binary -F -m 1 -q dracut-root-block-created $DISKIMAGE || return 1
eval $(grep -F -a -m 1 ID_FS_UUID $DISKIMAGE)
(
-drive format=raw,index=0,media=disk,file=$TESTDIR/root.ext2 \
-append "panic=1 systemd.crash_reboot root=/dev/dracut/root rw rd.auto=1 quiet rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.debug rd.shell=0 $DEBUGFAIL" \
-initrd $TESTDIR/initramfs.testing
- grep -F -m 1 -q dracut-root-block-success $TESTDIR/root.ext2 || return 1
+ grep -U --binary-files=binary -F -m 1 -q dracut-root-block-success $TESTDIR/root.ext2 || return 1
}
test_setup() {
$testdir/run-qemu -drive format=raw,index=0,media=disk,file=$TESTDIR/root.ext2 \
-append "root=/dev/fakeroot rw rootfstype=ext2 quiet console=ttyS0,115200n81 selinux=0" \
-initrd $TESTDIR/initramfs.makeroot || return 1
- grep -F -m 1 -q dracut-root-block-created $TESTDIR/root.ext2 || return 1
+ grep -U --binary-files=binary -F -m 1 -q dracut-root-block-created $TESTDIR/root.ext2 || return 1
(
export initdir=$TESTDIR/overlay
. $basedir/dracut-init.sh
-drive format=raw,index=3,media=disk,file=$TESTDIR/disk3.img.new \
-append "panic=1 systemd.crash_reboot $* systemd.log_target=kmsg root=LABEL=root rw rd.retry=10 rd.info console=ttyS0,115200n81 log_buf_len=2M selinux=0 rd.shell=0 $DEBUGFAIL " \
-initrd $TESTDIR/initramfs.testing
- if ! grep -F -m 1 -q dracut-root-block-success $TESTDIR/marker.img; then
+ if ! grep -U --binary-files=binary -F -m 1 -q dracut-root-block-success $TESTDIR/marker.img; then
echo "CLIENT TEST END: $@ [FAIL]"
return 1;
fi
-append "root=/dev/fakeroot rw rootfstype=ext2 quiet console=ttyS0,115200n81 selinux=0" \
-initrd $TESTDIR/initramfs.makeroot || return 1
- grep -F -m 1 -q dracut-root-block-created $TESTDIR/marker.img || return 1
+ grep -U --binary-files=binary -F -m 1 -q dracut-root-block-created $TESTDIR/marker.img || return 1
eval $(grep -F --binary-files=text -m 1 MD_UUID $TESTDIR/marker.img)
eval $(grep -F -a -m 1 ID_FS_UUID $TESTDIR/marker.img)
echo $ID_FS_UUID > $TESTDIR/luksuuid
-drive format=raw,index=1,media=disk,file=$TESTDIR/check-success.img \
-append "panic=1 systemd.crash_reboot root=/dev/dracut/root rw rd.auto rd.retry=20 console=ttyS0,115200n81 selinux=0 rd.debug rootwait $LUKSARGS rd.shell=0 $DEBUGFAIL" \
-initrd $TESTDIR/initramfs.testing
- grep -F -m 1 -q dracut-root-block-success $TESTDIR/check-success.img || return 1
+ grep -U --binary-files=binary -F -m 1 -q dracut-root-block-success $TESTDIR/check-success.img || return 1
echo "CLIENT TEST END: [OK]"
dd if=/dev/zero of=$TESTDIR/check-success.img bs=1M count=1
-drive format=raw,index=1,media=disk,file=$TESTDIR/check-success.img \
-append "panic=1 systemd.crash_reboot root=/dev/dracut/root rw quiet rd.auto rd.retry=20 rd.info console=ttyS0,115200n81 selinux=0 rd.debug $DEBUGFAIL" \
-initrd $TESTDIR/initramfs.testing
- grep -F -m 1 -q dracut-root-block-success $TESTDIR/check-success.img || return 1
+ grep -U --binary-files=binary -F -m 1 -q dracut-root-block-success $TESTDIR/check-success.img || return 1
echo "CLIENT TEST END: [OK]"
dd if=/dev/zero of=$TESTDIR/check-success.img bs=1M count=1
-drive format=raw,index=1,media=disk,file=$TESTDIR/check-success.img \
-append "panic=1 systemd.crash_reboot root=/dev/dracut/root rw quiet rd.auto rd.retry=10 rd.info console=ttyS0,115200n81 selinux=0 rd.debug $DEBUGFAIL rd.luks.uuid=failme" \
-initrd $TESTDIR/initramfs.testing
- grep -F -m 1 -q dracut-root-block-success $TESTDIR/check-success.img && return 1
+ grep -U --binary-files=binary -F -m 1 -q dracut-root-block-success $TESTDIR/check-success.img && return 1
echo "CLIENT TEST END: [OK]"
return 0
$testdir/run-qemu -drive format=raw,index=0,media=disk,file=$TESTDIR/root.ext2 \
-append "root=/dev/fakeroot rw rootfstype=ext2 quiet console=ttyS0,115200n81 selinux=0" \
-initrd $TESTDIR/initramfs.makeroot || return 1
- grep -F -m 1 -q dracut-root-block-created $TESTDIR/root.ext2 || return 1
+ grep -U --binary-files=binary -F -m 1 -q dracut-root-block-created $TESTDIR/root.ext2 || return 1
cryptoUUIDS=$(grep -F --binary-files=text -m 3 ID_FS_UUID $TESTDIR/root.ext2)
for uuid in $cryptoUUIDS; do
eval $uuid
-append "panic=1 systemd.crash_reboot $* root=LABEL=root rw debug rd.retry=5 rd.debug console=ttyS0,115200n81 selinux=0 rd.info rd.shell=0 $DEBUGFAIL" \
-initrd $TESTDIR/initramfs.testing
- if ! grep -F -m 1 -q dracut-root-block-success $TESTDIR/marker.img; then
+ if ! grep -U --binary-files=binary -F -m 1 -q dracut-root-block-success $TESTDIR/marker.img; then
echo "CLIENT TEST END: $@ [FAIL]"
return 1;
fi
-drive format=raw,index=2,media=disk,file=$TESTDIR/disk2 \
-append "root=/dev/dracut/root rw rootfstype=ext2 quiet console=ttyS0,115200n81 selinux=0" \
-initrd $TESTDIR/initramfs.makeroot || return 1
- grep -F -m 1 -q dracut-root-block-created $TESTDIR/marker.img || return 1
+ grep -U --binary-files=binary -F -m 1 -q dracut-root-block-created $TESTDIR/marker.img || return 1
eval $(grep -F --binary-files=text -m 1 MD_UUID $TESTDIR/marker.img)
if [[ -z $MD_UUID ]]; then
-drive format=raw,index=1,media=disk,file=$DISKIMAGE \
-append "panic=1 systemd.crash_reboot root=LABEL=root rw rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.shell=0 $DEBUGFAIL" \
-initrd $TESTDIR/initramfs.testing
- grep -F -m 1 -q dracut-root-block-success $MARKER_DISKIMAGE || return 1
+ grep -U --binary-files=binary -F -m 1 -q dracut-root-block-success $MARKER_DISKIMAGE || return 1
}
test_setup() {
-append "root=/dev/fakeroot rw quiet console=ttyS0,115200n81 selinux=0" \
-initrd $TESTDIR/initramfs.makeroot || return 1
- dd if=$DISKIMAGE bs=512 count=4 skip=2048 | grep -F -m 1 -q dracut-root-block-created || return 1
+ dd if=$DISKIMAGE bs=512 count=4 skip=2048 | grep -U --binary-files=binary -F -m 1 -q dracut-root-block-created || return 1
(
export initdir=$TESTDIR/overlay
# -append "root=live:CDLABEL=LiveCD live quiet rhgb selinux=0 rd.live.check" \
# -initrd "$TESTDIR"/initramfs.testing
- grep -F -m 1 -q dracut-root-block-success -- "$TESTDIR"/root.img || return 1
+ grep -U --binary-files=binary -F -m 1 -q dracut-root-block-success -- "$TESTDIR"/root.img || return 1
}
test_setup() {
-drive format=raw,index=0,media=disk,file=$TESTDIR/root.ext2 \
-append "panic=1 systemd.crash_reboot root=/dev/dracut/root rw rd.auto=1 quiet rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.debug rd.shell=0 $DEBUGFAIL" \
-initrd $TESTDIR/initramfs.testing
- grep -F -m 1 -q dracut-root-block-success $TESTDIR/root.ext2 || return 1
+ grep -U --binary-files=binary -F -m 1 -q dracut-root-block-success $TESTDIR/root.ext2 || return 1
}
test_setup() {
$testdir/run-qemu -drive format=raw,index=0,media=disk,file=$TESTDIR/root.ext2 \
-append "root=/dev/fakeroot rw rootfstype=ext2 quiet console=ttyS0,115200n81 selinux=0" \
-initrd $TESTDIR/initramfs.makeroot || return 1
- grep -F -m 1 -q dracut-root-block-created $TESTDIR/root.ext2 || return 1
+ grep -U --binary-files=binary -F -m 1 -q dracut-root-block-created $TESTDIR/root.ext2 || return 1
(
export initdir=$TESTDIR/overlay
. $basedir/dracut-init.sh
-append "rd.net.timeout.dhcp=3 panic=1 systemd.crash_reboot rd.shell=0 $cmdline $DEBUGFAIL rd.retry=10 quiet ro console=ttyS0,115200n81 selinux=0" \
-initrd $TESTDIR/initramfs.testing
- if [[ $? -ne 0 ]] || ! grep -F -m 1 -q nfs-OK $TESTDIR/client.img; then
+ if [[ $? -ne 0 ]] || ! grep -U --binary-files=binary -F -m 1 -q nfs-OK $TESTDIR/client.img; then
echo "CLIENT TEST END: $test_name [FAILED - BAD EXIT]"
return 1
fi
-drive format=raw,index=0,media=disk,file=$TESTDIR/server.ext3 \
-append "root=/dev/dracut/root rw rootfstype=ext3 quiet console=ttyS0,115200n81 selinux=0" \
-initrd $TESTDIR/initramfs.makeroot || return 1
- grep -F -m 1 -q dracut-root-block-created $TESTDIR/server.ext3 || return 1
+ grep -U --binary-files=binary -F -m 1 -q dracut-root-block-created $TESTDIR/server.ext3 || return 1
-acpitable file=ibft.table \
-append "panic=1 systemd.crash_reboot rw rd.auto rd.retry=50 console=ttyS0,115200n81 selinux=0 rd.debug=0 rd.shell=0 $DEBUGFAIL $*" \
-initrd $TESTDIR/initramfs.testing
- if ! grep -F -m 1 -q iscsi-OK $TESTDIR/client.img; then
+ if ! grep -U --binary-files=binary -F -m 1 -q iscsi-OK $TESTDIR/client.img; then
echo "CLIENT TEST END: $test_name [FAILED - BAD EXIT]"
return 1
fi
-drive format=raw,index=3,media=disk,file=$TESTDIR/iscsidisk3.img \
-append "root=/dev/fakeroot rw rootfstype=ext3 quiet console=ttyS0,115200n81 selinux=0" \
-initrd $TESTDIR/initramfs.makeroot || return 1
- grep -F -m 1 -q dracut-root-block-created $TESTDIR/client.img || return 1
+ grep -U --binary-files=binary -F -m 1 -q dracut-root-block-created $TESTDIR/client.img || return 1
rm -- $TESTDIR/client.img
rm -rf -- $TESTDIR/overlay
-drive format=raw,index=0,media=disk,file=$TESTDIR/server.ext3 \
-append "root=/dev/dracut/root rw rootfstype=ext3 quiet console=ttyS0,115200n81 selinux=0" \
-initrd $TESTDIR/initramfs.makeroot || return 1
- grep -F -m 1 -q dracut-root-block-created $TESTDIR/server.ext3 || return 1
+ grep -U --binary-files=binary -F -m 1 -q dracut-root-block-created $TESTDIR/server.ext3 || return 1
rm -rf -- $TESTDIR/overlay
# Make an overlay with needed tools for the test harness
-net socket,connect=127.0.0.1:12331 \
-append "panic=1 systemd.crash_reboot rw rd.auto rd.retry=50 console=ttyS0,115200n81 selinux=0 rd.debug=0 rd.shell=0 $DEBUGFAIL $*" \
-initrd $TESTDIR/initramfs.testing
- if ! grep -F -m 1 -q iscsi-OK $TESTDIR/client.img; then
+ if ! grep -U --binary-files=binary -F -m 1 -q iscsi-OK $TESTDIR/client.img; then
echo "CLIENT TEST END: $test_name [FAILED - BAD EXIT]"
return 1
fi
-drive format=raw,index=3,media=disk,file=$TESTDIR/iscsidisk3.img \
-append "root=/dev/fakeroot rw rootfstype=ext3 quiet console=ttyS0,115200n81 selinux=0" \
-initrd $TESTDIR/initramfs.makeroot || return 1
- grep -F -m 1 -q dracut-root-block-created $TESTDIR/client.img || return 1
+ grep -U --binary-files=binary -F -m 1 -q dracut-root-block-created $TESTDIR/client.img || return 1
rm -- $TESTDIR/client.img
# Make server root
-drive format=raw,index=0,media=disk,file=$TESTDIR/server.ext3 \
-append "root=/dev/dracut/root rw rootfstype=ext3 quiet console=ttyS0,115200n81 selinux=0" \
-initrd $TESTDIR/initramfs.makeroot || return 1
- grep -F -m 1 -q dracut-root-block-created $TESTDIR/server.ext3 || return 1
+ grep -U --binary-files=binary -F -m 1 -q dracut-root-block-created $TESTDIR/server.ext3 || return 1
rm -rf -- $TESTDIR/overlay
# Make an overlay with needed tools for the test harness
-append "panic=1 systemd.crash_reboot rd.shell=0 $cmdline $DEBUGFAIL rd.auto rd.info rd.retry=10 ro console=ttyS0,115200n81 selinux=0 " \
-initrd $TESTDIR/initramfs.testing
- if [[ $? -ne 0 ]] || ! grep -F -m 1 -q nbd-OK $TESTDIR/flag.img; then
+ if [[ $? -ne 0 ]] || ! grep -U --binary-files=binary -F -m 1 -q nbd-OK $TESTDIR/flag.img; then
echo "CLIENT TEST END: $test_name [FAILED - BAD EXIT]"
return 1
fi
-drive format=raw,index=1,media=disk,file=$TESTDIR/flag.img \
-append "root=/dev/fakeroot rw quiet console=ttyS0,115200n81 selinux=0" \
-initrd $TESTDIR/initramfs.makeroot || return 1
- grep -F -m 1 -q dracut-root-block-created $TESTDIR/flag.img || return 1
+ grep -U --binary-files=binary -F -m 1 -q dracut-root-block-created $TESTDIR/flag.img || return 1
grep -F -a -m 1 ID_FS_UUID $TESTDIR/flag.img > $TESTDIR/luks.uuid
}
-drive format=raw,index=1,media=disk,file=$TESTDIR/flag.img \
-append "root=/dev/dracut/root rw rootfstype=ext3 quiet console=ttyS0,115200n81 selinux=0" \
-initrd $TESTDIR/initramfs.makeroot || return 1
- grep -F -m 1 -q dracut-root-block-created $TESTDIR/flag.img || return 1
+ grep -U --binary-files=binary -F -m 1 -q dracut-root-block-created $TESTDIR/flag.img || return 1
rm -fr "$TESTDIR"/overlay
}
-drive format=raw,index=1,media=disk,file=$TESTDIR/flag.img \
-append "root=/dev/dracut/root rw rootfstype=ext3 quiet console=ttyS0,115200n81 selinux=0" \
-initrd $TESTDIR/initramfs.makeroot || return 1
- grep -F -m 1 -q dracut-root-block-created $TESTDIR/flag.img || return 1
+ grep -U --binary-files=binary -F -m 1 -q dracut-root-block-created $TESTDIR/flag.img || return 1
rm -fr "$TESTDIR"/overlay
}
-drive format=raw,index=0,media=disk,file=$TESTDIR/server.ext3 \
-append "root=/dev/dracut/root rw rootfstype=ext3 quiet console=ttyS0,115200n81 selinux=0" \
-initrd $TESTDIR/initramfs.makeroot || return 1
- grep -F -m 1 -q dracut-root-block-created $TESTDIR/server.ext3 || return 1
+ grep -U --binary-files=binary -F -m 1 -q dracut-root-block-created $TESTDIR/server.ext3 || return 1
rm -fr "$TESTDIR"/overlay
# Make an overlay with needed tools for the test harness
-drive format=raw,index=0,media=disk,file=$TESTDIR/server.ext3 \
-append "root=/dev/dracut/root rw rootfstype=ext3 quiet console=ttyS0,115200n81 selinux=0" \
-initrd $TESTDIR/initramfs.makeroot || return 1
- grep -F -m 1 -q dracut-root-block-created $TESTDIR/server.ext3 || return 1
+ grep -U --binary-files=binary -F -m 1 -q dracut-root-block-created $TESTDIR/server.ext3 || return 1
rm -fr "$TESTDIR"/overlay
# Make an overlay with needed tools for the test harness