Use user-provided $mv_opts for -5 (bug #47442)

svn path=/main/trunk/; revision=6735

diff --git a/bin/etc-update b/bin/etc-update
index fd192b0e7a86285bd79cbe9abaf1bef43f8c0811..0daf04d40541958956a6fff1ebea9c0a31b114f1 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