From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 29 Dec 2018 12:17:23 +0000 (+0000)
Subject: kernel: configure: Correctly save changes
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc7a96d32fb0bfb3b7741e5d051cf0369bd43327;p=ipfire-3.x.git

kernel: configure: Correctly save changes

This patch fixes that sometimes changes were just ignored and
overwritten by the old settings.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/kernel/scripts/configure b/kernel/scripts/configure
index 1b1830b4b..21298f4c2 100755
--- a/kernel/scripts/configure
+++ b/kernel/scripts/configure
@@ -144,7 +144,7 @@ function merge_config() {
 	for config in ${configs}; do
 		cat ${tmp_out} > ${tmp_in}
 		perl ${SCRIPTS_DIR}/merge.pl \
-			${config} ${tmp_in} > ${tmp_out}
+			${tmp_in} ${config} > ${tmp_out}
 	done
 
 	if [ "${config_mode}" != "none" ]; then