use "rm --" to guard against filenames beginning with "-"

diff --git a/50-dracut.install b/50-dracut.install
index 6b63da93fbf6a34e8d2ec99de4bf490902a1f0e4..a0623a1c380882f404d042deb9afefbe2b399800 100755 (executable)
--- a/50-dracut.install
+++ b/50-dracut.install
@@ -26,7 +26,7 @@ case "$1" in
         ret=$?
        ;;
     remove)
-        rm -f "$3"/initrd
+        rm -f -- "$3"/initrd
         ret=$?
        ;;
 esac

diff --git a/Makefile b/Makefile
index d383acf7447ed5f632cb43fa6812e016678a22b2..d2cd89e35333cde9bae790eb6bb57d4424943a40 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -82,7 +82,7 @@ dracut.html: dracut.asc $(manpages)
                --stringparam html.stylesheet \
                http://docs.fedoraproject.org/en-US/Common_Content/css/default.css \
                http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl dracut.xml
-       rm dracut.xml
+       rm -f -- dracut.xml
 
 install: dracut-version.sh
        mkdir -p $(DESTDIR)$(pkglibdir)
@@ -164,9 +164,9 @@ dracut-$(VERSION).tar.bz2: doc
        mkdir -p dracut-$(VERSION)
        for i in $(manpages) dracut.html dracut-version.sh; do [ "$${i%/*}" != "$$i" ] && mkdir -p "dracut-$(VERSION)/$${i%/*}"; cp "$$i" "dracut-$(VERSION)/$$i"; done
        tar --owner=root --group=root -rf dracut-$(VERSION).tar $$(find dracut-$(VERSION) -type f)
-       rm -fr dracut-$(VERSION).tar.bz2 dracut-$(VERSION)
+       rm -fr -- dracut-$(VERSION).tar.bz2 dracut-$(VERSION)
        bzip2 -9 dracut-$(VERSION).tar
-       rm -f dracut-$(VERSION).tar
+       rm -f -- dracut-$(VERSION).tar
 
 rpm: dracut-$(VERSION).tar.bz2
        rpmbuild=$$(mktemp -d -t rpmbuild-dracut.XXXXXX); src=$$(pwd); \
@@ -175,7 +175,7 @@ rpm: dracut-$(VERSION).tar.bz2
        (cd "$$rpmbuild"; rpmbuild --define "_topdir $$PWD" --define "_sourcedir $$PWD" \
                --define "_specdir $$PWD" --define "_srcrpmdir $$PWD" \
                --define "_rpmdir $$PWD" -ba dracut.spec; ) && \
-       ( mv "$$rpmbuild"/$$(arch)/*.rpm .; mv "$$rpmbuild"/*.src.rpm .;rm -fr "$$rpmbuild"; ls *.rpm )
+       ( mv "$$rpmbuild"/$$(arch)/*.rpm .; mv "$$rpmbuild"/*.src.rpm .;rm -fr -- "$$rpmbuild"; ls *.rpm )
 
 syncheck:
        @ret=0;for i in dracut-initramfs-restore.sh modules.d/*/*.sh; do \

diff --git a/dracut-functions.sh b/dracut-functions.sh
index 7ecd5519a989814ab8bec20ab66728aa271189f8..6b835d6b6ea8d40eca4e57ac44aa69e065dfef96 100755 (executable)
--- a/dracut-functions.sh
+++ b/dracut-functions.sh
@@ -1508,7 +1508,7 @@ dracut_kernel_post() {
         exit 1
     fi
 
-    [[ $DRACUT_KERNEL_LAZY_HASHDIR ]] && rm -fr "$DRACUT_KERNEL_LAZY_HASHDIR"
+    [[ $DRACUT_KERNEL_LAZY_HASHDIR ]] && rm -fr -- "$DRACUT_KERNEL_LAZY_HASHDIR"
 }
 
 module_is_host_only() (

diff --git a/dracut-initramfs-restore.sh b/dracut-initramfs-restore.sh
index 33ae6bdb4d8e1cf5b4658f830061f718badbaf0d..ec5fe180f427d81a55c25bf08bd8e61cd0680d00 100644 (file)
--- a/dracut-initramfs-restore.sh
+++ b/dracut-initramfs-restore.sh
@@ -17,13 +17,13 @@ cd /run/initramfs
 
 [ -f .need_shutdown -a -f "$IMG" ] || exit 1
 if zcat "$IMG"  | cpio -id --quiet >/dev/null; then
-    rm .need_shutdown
+    rm -f -- .need_shutdown
 elif xzcat "$IMG"  | cpio -id --quiet >/dev/null; then
-    rm .need_shutdown
+    rm -f -- .need_shutdown
 else
     # something failed, so we clean up
     echo "Unpacking of $IMG to /run/initramfs failed" >&2
-    rm -f /run/initramfs/shutdown
+    rm -f -- /run/initramfs/shutdown
     exit 1
 fi
 

diff --git a/dracut.sh b/dracut.sh
index 42a261e34d2d034c53c00ca60fef98e2b04a04d4..d6b42e8699acef50941b44382bb40b9004edac5b 100755 (executable)
--- a/dracut.sh
+++ b/dracut.sh
@@ -661,7 +661,7 @@ readonly initdir=$(mktemp --tmpdir="$TMPDIR/" -d -t initramfs.XXXXXX)
 }
 
 # clean up after ourselves no matter how we die.
-trap 'ret=$?;[[ $outfile ]] && [[ -f $outfile.$$ ]] && rm -f "$outfile.$$";[[ $keep ]] && echo "Not removing $initdir." >&2 || { [[ $initdir ]] && rm -rf "$initdir";exit $ret; };' EXIT
+trap 'ret=$?;[[ $outfile ]] && [[ -f $outfile.$$ ]] && rm -f -- "$outfile.$$";[[ $keep ]] && echo "Not removing $initdir." >&2 || { [[ $initdir ]] && rm -rf -- "$initdir";exit $ret; };' EXIT
 # clean up after ourselves no matter how we die.
 trap 'exit 1;' SIGINT
 
@@ -682,7 +682,7 @@ if ! $DRACUT_INSTALL ${initdir+-D "$initdir"} -R "$initdir/bin/sh" &>/dev/null;
     unset DRACUT_RESOLVE_LAZY
     export DRACUT_RESOLVE_DEPS=1
 fi
-rm -fr ${initdir}/*
+rm -fr -- ${initdir}/*
 
 if [[ -f $dracutbasedir/dracut-version.sh ]]; then
     . $dracutbasedir/dracut-version.sh
@@ -1153,8 +1153,8 @@ if [[ $UID = 0 ]] && [[ $PRELINK_BIN ]]; then
         dinfo "*** Pre-linking files ***"
         dracut_install -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf
         chroot "$initdir" $PRELINK_BIN -a
-        rm -f "$initdir"/$PRELINK_BIN
-        rm -fr "$initdir"/etc/prelink.*
+        rm -f -- "$initdir"/$PRELINK_BIN
+        rm -fr -- "$initdir"/etc/prelink.*
         dinfo "*** Pre-linking files done ***"
     fi
 fi
@@ -1205,7 +1205,7 @@ if [[ $do_strip = yes ]] ; then
     dinfo "*** Stripping files done ***"
 fi
 
-rm -f "$outfile"
+rm -f -- "$outfile"
 dinfo "*** Creating image file ***"
 if ! ( umask 077; cd "$initdir"; find . |cpio -R 0:0 -H newc -o --quiet| \
     $compress > "$outfile.$$"; ); then

diff --git a/dracut.spec b/dracut.spec
index 922474a09da2b56eecb563ae09e7160a5fb2f5d4..42a245cbf687eda514a7af3f0754ecf8d23f4e5e 100644 (file)
--- a/dracut.spec
+++ b/dracut.spec
@@ -202,7 +202,7 @@ make %{?_smp_mflags}
 
 %install
 %if 0%{?fedora} || 0%{?rhel}
-rm -rf $RPM_BUILD_ROOT
+rm -rf -- $RPM_BUILD_ROOT
 %endif
 make %{?_smp_mflags} install \
      DESTDIR=$RPM_BUILD_ROOT \
@@ -211,26 +211,26 @@ make %{?_smp_mflags} install \
 echo "DRACUT_VERSION=%{version}-%{release}" > $RPM_BUILD_ROOT/%{dracutlibdir}/dracut-version.sh
 
 %if 0%{?fedora} == 0 && 0%{?rhel} == 0 && 0%{?suse_version} == 0
-rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/01fips
-rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/02fips-aesni
+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/01fips
+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/02fips-aesni
 %endif
 
 %if %{defined _unitdir}
 # for systemd, better use systemd-bootchart
-rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/00bootchart
+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/00bootchart
 %endif
 
 # we do not support dash in the initramfs
-rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/00dash
+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/00dash
 
 # remove gentoo specific modules
-rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/50gensplash
+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/50gensplash
 
 %if %{defined _unitdir}
 # with systemd IMA and selinux modules do not make sense
-rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/96securityfs
-rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/97masterkey
-rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/98integrity
+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/96securityfs
+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/97masterkey
+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/98integrity
 %endif
 
 mkdir -p $RPM_BUILD_ROOT/boot/dracut
@@ -249,8 +249,8 @@ install -m 0644 dracut.conf.d/suse.conf.example   $RPM_BUILD_ROOT%{dracutlibdir}
 %endif
 
 %if 0%{?fedora} <= 12 && 0%{?rhel} < 6 && 0%{?suse_version} <= 9999
-rm $RPM_BUILD_ROOT%{_bindir}/mkinitrd
-rm $RPM_BUILD_ROOT%{_bindir}/lsinitrd
+rm -f -- $RPM_BUILD_ROOT%{_bindir}/mkinitrd
+rm -f -- $RPM_BUILD_ROOT%{_bindir}/lsinitrd
 %endif
 
 %if 0%{?fedora} || 0%{?rhel} > 6
@@ -270,7 +270,7 @@ mkdir -p $RPM_BUILD_ROOT/sbin
 ln -s /usr/bin/dracut $RPM_BUILD_ROOT/sbin/dracut
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf -- $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,0755)

diff --git a/modules.d/01fips/fips-boot.sh b/modules.d/01fips/fips-boot.sh
index a2f64ecb565874325b2625866f04c0f926bd73f6..d3a3d1e8f2835cb3f97ec48a78791c1c6d71b364 100755 (executable)
--- a/modules.d/01fips/fips-boot.sh
+++ b/modules.d/01fips/fips-boot.sh
@@ -3,7 +3,7 @@
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
 if ! fipsmode=$(getarg fips) || [ $fipsmode = "0" ]; then
-    rm -f /etc/modprobe.d/fips.conf >/dev/null 2>&1
+    rm -f -- /etc/modprobe.d/fips.conf >/dev/null 2>&1
 elif getarg boot= >/dev/null; then
     . /sbin/fips.sh
     if mount_boot; then

diff --git a/modules.d/01fips/fips-noboot.sh b/modules.d/01fips/fips-noboot.sh
index 8c4ac0bb78e6dbceb7d6a87263eaed01fc8af7e4..e7208cd37873bfaf825384efb9be3427d54f9e82 100755 (executable)
--- a/modules.d/01fips/fips-noboot.sh
+++ b/modules.d/01fips/fips-noboot.sh
@@ -3,7 +3,7 @@
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
 if ! fipsmode=$(getarg fips) || [ $fipsmode = "0" ]; then
-    rm -f /etc/modprobe.d/fips.conf >/dev/null 2>&1
+    rm -f -- /etc/modprobe.d/fips.conf >/dev/null 2>&1
 elif ! [ -f /tmp/fipsdone ]; then
     . /sbin/fips.sh
     mount_boot

diff --git a/modules.d/01fips/fips.sh b/modules.d/01fips/fips.sh
index 0095416abc2868eba42334273f68f8a0a18c45ae..2ec2152bd7f314d38fd08ae61bd5ba42d757d289 100755 (executable)
--- a/modules.d/01fips/fips.sh
+++ b/modules.d/01fips/fips.sh
@@ -44,7 +44,7 @@ mount_boot()
         info "Mounting $boot as /boot"
         mount -oro "$boot" /boot || return 1
     elif [ -d "$NEWROOT/boot" ]; then
-        rm -fr /boot
+        rm -fr -- /boot
         ln -sf "$NEWROOT/boot" /boot
     fi
 }

diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh
index 195364c2f0790a037f92d3ea343e55d35c3b2be4..a91b5806c8f6387bcf948c9ef18e6b3cce62f1fb 100755 (executable)
--- a/modules.d/10i18n/module-setup.sh
+++ b/modules.d/10i18n/module-setup.sh
@@ -102,7 +102,7 @@ install() {
         done
 
         # remove unnecessary files
-        rm -f "${initdir}${kbddir}/consoletrans/utflist"
+        rm -f -- "${initdir}${kbddir}/consoletrans/utflist"
         find "${initdir}${kbddir}/" -name README\* -delete
         find "${initdir}${kbddir}/" -name '*.gz' -print -quit \
             | while read line; do

diff --git a/modules.d/10i18n/parse-i18n.sh b/modules.d/10i18n/parse-i18n.sh
index 942719476f37543fe168c7e9931fc912b45d4964..348c5bc83360e134c0d95af6ce155363c05a7c9c 100755 (executable)
--- a/modules.d/10i18n/parse-i18n.sh
+++ b/modules.d/10i18n/parse-i18n.sh
@@ -36,7 +36,7 @@ if [ -f /etc/locale.conf ]; then
 fi
 
 if [ -n "$DRACUT_SYSTEMD" ]; then
-    rm -f /etc/udev/rules.d/10-console.rules
-    rm -f /lib/udev/rules.d/10-console.rules
-    rm -f /lib/udev/console_init
+    rm -f -- /etc/udev/rules.d/10-console.rules
+    rm -f -- /lib/udev/rules.d/10-console.rules
+    rm -f -- /lib/udev/console_init
 fi

diff --git a/modules.d/30convertfs/convertfs.sh b/modules.d/30convertfs/convertfs.sh
index 137664a830f60fc454740b8000e85b178f13591e..d717c69f71d474b573e8a90a15baf675898d8bd2 100755 (executable)
--- a/modules.d/30convertfs/convertfs.sh
+++ b/modules.d/30convertfs/convertfs.sh
@@ -56,22 +56,22 @@ if ! needconvert; then
 fi
 
 testfile="$ROOT/.usrmovecheck$$"
-rm -f "$testfile"
+rm -f -- "$testfile"
 > "$testfile"
 if [[ ! -e "$testfile" ]]; then
     echo "Cannot write to $ROOT/"
     exit 1
 fi
-rm -f "$testfile"
+rm -f -- "$testfile"
 
 testfile="$ROOT/usr/.usrmovecheck$$"
-rm -f "$testfile"
+rm -f -- "$testfile"
 > "$testfile"
 if [[ ! -e "$testfile" ]]; then
     echo "Cannot write to $ROOT/usr/"
     exit 1
 fi
-rm -f "$testfile"
+rm -f -- "$testfile"
 
 find_mount() {
     local dev mnt etc wanted_dev
@@ -108,11 +108,11 @@ cleanup() {
     for dir in "$ROOT/bin" "$ROOT/sbin" "$ROOT/lib" "$ROOT/lib64" \
        "$ROOT/usr/bin" "$ROOT/usr/sbin" "$ROOT/usr/lib" \
         "$ROOT/usr/lib64"; do
-        [[ -d "${dir}.usrmove-new" ]] && rm -fr "${dir}.usrmove-new"
+        [[ -d "${dir}.usrmove-new" ]] && rm -fr -- "${dir}.usrmove-new"
         if [[ -d "${dir}.usrmove-old" ]]; then
             mv "$dir" "${dir}.del~"
             mv "${dir}.usrmove-old" "$dir"
-            rm -fr "${dir}.del~"
+            rm -fr -- "${dir}.del~"
         fi
     done
 }
@@ -126,7 +126,7 @@ set -e
 
 # merge / and /usr in new dir in /usr
 for dir in bin sbin lib lib64; do
-    rm -rf "$ROOT/usr/${dir}.usrmove-new"
+    rm -rf -- "$ROOT/usr/${dir}.usrmove-new"
     [[ -L "$ROOT/$dir" ]] && continue
     [[ -d "$ROOT/$dir" ]] || continue
     echo "Make a copy of \`$ROOT/usr/$dir'."
@@ -150,7 +150,7 @@ done
 for dir in bin sbin lib lib64; do
     [[ -d "$ROOT/usr/${dir}.usrmove-new" ]] || continue
     echo "Switch to new \`$ROOT/usr/$dir'."
-    rm -fr "$ROOT/usr/${dir}.usrmove-old"
+    rm -fr -- "$ROOT/usr/${dir}.usrmove-old"
     mv "$ROOT/usr/$dir" "$ROOT/usr/${dir}.usrmove-old"
     mv "$ROOT/usr/${dir}.usrmove-new" "$ROOT/usr/$dir"
 done
@@ -160,7 +160,7 @@ for dir in bin sbin lib lib64; do
     [[ -L "$ROOT/$dir" ]] && continue
     [[ -d "$ROOT/$dir" ]] || continue
     echo "Create \`$ROOT/$dir' symlink."
-    rm -rf "$ROOT/${dir}.usrmove-old" || :
+    rm -fr -- "$ROOT/${dir}.usrmove-old" || :
     mv "$ROOT/$dir" "$ROOT/${dir}.usrmove-old"
     ln -sfn usr/$dir "$ROOT/$dir"
 done
@@ -178,9 +178,9 @@ done
 
 for dir in bin sbin lib lib64; do
     [[ -d "$ROOT/usr/${dir}.usrmove-old~" ]] \
-        && rm -rf "$ROOT/usr/${dir}.usrmove-old~" || :
+        && rm -rf -- "$ROOT/usr/${dir}.usrmove-old~" || :
     [[ -d "$ROOT/${dir}.usrmove-old~" ]] \
-        && rm -rf "$ROOT/${dir}.usrmove-old~" || :
+        && rm -rf -- "$ROOT/${dir}.usrmove-old~" || :
 done
 
 for dir in lib lib64; do

diff --git a/modules.d/40network/dhclient-script.sh b/modules.d/40network/dhclient-script.sh
index 8887add6476bf5622498033335c001e424557058..0124c06ec17b64c1b672082d966d24132f65aff9 100755 (executable)
--- a/modules.d/40network/dhclient-script.sh
+++ b/modules.d/40network/dhclient-script.sh
@@ -89,7 +89,7 @@ case $reason in
             [ -e /tmp/net.$netif.manualup ] || echo "/sbin/netroot $netif"
             echo "> /tmp/setup_net_$netif.ok"
             echo "> /tmp/setup_net_\$(cat /sys/class/net/$netif/address).ok"
-            echo "rm -f $hookdir/initqueue/setup_net_$netif.sh"
+            echo "rm -f -- $hookdir/initqueue/setup_net_$netif.sh"
         } > $hookdir/initqueue/setup_net_$netif.sh
 
         echo "[ -f /tmp/setup_net_$netif.ok ]" > $hookdir/initqueue/finished/dhclient-$netif.sh

diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh
index 367a9f40dc0135d971d96603db28f5426441d577..0e23d097df9871698f386739f20725a97112e066 100644 (file)
--- a/modules.d/40network/net-lib.sh
+++ b/modules.d/40network/net-lib.sh
@@ -105,7 +105,7 @@ ifdown() {
     ip link set $netif down
     ip addr flush dev $netif
     echo "#empty" > /etc/resolv.conf
-    rm -f /tmp/net.$netif.did-setup
+    rm -f -- /tmp/net.$netif.did-setup
     # TODO: send "offline" uevent?
 }
 

diff --git a/modules.d/40network/netroot.sh b/modules.d/40network/netroot.sh
index 1dcae51a4c869676a56edabbef7af28c878ca75f..daeb14ceab3cd8862fe103523701740dda116530 100755 (executable)
--- a/modules.d/40network/netroot.sh
+++ b/modules.d/40network/netroot.sh
@@ -76,7 +76,7 @@ source_hook netroot $netif
 # Run the handler; don't store the root, it may change from device to device
 # XXX other variables to export?
 if $handler $netif $netroot $NEWROOT; then
-    rm -f $hookdir/initqueue/finished/dhcp.sh
+    rm -f -- $hookdir/initqueue/finished/dhcp.sh
     # Network rootfs mount successful - save interface info for ifcfg etc.
     save_netinfo $netif
 fi

diff --git a/modules.d/80cms/cmssetup.sh b/modules.d/80cms/cmssetup.sh
index 37fd84ee3275483715b73ddc630052cd6320f021..16704c34892d0642ee01ce0c374cbf60a531b957 100755 (executable)
--- a/modules.d/80cms/cmssetup.sh
+++ b/modules.d/80cms/cmssetup.sh
@@ -167,7 +167,7 @@ function dasd_settle_all() {
 
            printf 'SUBSYSTEM=="net", ACTION=="add", DRIVERS=="%s", KERNELS=="%s", ENV{INTERFACE}=="?*", RUN+="/sbin/initqueue --onetime --unique --name cmsifup-$env{INTERFACE} /sbin/cmsifup $env{INTERFACE}"\n' "$driver" "$devbusid" > /etc/udev/rules.d/99-cms.rules
         # remove the default net rules
-            rm -f /etc/udev/rules.d/91-default-net.rules
+            rm -f -- /etc/udev/rules.d/91-default-net.rules
            [[ -f /etc/udev/rules.d/90-net.rules ]] \
                || printf 'SUBSYSTEM=="net", ACTION=="online", RUN+="/sbin/initqueue --onetime --env netif=$env{INTERFACE} source_hook initqueue/online"\n' >> /etc/udev/rules.d/99-cms.rules
             udevadm control --reload

diff --git a/modules.d/90crypt/crypt-cleanup.sh b/modules.d/90crypt/crypt-cleanup.sh
index 04defde2a31c1be175ece3adcddd9ba4e1a77547..0671dc1d6933ed0ac1602463e277477decaa0e67 100755 (executable)
--- a/modules.d/90crypt/crypt-cleanup.sh
+++ b/modules.d/90crypt/crypt-cleanup.sh
@@ -2,7 +2,7 @@
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 # close everything which is not busy
-rm -f /etc/udev/rules.d/70-luks.rules >/dev/null 2>&1
+rm -f -- /etc/udev/rules.d/70-luks.rules >/dev/null 2>&1
 
 if ! getarg rd.luks.uuid -d rd_LUKS_UUID >/dev/null 2>&1 && getargbool 1 rd.luks -d -n rd_NO_LUKS >/dev/null 2>&1; then
     while true; do

diff --git a/modules.d/90crypt/parse-crypt.sh b/modules.d/90crypt/parse-crypt.sh
index 4cb281bf9db01b99f0c8c8e7973b6d57f999f4d3..961ec61bd91496ae0cbd65b9967eab481bf2ccb5 100755 (executable)
--- a/modules.d/90crypt/parse-crypt.sh
+++ b/modules.d/90crypt/parse-crypt.sh
@@ -4,7 +4,7 @@
 
 if ! getargbool 1 rd.luks -d -n rd_NO_LUKS; then
     info "rd.luks=0: removing cryptoluks activation"
-    rm -f /etc/udev/rules.d/70-luks.rules
+    rm -f -- /etc/udev/rules.d/70-luks.rules
 else
     {
         echo 'SUBSYSTEM!="block", GOTO="luks_end"'

diff --git a/modules.d/90dmsquash-live/iso-scan.sh b/modules.d/90dmsquash-live/iso-scan.sh
index 99eea0e3c818237201ac0eef4c32fc353d970c6b..36a6a2d1d759ef271843920819028c5fa3e775cd 100755 (executable)
--- a/modules.d/90dmsquash-live/iso-scan.sh
+++ b/modules.d/90dmsquash-live/iso-scan.sh
@@ -24,7 +24,7 @@ do_iso_scan() {
         mount -t auto -o ro "$dev" "/run/initramfs/isoscan" || continue
         if [ -f "/run/initramfs/isoscan/$isofile" ]; then
             losetup -f "/run/initramfs/isoscan/$isofile"
-            rm -f "$job"
+            rm -f -- "$job"
             exit 0
         else
             umount "/run/initramfs/isoscan"

diff --git a/modules.d/90lvm/lvm_scan.sh b/modules.d/90lvm/lvm_scan.sh
index f5f5fcd10d5a7dd10d4e905d6c6b741cf312f2c3..cc006c832ece41a7ae087792a298aa9c5d6011d3 100755 (executable)
--- a/modules.d/90lvm/lvm_scan.sh
+++ b/modules.d/90lvm/lvm_scan.sh
@@ -125,7 +125,7 @@ if [ -z "$LVS" -o -n "$VGS" ]; then
 fi
 
 if [ "$lvmwritten" ]; then
-    rm -f /etc/lvm/lvm.conf
+    rm -f -- /etc/lvm/lvm.conf
 fi
 unset lvmwritten
 

diff --git a/modules.d/90lvm/parse-lvm.sh b/modules.d/90lvm/parse-lvm.sh
index 3e6b371ba5bbc5a63aa413b5580505fe683e62c0..74e1d43b1148fcd71ca23747df0eba80a4c2fbd3 100755 (executable)
--- a/modules.d/90lvm/parse-lvm.sh
+++ b/modules.d/90lvm/parse-lvm.sh
@@ -2,7 +2,7 @@
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 if [ -e /etc/lvm/lvm.conf ] && ! getargbool 1 rd.lvm.conf -d -n rd_NO_LVMCONF; then
-    rm -f /etc/lvm/lvm.conf
+    rm -f -- /etc/lvm/lvm.conf
 fi
 
 LV_DEVS="$(getargs rd.lvm.vg -d rd_LVM_VG=) $(getargs rd.lvm.lv -d rd_LVM_LV=)"
@@ -10,7 +10,7 @@ LV_DEVS="$(getargs rd.lvm.vg -d rd_LVM_VG=) $(getargs rd.lvm.lv -d rd_LVM_LV=)"
 if ! getargbool 1 rd.lvm -d -n rd_NO_LVM \
     || ( [ -z "$LV_DEVS" ] && ! getargbool 0 rd.auto ); then
     info "rd.lvm=0: removing LVM activation"
-    rm -f /etc/udev/rules.d/64-lvm*.rules
+    rm -f -- /etc/udev/rules.d/64-lvm*.rules
 else
     for dev in $LV_DEVS; do
         wait_for_dev "/dev/$dev"

diff --git a/modules.d/90mdraid/parse-md.sh b/modules.d/90mdraid/parse-md.sh
index 2de435b3d4500db33a7ab89fd31f5df3371af0f3..dd7bda25529a03885d62207defa2e6b89093ca47 100755 (executable)
--- a/modules.d/90mdraid/parse-md.sh
+++ b/modules.d/90mdraid/parse-md.sh
@@ -32,11 +32,11 @@ fi
 
 if [ -e /etc/mdadm.conf ] && getargbool 1 rd.md.conf -d -n rd_NO_MDADMCONF; then
     udevproperty rd_MDADMCONF=1
-    rm -f $hookdir/pre-pivot/*mdraid-cleanup.sh
+    rm -f -- $hookdir/pre-pivot/*mdraid-cleanup.sh
 fi
 
 if ! getargbool 1 rd.md.conf -d -n rd_NO_MDADMCONF; then
-    rm -f /etc/mdadm/mdadm.conf /etc/mdadm.conf
+    rm -f -- /etc/mdadm/mdadm.conf /etc/mdadm.conf
     ln -s $(command -v mdraid-cleanup) $hookdir/pre-pivot/31-mdraid-cleanup.sh 2>/dev/null
 fi
 

diff --git a/modules.d/90multipath/multipathd.sh b/modules.d/90multipath/multipathd.sh
index 6d6eb990711ed1647f5582f39ce439e72ded4ab9..8a9e8aa5f026e19894e6df57fac38f24002574bd 100755 (executable)
--- a/modules.d/90multipath/multipathd.sh
+++ b/modules.d/90multipath/multipathd.sh
@@ -7,6 +7,6 @@ if [ -e /etc/multipath.conf ]; then
     multipathd -B || multipathd
     need_shutdown
 else
-    rm /etc/udev/rules.d/??-multipath.rules 2>/dev/null
+    rm -- /etc/udev/rules.d/??-multipath.rules 2>/dev/null
 fi
 

diff --git a/modules.d/95cifs/cifsroot.sh b/modules.d/95cifs/cifsroot.sh
index 677318b10e782ba7f21cbf349afea6f66bbdac26..72f6f2b02bd6b4e6928b0397adab204ce0e714b7 100755 (executable)
--- a/modules.d/95cifs/cifsroot.sh
+++ b/modules.d/95cifs/cifsroot.sh
@@ -21,6 +21,6 @@ echo options: $options
 mount.cifs //$server/$path $NEWROOT -o $options && { [ -e /dev/root ] || ln -s null /dev/root ; }
 
 # inject new exit_if_exists
-echo 'settle_exit_if_exists="--exit-if-exists=/dev/root"; rm "$job"' > $hookdir/initqueue/cifs.sh
+echo 'settle_exit_if_exists="--exit-if-exists=/dev/root"; rm -f -- "$job"' > $hookdir/initqueue/cifs.sh
 # force udevsettle to break
 > $hookdir/initqueue/work

diff --git a/modules.d/95nfs/nfsroot.sh b/modules.d/95nfs/nfsroot.sh
index 067d1726d3d8d4f4bff533e4fb9544de569c60f8..f04159e3434b18fd4bb0e0535bcce796447b4d82 100755 (executable)
--- a/modules.d/95nfs/nfsroot.sh
+++ b/modules.d/95nfs/nfsroot.sh
@@ -21,7 +21,7 @@ mount_nfs $root $NEWROOT $netif && { [ -e /dev/root ] || ln -s null /dev/root ;
 [ -f $NEWROOT/etc/fstab ] && cat $NEWROOT/etc/fstab > /dev/null
 
 # inject new exit_if_exists
-echo 'settle_exit_if_exists="--exit-if-exists=/dev/root"; rm "$job"' > $hookdir/initqueue/nfs.sh
+echo 'settle_exit_if_exists="--exit-if-exists=/dev/root"; rm -- "$job"' > $hookdir/initqueue/nfs.sh
 # force udevsettle to break
 > $hookdir/initqueue/work
 

diff --git a/modules.d/95resume/parse-resume.sh b/modules.d/95resume/parse-resume.sh
index 9da155075d8feca5b019214e5cb64ba59cb5f43f..20ece99fde832a25b10849011714a52097470475 100755 (executable)
--- a/modules.d/95resume/parse-resume.sh
+++ b/modules.d/95resume/parse-resume.sh
@@ -55,10 +55,10 @@ if [ -n "$resume" ]; then
             ${resume#/dev/};
     } >> /etc/udev/rules.d/99-resume.rules
 
-    printf '[ -e "%s" ] && { ln -s "%s" /dev/resume; rm "$job" "%s/initqueue/timeout/resume.sh"; }\n' \
+    printf '[ -e "%s" ] && { ln -s "%s" /dev/resume; rm -f -- "$job" "%s/initqueue/timeout/resume.sh"; }\n' \
         "$resume" "$resume" "$hookdir" >> $hookdir/initqueue/settled/resume.sh
 
-    printf 'warn "Cancelling resume operation. Device not found."; cancel_wait_for_dev /dev/resume; rm "$job" "%s/initqueue/settled/resume.sh";' \
+    printf 'warn "Cancelling resume operation. Device not found."; cancel_wait_for_dev /dev/resume; rm -f -- "$job" "%s/initqueue/settled/resume.sh";' \
         "$hookdir" >> $hookdir/initqueue/timeout/resume.sh
 
     wait_for_dev "/dev/resume"

diff --git a/modules.d/95rootfs-block/mount-root.sh b/modules.d/95rootfs-block/mount-root.sh
index 6ed35c1f2c2266acdb2f5e8bc0e73b81d4b3b884..5cd905f15bec930e953f3934d4277b2bb35eee88 100755 (executable)
--- a/modules.d/95rootfs-block/mount-root.sh
+++ b/modules.d/95rootfs-block/mount-root.sh
@@ -130,8 +130,8 @@ mount_root() {
     fi
 
     if ! getargbool 0 rd.skipfsck; then
-        [ -f "$NEWROOT"/forcefsck ] && rm -f "$NEWROOT"/forcefsck 2>/dev/null
-        [ -f "$NEWROOT"/.autofsck ] && rm -f "$NEWROOT"/.autofsck 2>/dev/null
+        [ -f "$NEWROOT"/forcefsck ] && rm -f -- "$NEWROOT"/forcefsck 2>/dev/null
+        [ -f "$NEWROOT"/.autofsck ] && rm -f -- "$NEWROOT"/.autofsck 2>/dev/null
     fi
 }
 

diff --git a/modules.d/95virtfs/mount-virtfs.sh b/modules.d/95virtfs/mount-virtfs.sh
index 7c07b46284f485c46c9793f533db3b97daf21948..a4846cba1468c8e7f883bf86aac26edb111be8f2 100755 (executable)
--- a/modules.d/95virtfs/mount-virtfs.sh
+++ b/modules.d/95virtfs/mount-virtfs.sh
@@ -66,8 +66,8 @@ mount_root() {
     info "Remounting ${root#virtfs:} with -o ${rflags}"
     mount -t ${rootfs} -o "$rflags" "${root#virtfs:}" "$NEWROOT" 2>&1 | vinfo
 
-    [ -f "$NEWROOT"/forcefsck ] && rm -f "$NEWROOT"/forcefsck 2>/dev/null
-    [ -f "$NEWROOT"/.autofsck ] && rm -f "$NEWROOT"/.autofsck 2>/dev/null
+    [ -f "$NEWROOT"/forcefsck ] && rm -f -- "$NEWROOT"/forcefsck 2>/dev/null
+    [ -f "$NEWROOT"/.autofsck ] && rm -f -- "$NEWROOT"/.autofsck 2>/dev/null
 }
 
 if [ -n "$root" -a -z "${root%%virtfs:*}" ]; then

diff --git a/modules.d/97biosdevname/parse-biosdevname.sh b/modules.d/97biosdevname/parse-biosdevname.sh
index 049b15694936555d215cd024e694bdd24586c57e..5e80f8272d9c8f5b771c2bc4e62fc6ff99a16aee 100755 (executable)
--- a/modules.d/97biosdevname/parse-biosdevname.sh
+++ b/modules.d/97biosdevname/parse-biosdevname.sh
@@ -4,7 +4,7 @@
 if ! getargbool 1 biosdevname; then
     info "biosdevname=0: removing biosdevname network renaming"
     udevproperty UDEV_BIOSDEVNAME=
-    rm -f /etc/udev/rules.d/71-biosdevname.rules
+    rm -f -- /etc/udev/rules.d/71-biosdevname.rules
 else
     info "biosdevname=1: activating biosdevname network renaming"
     udevproperty UDEV_BIOSDEVNAME=1

diff --git a/modules.d/98systemd/dracut-emergency.service b/modules.d/98systemd/dracut-emergency.service
index ebf5aac3b7417b9b0d25a909877fc2763dd64cf5..a4b81bc507c178383055beb3e118f9966db040b3 100644 (file)
--- a/modules.d/98systemd/dracut-emergency.service
+++ b/modules.d/98systemd/dracut-emergency.service
@@ -21,7 +21,7 @@ Environment=DRACUT_SYSTEMD=1
 Environment=NEWROOT=/sysroot
 WorkingDirectory=/
 ExecStart=/bin/dracut-emergency
-ExecStopPost=-/bin/rm -f /.console_lock
+ExecStopPost=-/bin/rm -f -- /.console_lock
 Type=oneshot
 StandardInput=tty-force
 StandardOutput=inherit

diff --git a/modules.d/98systemd/dracut-emergency.sh b/modules.d/98systemd/dracut-emergency.sh
index 8ab045ea6463424bbb959636c962fdb2d9832989..e1da2efe560c4b607afb99569e6451bc4a0fa65e 100755 (executable)
--- a/modules.d/98systemd/dracut-emergency.sh
+++ b/modules.d/98systemd/dracut-emergency.sh
@@ -36,6 +36,6 @@ else
     exit 1
 fi
 
-/bin/rm -f /.console_lock
+/bin/rm -f -- /.console_lock
 
 exit 0

diff --git a/modules.d/98systemd/dracut-initqueue.sh b/modules.d/98systemd/dracut-initqueue.sh
index 2c71bf44198d5be1dce0bb8790c4e2d698978283..35cd76f52ee33229e71d704947bbf0b9db3c443d 100755 (executable)
--- a/modules.d/98systemd/dracut-initqueue.sh
+++ b/modules.d/98systemd/dracut-initqueue.sh
@@ -30,7 +30,7 @@ while :; do
     check_finished && break
 
     if [ -f $hookdir/initqueue/work ]; then
-        rm $hookdir/initqueue/work
+        rm -f -- "$hookdir/initqueue/work"
     fi
 
     for job in $hookdir/initqueue/*.sh; do

diff --git a/modules.d/98systemd/dracut-mount.sh b/modules.d/98systemd/dracut-mount.sh
index ae01512ce2e65faf47ffccf1a694b7f5a5df20d3..acebef6754c6780d04f2c91291719a9c7b504ba5 100755 (executable)
--- a/modules.d/98systemd/dracut-mount.sh
+++ b/modules.d/98systemd/dracut-mount.sh
@@ -26,7 +26,7 @@ while :; do
             usable_root "$NEWROOT" && break;
             warn "$NEWROOT has no proper rootfs layout, ignoring and removing offending mount hook"
             umount "$NEWROOT"
-            rm -f "$f"
+            rm -f -- "$f"
         fi
     done
 

diff --git a/modules.d/98systemd/dracut-pre-pivot.sh b/modules.d/98systemd/dracut-pre-pivot.sh
index 63cc9b34313ec741444b564bb619f6b145c1b6b5..8c7554eadaa35bd3491b5f4c218cdefc81afca3e 100755 (executable)
--- a/modules.d/98systemd/dracut-pre-pivot.sh
+++ b/modules.d/98systemd/dracut-pre-pivot.sh
@@ -23,6 +23,6 @@ source_hook cleanup
 getarg rd.break -d rdbreak && emergency_shell -n switch_root "Break before switch_root"
 
 # remove helper symlink
-[ -h /dev/root ] && rm -f /dev/root
+[ -h /dev/root ] && rm -f -- /dev/root
 
 exit 0

diff --git a/modules.d/98systemd/rescue.service b/modules.d/98systemd/rescue.service
index 62f20673a84b3e7bddda54af3f9f5b307cfc3802..edc246190e78bcb02cc034bb0db3fcf9d3736066 100644 (file)
--- a/modules.d/98systemd/rescue.service
+++ b/modules.d/98systemd/rescue.service
@@ -18,7 +18,7 @@ Environment=NEWROOT=/sysroot
 WorkingDirectory=/
 ExecStartPre=-/bin/plymouth quit
 ExecStart=-/bin/sh -i -l
-ExecStopPost=-/bin/rm -f /.console_lock
+ExecStopPost=-/bin/rm -f -- /.console_lock
 ExecStopPost=-/usr/bin/systemctl --fail --no-block default
 Type=idle
 StandardInput=tty-force

diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
index 581b63a08382ebd046080a683a03df71f0f057fd..e9021263218eb9c1cba41b2594bff58a20cf6049 100755 (executable)
--- a/modules.d/99base/dracut-lib.sh
+++ b/modules.d/99base/dracut-lib.sh
@@ -754,7 +754,7 @@ inst_hook() {
 
     if [ -n "$onetime" ]; then
         {
-            echo '[ -e "$_job" ] && rm "$_job"'
+            echo '[ -e "$_job" ] && rm -f -- "$_job"'
             echo "$_exe $@"
         } > "/tmp/$$-${_job}.sh"
     else
@@ -867,12 +867,12 @@ cancel_wait_for_dev()
 {
     local _name
     _name="$(str_replace "$1" '/' '\\x2f')"
-    rm -f "$hookdir/initqueue/finished/devexists-${_name}.sh"
-    rm -f "$hookdir/emergency/80-${_name}.sh"
+    rm -f -- "$hookdir/initqueue/finished/devexists-${_name}.sh"
+    rm -f -- "$hookdir/emergency/80-${_name}.sh"
     if [ -n "$DRACUT_SYSTEMD" ]; then
         _name=$(dev_unit_name "$1")
-        rm -f ${PREFIX}/etc/systemd/system/initrd.target.requires/${_name}.device
-        rm -f ${PREFIX}/etc/systemd/system/${_name}.device.d/timeout.conf
+        rm -f -- ${PREFIX}/etc/systemd/system/initrd.target.requires/${_name}.device
+        rm -f -- ${PREFIX}/etc/systemd/system/${_name}.device.d/timeout.conf
         /sbin/initqueue --onetime --unique --name daemon-reload systemctl daemon-reload
     fi
 }
@@ -921,7 +921,7 @@ wait_for_loginit()
     fi
 
     setdebug
-    rm -f /run/initramfs/loginit.pipe /run/initramfs/loginit.pid
+    rm -f -- /run/initramfs/loginit.pipe /run/initramfs/loginit.pid
 }
 
 _emergency_shell()
@@ -931,8 +931,8 @@ _emergency_shell()
         > /.console_lock
         echo "PS1=\"$_name:\\\${PWD}# \"" >/etc/profile
         systemctl start dracut-emergency.service
-        rm -f /etc/profile
-        rm -f /.console_lock
+        rm -f -- /etc/profile
+        rm -f -- /.console_lock
     else
         debug_off
         echo

diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh
index c72129b97a6c89c59f5e3d8b281c3b48411bfe2f..16104ae03374ef3383f6476b819b904d056fd942 100755 (executable)
--- a/modules.d/99base/init.sh
+++ b/modules.d/99base/init.sh
@@ -85,7 +85,7 @@ if ! ismounted /run; then
     mount -t tmpfs -o mode=0755,nosuid,nodev,strictatime tmpfs /newrun >/dev/null 
     cp -a /run/* /newrun >/dev/null 2>&1
     mount --move /newrun /run
-    rm -fr /newrun
+    rm -fr -- /newrun
 fi
 
 trap "action_on_fail Signal caught!" 0
@@ -174,7 +174,7 @@ while :; do
     check_finished && break
 
     if [ -f $hookdir/initqueue/work ]; then
-        rm $hookdir/initqueue/work
+        rm -f -- $hookdir/initqueue/work
     fi
 
     for job in $hookdir/initqueue/*.sh; do
@@ -237,7 +237,7 @@ while :; do
             usable_root "$NEWROOT" && break;
             warn "$NEWROOT has no proper rootfs layout, ignoring and removing offending mount hook"
             umount "$NEWROOT"
-            rm -f "$f"
+            rm -f -- "$f"
         fi
     done
 
@@ -317,7 +317,7 @@ for i in $(export -p); do
     esac
 done
 . /tmp/export.orig 2>/dev/null || :
-rm -f /tmp/export.orig
+rm -f -- /tmp/export.orig
 
 initargs=""
 read CLINE </proc/cmdline
@@ -356,7 +356,7 @@ fi
 wait_for_loginit
 
 # remove helper symlink
-[ -h /dev/root ] && rm -f /dev/root
+[ -h /dev/root ] && rm -f -- /dev/root
 
 getarg rd.break -d rdbreak && emergency_shell -n switch_root "Break before switch_root"
 info "Switching root"

diff --git a/modules.d/99base/initqueue.sh b/modules.d/99base/initqueue.sh
index 3387e8888595fb0f95146e75c3a7debbadc06ef8..854a36a8fe4ceb65fa9b620837613172286b727c 100755 (executable)
--- a/modules.d/99base/initqueue.sh
+++ b/modules.d/99base/initqueue.sh
@@ -46,7 +46,7 @@ shift
 [ -x "$exe" ] || exe=$(command -v $exe)
 
 {
-    [ -n "$onetime" ] && echo '[ -e "$job" ] && rm "$job"'
+    [ -n "$onetime" ] && echo '[ -e "$job" ] && rm -f -- "$job"'
     [ -n "$env" ] && echo "$env"
     echo "$exe $@"
 } > "/tmp/$$-${job}.sh"

diff --git a/modules.d/99base/loginit.sh b/modules.d/99base/loginit.sh
index 97cb154ff299743dfbb13eff4ca130b8de55ec71..d215abe0a862ca1ccbcffe00f444909c96f44a0e 100755 (executable)
--- a/modules.d/99base/loginit.sh
+++ b/modules.d/99base/loginit.sh
@@ -14,7 +14,7 @@ exec 6>/run/initramfs/init.log
 
 while read line; do
     if [ "$line" = "DRACUT_LOG_END" ]; then
-        rm -f /run/initramfs/loginit.pipe
+        rm -f -- /run/initramfs/loginit.pipe
         exit 0
     fi
     echo "<31>dracut: $line" >&5

diff --git a/modules.d/99shutdown/shutdown.sh b/modules.d/99shutdown/shutdown.sh
index d6a532b0c213c7957d223515a0fcf6328be7a403..f04013977806cfe5b6a48b56e9e3f79c5c093ba5 100755 (executable)
--- a/modules.d/99shutdown/shutdown.sh
+++ b/modules.d/99shutdown/shutdown.sh
@@ -86,7 +86,7 @@ _check_shutdown() {
         [ -e "$__f" ] || continue
         ( . "$__f" $1 )
         if [ $? -eq 0 ]; then
-            rm -f $__f
+            rm -f -- $__f
             __s=0
         fi
     done

diff --git a/test/TEST-01-BASIC/create-root.sh b/test/TEST-01-BASIC/create-root.sh
index 6bede87feeca04dadfeb8c71119633e25dafdcdc..96e3c339c95e287846652ee59df7ed5278290ec1 100755 (executable)
--- a/test/TEST-01-BASIC/create-root.sh
+++ b/test/TEST-01-BASIC/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
 set -e
 # save a partition at the beginning for future flagging purposes

diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh
index d39556c91fb39a6d3d9ffb4d350bd66a67022e76..161fcf3463de04746302141d21c2ecee303ec643 100755 (executable)
--- a/test/TEST-01-BASIC/test.sh
+++ b/test/TEST-01-BASIC/test.sh
@@ -20,7 +20,7 @@ test_run() {
 }
 
 test_setup() {
-    rm -f $TESTDIR/root.ext3
+    rm -f -- $TESTDIR/root.ext3
     # Create the blank file to use as a root filesystem
     dd if=/dev/null of=$TESTDIR/root.ext3 bs=1M seek=80
 
@@ -66,7 +66,7 @@ test_setup() {
        -d "piix ide-gd_mod ata_piix ext3 sd_mod" \
         --nomdadmconf \
        -f $TESTDIR/initramfs.makeroot $KVERSION || return 1
-    rm -rf $TESTDIR/overlay
+    rm -rf -- $TESTDIR/overlay
     # Invoke KVM and/or QEMU to actually create the target filesystem.
 
     $testdir/run-qemu \

diff --git a/test/TEST-02-SYSTEMD/create-root.sh b/test/TEST-02-SYSTEMD/create-root.sh
index 0363c939d417bd585f37898c1d48b1535fd44703..682e472bfe9a16686b6d9f058f3d5544ef42cc44 100755 (executable)
--- a/test/TEST-02-SYSTEMD/create-root.sh
+++ b/test/TEST-02-SYSTEMD/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
 set -e
 # save a partition at the beginning for future flagging purposes

diff --git a/test/TEST-02-SYSTEMD/test.sh b/test/TEST-02-SYSTEMD/test.sh
index c141527e5c4f6bbc0e009add6274218ea3239b91..a98c8ac45d0dd0a1413194cd634130da8b1eb7cb 100755 (executable)
--- a/test/TEST-02-SYSTEMD/test.sh
+++ b/test/TEST-02-SYSTEMD/test.sh
@@ -16,7 +16,7 @@ test_run() {
 }
 
 test_setup() {
-    rm -f $TESTDIR/root.ext3
+    rm -f -- $TESTDIR/root.ext3
     # Create the blank file to use as a root filesystem
     dd if=/dev/null of=$TESTDIR/root.ext3 bs=1M seek=80
 
@@ -62,7 +62,7 @@ test_setup() {
        -d "piix ide-gd_mod ata_piix ext3 sd_mod" \
         --nomdadmconf \
        -f $TESTDIR/initramfs.makeroot $KVERSION || return 1
-    rm -rf $TESTDIR/overlay
+    rm -rf -- $TESTDIR/overlay
     # Invoke KVM and/or QEMU to actually create the target filesystem.
 
     $testdir/run-qemu \

diff --git a/test/TEST-03-USR-MOUNT/create-root.sh b/test/TEST-03-USR-MOUNT/create-root.sh
index 04f5bfec73679445086e59afcb2783bc89b77f8f..961392f64b249297c84557829a0b0f2323bc97bf 100755 (executable)
--- a/test/TEST-03-USR-MOUNT/create-root.sh
+++ b/test/TEST-03-USR-MOUNT/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
 set -e
 # save a partition at the beginning for future flagging purposes

diff --git a/test/TEST-03-USR-MOUNT/test.sh b/test/TEST-03-USR-MOUNT/test.sh
index 01a69158db92e8d142acf734106b3b37c42064b4..246fc9a950bfba89a1488a67d0a94ab3fee62e27 100755 (executable)
--- a/test/TEST-03-USR-MOUNT/test.sh
+++ b/test/TEST-03-USR-MOUNT/test.sh
@@ -45,8 +45,8 @@ test_run() {
 }
 
 test_setup() {
-    rm -f $TESTDIR/root.btrfs
-    rm -f $TESTDIR/usr.btrfs
+    rm -f -- $TESTDIR/root.btrfs
+    rm -f -- $TESTDIR/usr.btrfs
     # Create the blank file to use as a root filesystem
     dd if=/dev/null of=$TESTDIR/root.btrfs bs=1M seek=160
     dd if=/dev/null of=$TESTDIR/usr.btrfs bs=1M seek=160
@@ -101,7 +101,7 @@ test_setup() {
 #    echo $TESTDIR/overlay
 #    echo $TESTDIR/initramfs.makeroot
 #exit 1
-    rm -rf $TESTDIR/overlay
+    rm -rf -- $TESTDIR/overlay
 
     $testdir/run-qemu \
        -hda $TESTDIR/root.btrfs \
@@ -126,7 +126,7 @@ test_setup() {
        -d "piix ide-gd_mod ata_piix btrfs sd_mod i6300esb ib700wdt" \
        -f $TESTDIR/initramfs.testing $KVERSION || return 1
 
-    rm -rf $TESTDIR/overlay
+    rm -rf -- $TESTDIR/overlay
 
 #      -o "plymouth network md dmraid multipath fips caps crypt btrfs resume dmsquash-live dm"
 }

diff --git a/test/TEST-04-FULL-SYSTEMD/create-root.sh b/test/TEST-04-FULL-SYSTEMD/create-root.sh
index 4f731833b3d87fe1daca01062171ad18cab6f6bb..fb462abf075b09b17f5d9541e7889034988633af 100755 (executable)
--- a/test/TEST-04-FULL-SYSTEMD/create-root.sh
+++ b/test/TEST-04-FULL-SYSTEMD/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
 set -e
 # save a partition at the beginning for future flagging purposes

diff --git a/test/TEST-04-FULL-SYSTEMD/test.sh b/test/TEST-04-FULL-SYSTEMD/test.sh
index 957445b5dfe0a9580a5d367c1e55eea3b01c01c4..4eba3f58692e2ee3d44a7dbe0f8f0af43c90b936 100755 (executable)
--- a/test/TEST-04-FULL-SYSTEMD/test.sh
+++ b/test/TEST-04-FULL-SYSTEMD/test.sh
@@ -46,8 +46,8 @@ test_run() {
 }
 
 test_setup() {
-    rm -f $TESTDIR/root.btrfs
-    rm -f $TESTDIR/usr.btrfs
+    rm -f -- $TESTDIR/root.btrfs
+    rm -f -- $TESTDIR/usr.btrfs
     # Create the blank file to use as a root filesystem
     dd if=/dev/null of=$TESTDIR/root.btrfs bs=1M seek=320
     dd if=/dev/null of=$TESTDIR/usr.btrfs bs=1M seek=320
@@ -243,7 +243,7 @@ EOF
 #    echo $TESTDIR/overlay
 #    echo $TESTDIR/initramfs.makeroot
 #exit 1
-    rm -rf $TESTDIR/overlay
+    rm -rf -- $TESTDIR/overlay
 
     $testdir/run-qemu \
        -hda $TESTDIR/root.btrfs \
@@ -268,7 +268,7 @@ EOF
        -d "piix ide-gd_mod ata_piix btrfs sd_mod i6300esb ib700wdt" \
        -f $TESTDIR/initramfs.testing $KVERSION || return 1
 
-    rm -rf $TESTDIR/overlay
+    rm -rf -- $TESTDIR/overlay
 
 #      -o "plymouth network md dmraid multipath fips caps crypt btrfs resume dmsquash-live dm"
 }

diff --git a/test/TEST-10-RAID/create-root.sh b/test/TEST-10-RAID/create-root.sh
index 8e5e54267fb8eaaf01f338f8b1e29f343ddfd586..7c026690ca8efd981154808796625b60bb31cd48 100755 (executable)
--- a/test/TEST-10-RAID/create-root.sh
+++ b/test/TEST-10-RAID/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
 # save a partition at the beginning for future flagging purposes
 sfdisk -C 1280 -H 2 -S 32 -L /dev/sda <<EOF

diff --git a/test/TEST-10-RAID/test.sh b/test/TEST-10-RAID/test.sh
index ffce8fc7e0f223f5207498b06a7827576d2de791..e24b9a0b7a1d4738b5e891eb1b686a839a98e186 100755 (executable)
--- a/test/TEST-10-RAID/test.sh
+++ b/test/TEST-10-RAID/test.sh
@@ -20,7 +20,7 @@ test_run() {
 test_setup() {
     DISKIMAGE=$TESTDIR/TEST-10-RAID-root.img
     # Create the blank file to use as a root filesystem
-    rm -f $DISKIMAGE
+    rm -f -- $DISKIMAGE
     dd if=/dev/null of=$DISKIMAGE bs=1M seek=40
 
     kernel=$KVERSION
@@ -64,7 +64,7 @@ test_setup() {
        -d "piix ide-gd_mod ata_piix ext2 sd_mod" \
         --nomdadmconf \
        -f $TESTDIR/initramfs.makeroot $KVERSION || return 1
-    rm -rf $TESTDIR/overlay
+    rm -rf -- $TESTDIR/overlay
     # Invoke KVM and/or QEMU to actually create the target filesystem.
     $testdir/run-qemu \
        -hda $DISKIMAGE \

diff --git a/test/TEST-11-LVM/create-root.sh b/test/TEST-11-LVM/create-root.sh
index 5907941d042d3a12f8cebd273d4ccc0774efe9a9..0ab04968e6b51cf4d55a69be517005723d221624 100755 (executable)
--- a/test/TEST-11-LVM/create-root.sh
+++ b/test/TEST-11-LVM/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
 # save a partition at the beginning for future flagging purposes
 sfdisk -C 1280 -H 2 -S 32 -L /dev/sda <<EOF

diff --git a/test/TEST-11-LVM/test.sh b/test/TEST-11-LVM/test.sh
index 65cf58857f1192828560adcb85929154ada0ea37..47761b35863e446668ae7a1ca7c5fff2122453fc 100755 (executable)
--- a/test/TEST-11-LVM/test.sh
+++ b/test/TEST-11-LVM/test.sh
@@ -60,7 +60,7 @@ test_setup() {
        -m "dash lvm mdraid udev-rules base rootfs-block kernel-modules" \
        -d "piix ide-gd_mod ata_piix ext2 sd_mod" \
        -f $TESTDIR/initramfs.makeroot $KVERSION || return 1
-    rm -rf $TESTDIR/overlay
+    rm -rf -- $TESTDIR/overlay
     # Invoke KVM and/or QEMU to actually create the target filesystem.
     $testdir/run-qemu -hda $TESTDIR/root.ext2 -m 256M -smp 2 -nographic -net none \
        -kernel "/boot/vmlinuz-$kernel" \

diff --git a/test/TEST-12-RAID-DEG/create-root.sh b/test/TEST-12-RAID-DEG/create-root.sh
index 5723b0bac476403410b34e28cab7abfb3e38221a..7561be190747a44728365a95aa871b221045c1ec 100755 (executable)
--- a/test/TEST-12-RAID-DEG/create-root.sh
+++ b/test/TEST-12-RAID-DEG/create-root.sh
@@ -6,7 +6,7 @@ trap 'poweroff -f' EXIT
 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
 # save a partition at the beginning for future flagging purposes
 sfdisk -C 1280 -H 2 -S 32 -L /dev/sda <<EOF

diff --git a/test/TEST-12-RAID-DEG/test.sh b/test/TEST-12-RAID-DEG/test.sh
index 1b5e75627ca770ec6481cf0d22aea48ae7dcc2c4..3eabbd59c51cde9eab27dbf652f28f0f97a9485d 100755 (executable)
--- a/test/TEST-12-RAID-DEG/test.sh
+++ b/test/TEST-12-RAID-DEG/test.sh
@@ -55,7 +55,7 @@ test_run() {
 
 test_setup() {
     # Create the blank file to use as a root filesystem
-    rm -f $TESTDIR/root.ext2
+    rm -f -- $TESTDIR/root.ext2
     dd if=/dev/null of=$TESTDIR/root.ext2 bs=1M seek=40
     dd if=/dev/null of=$TESTDIR/disk1.img bs=1M seek=20
     dd if=/dev/null of=$TESTDIR/disk2.img bs=1M seek=20
@@ -100,7 +100,7 @@ test_setup() {
        -m "dash crypt lvm mdraid udev-rules base rootfs-block kernel-modules" \
        -d "piix ide-gd_mod ata_piix ext2 sd_mod" \
        -f $TESTDIR/initramfs.makeroot $KVERSION || return 1
-    rm -rf $TESTDIR/overlay
+    rm -rf -- $TESTDIR/overlay
     # Invoke KVM and/or QEMU to actually create the target filesystem.
     $testdir/run-qemu \
        -hda $TESTDIR/root.ext2 \

diff --git a/test/TEST-13-ENC-RAID-LVM/create-root.sh b/test/TEST-13-ENC-RAID-LVM/create-root.sh
index c4c7a179f50352eabbe4261bd44ef60dd75993eb..4260e86ac6177b0a9ba90ca206b92729e72b82af 100755 (executable)
--- a/test/TEST-13-ENC-RAID-LVM/create-root.sh
+++ b/test/TEST-13-ENC-RAID-LVM/create-root.sh
@@ -4,7 +4,7 @@ set -x
 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
 # save a partition at the beginning for future flagging purposes
 sfdisk -C 2560 -H 2 -S 32 -L /dev/sda <<EOF

diff --git a/test/TEST-13-ENC-RAID-LVM/test.sh b/test/TEST-13-ENC-RAID-LVM/test.sh
index 93d48a59a0ec6bd440ff7083b06c735de233706f..d069293bb86395a6e5b311fd097a2cfe92242267 100755 (executable)
--- a/test/TEST-13-ENC-RAID-LVM/test.sh
+++ b/test/TEST-13-ENC-RAID-LVM/test.sh
@@ -55,7 +55,7 @@ test_run() {
 
 test_setup() {
     # Create the blank file to use as a root filesystem
-    rm -f $TESTDIR/root.ext2
+    rm -f -- $TESTDIR/root.ext2
     dd if=/dev/null of=$TESTDIR/root.ext2 bs=1M seek=80
 
     kernel=$KVERSION
@@ -97,7 +97,7 @@ test_setup() {
        -m "dash crypt lvm mdraid udev-rules base rootfs-block kernel-modules" \
        -d "piix ide-gd_mod ata_piix ext2 sd_mod" \
        -f $TESTDIR/initramfs.makeroot $KVERSION || return 1
-    rm -rf $TESTDIR/overlay
+    rm -rf -- $TESTDIR/overlay
     # Invoke KVM and/or QEMU to actually create the target filesystem.
     $testdir/run-qemu -hda $TESTDIR/root.ext2 -m 256M -smp 2 -nographic -net none \
        -kernel "/boot/vmlinuz-$kernel" \

diff --git a/test/TEST-15-BTRFSRAID/test.sh b/test/TEST-15-BTRFSRAID/test.sh
index 6d44fbc4c5793aa92b90b947e65a69ebde79e814..6f66875283ba5c8347680db4c6336fdda9191450 100755 (executable)
--- a/test/TEST-15-BTRFSRAID/test.sh
+++ b/test/TEST-15-BTRFSRAID/test.sh
@@ -19,7 +19,7 @@ test_run() {
 test_setup() {
     # Create the blank file to use as a root filesystem
     DISKIMAGE=$TESTDIR/TEST-15-BTRFSRAID-root.img
-    rm -f $DISKIMAGE
+    rm -f -- $DISKIMAGE
     dd if=/dev/null of=$DISKIMAGE bs=1M seek=1024
 
     kernel=$KVERSION
@@ -62,7 +62,7 @@ test_setup() {
         --nomdadmconf \
        -f $TESTDIR/initramfs.makeroot $KVERSION || return 1
 
-    rm -rf $TESTDIR/overlay
+    rm -rf -- $TESTDIR/overlay
 
     # Invoke KVM and/or QEMU to actually create the target filesystem.
     $testdir/run-qemu \

diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh
index 859fe06793ccb550eefb2bfc7c676d9ad82f869c..2c8ee186886d05a92d2bc270a472cdd25c6a3111 100755 (executable)
--- a/test/TEST-20-NFS/test.sh
+++ b/test/TEST-20-NFS/test.sh
@@ -187,7 +187,7 @@ test_nfsv4() {
 test_run() {
     if [[ -s server.pid ]]; then
         sudo kill -TERM $(cat $TESTDIR/server.pid)
-        rm -f $TESTDIR/server.pid
+        rm -f -- $TESTDIR/server.pid
     fi
 
     if ! run_server; then
@@ -202,7 +202,7 @@ test_run() {
 
     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
@@ -327,7 +327,7 @@ test_setup() {
     mkdir -p $TESTDIR/mnt/nfs/tftpboot/nfs4-5
 
     sudo umount $TESTDIR/mnt
-    rm -fr $TESTDIR/mnt
+    rm -fr -- $TESTDIR/mnt
 
     # Make an overlay with needed tools for the test harness
     (
@@ -356,7 +356,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
 }
 

diff --git a/test/TEST-30-ISCSI/create-root.sh b/test/TEST-30-ISCSI/create-root.sh
index d91e5b87a289bf5c15b74ac634d5f3c4b412e8a4..2a4b920e846f898179fb372d167397c21f8dd0d3 100755 (executable)
--- 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 990f7baffe9a45e0f5863d1c7f058f4e16efca06..df998ffec86ad67873f8c40eb5d1a404d4c399a5 100755 (executable)
--- 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
 }
 

diff --git a/test/TEST-40-NBD/create-root.sh b/test/TEST-40-NBD/create-root.sh
index 62188d7f134d39ced75fe5b949c2e1b02cd29017..cb27a60486cc9c946a929397b4cc941e29819df7 100755 (executable)
--- a/test/TEST-40-NBD/create-root.sh
+++ b/test/TEST-40-NBD/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
 echo -n test >keyfile
 cryptsetup -q luksFormat /dev/sdb /keyfile

diff --git a/test/TEST-40-NBD/test.sh b/test/TEST-40-NBD/test.sh
index 9ad95b98bb95cf5f752caf18375e2f82b41cc22a..124682acef90bb2bd806bf53cf7443f08a921fc5 100755 (executable)
--- a/test/TEST-40-NBD/test.sh
+++ b/test/TEST-40-NBD/test.sh
@@ -181,7 +181,7 @@ client_run() {
 
     if [[ -s server.pid ]]; then
         sudo kill -TERM $(cat $TESTDIR/server.pid)
-        rm -f $TESTDIR/server.pid
+        rm -f -- $TESTDIR/server.pid
     fi
 
 }
@@ -229,7 +229,7 @@ make_encrypted_root() {
         -m "dash crypt lvm mdraid udev-rules base rootfs-block kernel-modules" \
         -d "piix ide-gd_mod ata_piix ext2 ext3 sd_mod" \
         -f $TESTDIR/initramfs.makeroot $KVERSION || return 1
-    rm -rf $TESTDIR/overlay
+    rm -rf -- $TESTDIR/overlay
 
     # Invoke KVM and/or QEMU to actually create the target filesystem.
     $testdir/run-qemu \
@@ -276,7 +276,7 @@ make_client_root() {
     )
 
     sudo umount $TESTDIR/mnt
-    rm -fr $TESTDIR/mnt
+    rm -fr -- $TESTDIR/mnt
 }
 
 make_server_root() {
@@ -321,7 +321,7 @@ make_server_root() {
     )
 
     sudo umount $TESTDIR/mnt
-    rm -fr $TESTDIR/mnt
+    rm -fr -- $TESTDIR/mnt
 }
 
 test_setup() {
@@ -366,7 +366,7 @@ test_setup() {
 kill_server() {
     if [[ -s $TESTDIR/server.pid ]]; then
         sudo kill -TERM $(cat $TESTDIR/server.pid)
-        rm -f $TESTDIR/server.pid
+        rm -f -- $TESTDIR/server.pid
     fi
 }
 

diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-50-MULTINIC/test.sh
index e610f2e64194a1ecba80f9cc81779cd0fa43affa..ee23550c1222ef52699b9ec7b1bca15843631b6d 100755 (executable)
--- a/test/TEST-50-MULTINIC/test.sh
+++ b/test/TEST-50-MULTINIC/test.sh
@@ -237,7 +237,7 @@ test_setup() {
     )
 
     sudo umount $TESTDIR/mnt
-    rm -fr $TESTDIR/mnt
+    rm -fr -- $TESTDIR/mnt
 
     # Make an overlay with needed tools for the test harness
     (
@@ -265,7 +265,7 @@ test_setup() {
 kill_server() {
     if [[ -s $TESTDIR/server.pid ]]; then
         sudo kill -TERM $(cat $TESTDIR/server.pid)
-        rm -f $TESTDIR/server.pid
+        rm -f -- $TESTDIR/server.pid
     fi
 }
 

diff --git a/test/TEST-99-RPM/test.sh b/test/TEST-99-RPM/test.sh
index e774168f35045e266703b875a683d5a027afafa9..5afc313e59919cec4ac27df95d4605c38698f3aa 100755 (executable)
--- a/test/TEST-99-RPM/test.sh
+++ b/test/TEST-99-RPM/test.sh
@@ -14,8 +14,8 @@ test_run() {
     mkdir -p "$rootdir/sys"
     mkdir -p "$rootdir/dev"
 
-trap 'ret=$?; [[ -d $rootdir ]] && { umount "$rootdir/proc"; umount "$rootdir/sys"; umount "$rootdir/dev"; rm -rf "$rootdir"; }; exit $ret;' EXIT
-trap '[[ -d $rootdir ]] && { umount "$rootdir/proc"; umount "$rootdir/sys"; umount "$rootdir/dev"; rm -rf "$rootdir"; }; exit 1;' SIGINT
+trap 'ret=$?; [[ -d $rootdir ]] && { umount "$rootdir/proc"; umount "$rootdir/sys"; umount "$rootdir/dev"; rm -rf -- "$rootdir"; }; exit $ret;' EXIT
+trap '[[ -d $rootdir ]] && { umount "$rootdir/proc"; umount "$rootdir/sys"; umount "$rootdir/dev"; rm -rf -- "$rootdir"; }; exit 1;' SIGINT
 
     mount --bind /proc "$rootdir/proc"
     mount --bind /sys "$rootdir/sys"

diff --git a/test/old.TEST-14-IMSM/create-root.sh b/test/old.TEST-14-IMSM/create-root.sh
index 4709028bcf1c51941f3dcb64b1c333641a0e6bb4..0716a5c78bd6abcb8cfedf7fd4dc3efeff0c809e 100755 (executable)
--- a/test/old.TEST-14-IMSM/create-root.sh
+++ b/test/old.TEST-14-IMSM/create-root.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
 # don't let udev and this script step on eachother's toes
 for x in 61-dmraid-imsm.rules 64-md-raid.rules 65-md-incremental-imsm.rules 65-md-incremental.rules 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
-    rm "/etc/udev/rules.d/$x"
+    rm -f -- "/etc/udev/rules.d/$x"
 done
-rm /etc/lvm/lvm.conf
+rm -f -- /etc/lvm/lvm.conf
 
 udevadm control --reload
 # dmraid does not want symlinks in --disk "..."

diff --git a/test/old.TEST-14-IMSM/test.sh b/test/old.TEST-14-IMSM/test.sh
index d69f00d5b93a9ba2d13e33e6d1356f662f7c4603..fbb459da9d27f51a33d3245a51c40648c75bdf98 100755 (executable)
--- a/test/old.TEST-14-IMSM/test.sh
+++ b/test/old.TEST-14-IMSM/test.sh
@@ -47,9 +47,9 @@ test_setup() {
 #   return 1
 
     # Create the blank file to use as a root filesystem
-    rm -f $TESTDIR/root.ext2
-    rm -f $TESTDIR/disk1
-    rm -f $TESTDIR/disk2
+    rm -f -- $TESTDIR/root.ext2
+    rm -f -- $TESTDIR/disk1
+    rm -f -- $TESTDIR/disk2
     dd if=/dev/null of=$TESTDIR/root.ext2 bs=1M seek=1
     dd if=/dev/null of=$TESTDIR/disk1 bs=1M seek=80
     dd if=/dev/null of=$TESTDIR/disk2 bs=1M seek=80
@@ -92,7 +92,7 @@ test_setup() {
        -m "dash lvm mdraid dmraid udev-rules base rootfs-block kernel-modules" \
        -d "piix ide-gd_mod ata_piix ext2 sd_mod dm-multipath dm-crypt dm-round-robin faulty linear multipath raid0 raid10 raid1 raid456" \
        -f $TESTDIR/initramfs.makeroot $KVERSION || return 1
-    rm -rf $TESTDIR/overlay
+    rm -rf -- $TESTDIR/overlay
     # Invoke KVM and/or QEMU to actually create the target filesystem.
     $testdir/run-qemu \
        -hda $TESTDIR/root.ext2 \

diff --git a/test/test-functions b/test/test-functions
index 5b03a2391d683e7bfce6fe9ea58397671d66e67d..7bdfed28d6f7d6326558ad2d38752dda58d7afe2 100644 (file)
--- a/test/test-functions
+++ b/test/test-functions
@@ -46,8 +46,8 @@ while (($# > 0)); do
         --clean)
            echo "TEST CLEANUP: $TEST_DESCRIPTION"
            test_cleanup
-           rm -fr "$TESTDIR"
-           rm -f .testdir
+           rm -fr -- "$TESTDIR"
+           rm -f -- .testdir
            exit $?;;
         --all)
             check_root
@@ -63,8 +63,8 @@ while (($# > 0)); do
                test_setup && test_run
                ret=$?
                test_cleanup
-               rm -fr "$TESTDIR"
-               rm -f .testdir
+               rm -fr -- "$TESTDIR"
+               rm -f -- .testdir
                exit $ret
            ) </dev/null >test.log 2>&1
             else
@@ -73,15 +73,15 @@ while (($# > 0)); do
                test_setup && test_run
                ret=$?
                test_cleanup
-               rm -fr "$TESTDIR"
-               rm -f .testdir
+               rm -fr -- "$TESTDIR"
+               rm -f -- .testdir
                exit $ret
            ) </dev/null 2>&1 | tee test.log
             fi
            ret=$?
             set +o pipefail
            if [ $ret -eq 0 ]; then
-               rm test.log
+               rm -- test.log
                SETCOLOR_SUCCESS
               echo "[OK]"
                SETCOLOR_NORMAL