X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/f3940a66750b2edb681ac351d93c8ebdd18dc0aa..3ba84cb70821c6a2dd091bb2140b01abe31574a7:/scripts/config.pl?ds=sidebyside

diff --git a/scripts/config.pl b/scripts/config.pl
index 2f4a968ea..53b8f1102 100755
--- a/scripts/config.pl
+++ b/scripts/config.pl
@@ -49,15 +49,17 @@ sub config_and($$) {
 }
 
 
-sub config_add($$) {
+sub config_add($$$) {
 	my $cfg1 = shift;
 	my $cfg2 = shift;
+	my $mod_plus = shift;
 	my %config;
 	
 	for ($cfg1, $cfg2) {
 		my %cfg = %$_;
 		
 		foreach my $config (keys %cfg) {
+			next if $mod_plus and $config{$config} and $config{$config} eq "y";
 			$config{$config} = $cfg{$config};
 		}
 	}
@@ -123,7 +125,11 @@ sub parse_expr($) {
 	} elsif ($arg =~ /^\+/) {
 		my $arg1 = parse_expr($pos);
 		my $arg2 = parse_expr($pos);
-		return config_add($arg1, $arg2);
+		return config_add($arg1, $arg2, 0);
+	} elsif ($arg =~ /^m\+/) {
+		my $arg1 = parse_expr($pos);
+		my $arg2 = parse_expr($pos);
+		return config_add($arg1, $arg2, 1);
 	} elsif ($arg eq '>') {
 		my $arg1 = parse_expr($pos);
 		my $arg2 = parse_expr($pos);