]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
kernel: configure: Correctly save changes
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 29 Dec 2018 12:17:23 +0000 (12:17 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 29 Dec 2018 12:17:23 +0000 (12:17 +0000)
This patch fixes that sometimes changes were just ignored and
overwritten by the old settings.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
kernel/scripts/configure

index 1b1830b4b44bcdcd1bcb5e945da9e8bf73f2f002..21298f4c2c1a26356890626e4f3568ef1baad258 100755 (executable)
@@ -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