--- /usr/sbin/etc-update.orig	2018-01-30 15:32:14.481697766 +0100
+++ /usr/sbin/etc-update	2018-01-30 16:05:35.561274425 +0100
@@ -241,6 +241,7 @@
 		else
 			parse_automode_flag -7
 			export rm_opts=""
+			NONINTERACTIVE_RM=true
 		fi
 		;;
 	-7)
@@ -731,6 +732,7 @@
 QUIET=false
 VERBOSE=false
 NONINTERACTIVE_MV=false
+NONINTERACTIVE_RM=false
 while [[ -n $1 ]] ; do
 	case $1 in
 		-d|--debug)   SET_X=true;;
@@ -845,6 +847,11 @@
 	mv_opts="${mv_opts// -i / }"
 fi
 
+if ${NONINTERACTIVE_RM} ; then
+	export rm_opts=" ${rm_opts} "
+	rm_opts="${rm_opts// -i / }"
+fi
+
 if ${VERBOSE} ; then
 	for v in ${portage_vars[@]} ${cfg_vars[@]} TMP SCAN_PATHS ; do
 		echo "${v}=${!v}"