Use user-provided for -5 (bug #47442) (trunk r6735)

svn path=/main/branches/2.1.2/; revision=6756

diff --git a/bin/etc-update b/bin/etc-update
index 742aed1b5e7d54692f98b786e676a573c6d70ac0..a6378a1427f815a2a009072c997483b4191384f9 100755 (executable)
--- a/bin/etc-update
+++ b/bin/etc-update
@@ -176,7 +176,8 @@ configuration file is followed by a list of possible replacement files."
                        fi
                        if [[ ${input} == -5 ]] ; then
                                input=-3
-                               export mv_opts=""
+                               export mv_opts=" ${mv_opts} "
+                               mv_opts="${mv_opts// -i / }"
                        fi
                        if [[ ${input} == -3 ]] ; then
                                input=0