summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuilhem Moulin <guilhem@fripost.org>2014-03-13 16:46:06 +0100
committerGuilhem Moulin <guilhem@fripost.org>2015-06-07 02:51:44 +0200
commit0cc50082b05575597d72c08bb6f7e8f9145f8c68 (patch)
tree8255285b922577beae467bc415f33330abc6b671
parentd72d516f2647a3e03b5e11d891c6ec4e9ddcf9cf (diff)
Replace mktemp's deprecated -t option by --tmpdir.
But not in the installer, as busybox's implementation of mktemp didn't deprecate -t/-p.
-rwxr-xr-xroles/common/files/usr/local/sbin/update-firewall.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/roles/common/files/usr/local/sbin/update-firewall.sh b/roles/common/files/usr/local/sbin/update-firewall.sh
index cfd2678..33b6ef1 100755
--- a/roles/common/files/usr/local/sbin/update-firewall.sh
+++ b/roles/common/files/usr/local/sbin/update-firewall.sh
@@ -168,8 +168,8 @@ run() {
fi
# Store the old (current) ruleset
- local old=$(mktemp -t current-rules.v$f.XXXXXX) \
- new=$(mktemp -t new-rules.v$f.XXXXXX)
+ local old=$(mktemp --tmpdir current-rules.v$f.XXXXXX) \
+ new=$(mktemp --tmpdir new-rules.v$f.XXXXXX)
for table in ${tables[$f]}; do
$ipt-save -ct $table
done > "$old"
@@ -372,7 +372,7 @@ run() {
local rv1=0 rv2=0 persistent=/etc/iptables/rules.v$f
- local oldz=$(mktemp -t current-rules.v$f.XXXXXX)
+ local oldz=$(mktemp --tmpdir current-rules.v$f.XXXXXX)
# Reset the counters. They are not useful for comparing and/or
# storing persistent ruleset. (We don't use sed -i because we want