diff options
| author | Harald Hoyer <harald@redhat.com> | 2013-06-28 10:31:18 +0200 |
|---|---|---|
| committer | Harald Hoyer <harald@redhat.com> | 2013-06-28 10:31:18 +0200 |
| commit | 32bd2fbb4c8f1d3e1951d75f32c080d4b42c49a4 (patch) | |
| tree | 77496ecfc6b5a08e5b61e7a892185e319d4f7a4d /test/TEST-30-ISCSI | |
| parent | 1d84d6940e5242220bc478647c56aae02c4263d3 (diff) | |
| download | dracut-32bd2fbb4c8f1d3e1951d75f32c080d4b42c49a4.tar.gz dracut-32bd2fbb4c8f1d3e1951d75f32c080d4b42c49a4.tar.bz2 dracut-32bd2fbb4c8f1d3e1951d75f32c080d4b42c49a4.zip | |
use "rm --" to guard against filenames beginning with "-"
Diffstat (limited to 'test/TEST-30-ISCSI')
| -rwxr-xr-x | test/TEST-30-ISCSI/create-root.sh | 2 | ||||
| -rwxr-xr-x | test/TEST-30-ISCSI/test.sh | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/test/TEST-30-ISCSI/create-root.sh b/test/TEST-30-ISCSI/create-root.sh index d91e5b87..2a4b920e 100755 --- a/test/TEST-30-ISCSI/create-root.sh +++ b/test/TEST-30-ISCSI/create-root.sh @@ -3,7 +3,7 @@ for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do > "/etc/udev/rules.d/$x" done -rm /etc/lvm/lvm.conf +rm -f -- /etc/lvm/lvm.conf udevadm control --reload mkfs.ext3 -j -F /dev/sda && \ mkdir -p /sysroot && \ diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh index 990f7baf..df998ffe 100755 --- a/test/TEST-30-ISCSI/test.sh +++ b/test/TEST-30-ISCSI/test.sh @@ -84,7 +84,7 @@ test_run() { ret=$? if [[ -s $TESTDIR/server.pid ]]; then sudo kill -TERM $(cat $TESTDIR/server.pid) - rm -f $TESTDIR/server.pid + rm -f -- $TESTDIR/server.pid fi return $ret } @@ -135,7 +135,7 @@ test_setup() { -m "dash crypt lvm mdraid udev-rules base rootfs-block kernel-modules" \ -d "piix ide-gd_mod ata_piix ext3 sd_mod" \ -f $TESTDIR/initramfs.makeroot $KVERSION || return 1 - rm -rf $TESTDIR/overlay + rm -rf -- $TESTDIR/overlay # Need this so kvm-qemu will boot (needs non-/dev/zero local disk) @@ -154,7 +154,7 @@ test_setup() { -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 - rm $TESTDIR/client.img + rm -- $TESTDIR/client.img ( export initdir=$TESTDIR/overlay . $basedir/dracut-functions.sh @@ -210,7 +210,7 @@ test_setup() { ) sudo umount $TESTDIR/mnt - rm -fr $TESTDIR/mnt + rm -fr -- $TESTDIR/mnt # Make server's dracut image $basedir/dracut.sh -l -i $TESTDIR/overlay / \ @@ -223,7 +223,7 @@ test_setup() { test_cleanup() { if [[ -s $TESTDIR/server.pid ]]; then sudo kill -TERM $(cat $TESTDIR/server.pid) - rm -f $TESTDIR/server.pid + rm -f -- $TESTDIR/server.pid fi } |