From: Nicolas François <nicolas.francois@centraliens.net>
Date: Sat, 20 Sep 2014 13:40:46 +0000 (+0200)
Subject: Force removal of files when restoring system config
X-Git-Tag: 4.3.0~29
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=112e015f05854af49e5148904de62338951a1343;p=shadow

Force removal of files when restoring system config
---

diff --git a/tests/common/config.sh b/tests/common/config.sh
index 511b9a03..9b504852 100644
--- a/tests/common/config.sh
+++ b/tests/common/config.sh
@@ -37,7 +37,7 @@ restore_config ()
 			cp -dp "tmp/$file" "/$file"
 			rm "tmp/$file"
 		else
-			rm "/$file"
+			rm -f "/$file"
 		fi
 		d="$(dirname "tmp/$file")"
 		while [ -n "$d" ] && [ "$d" != "." ]