diff --git a/net/linux-lib.pl b/net/linux-lib.pl index b17de5d45..f3d0d9910 100755 --- a/net/linux-lib.pl +++ b/net/linux-lib.pl @@ -57,7 +57,7 @@ if (&has_command("ip")) { $ifc{'address'} = $1; $ifc{'netmask'} = &prefix_to_mask("$3"); } - elsif ($l =~ /\sinet\s+([0-9\.]+)\/\d+\s+(?:metric\s+\d+\s+|)brd\s+(\S+)\s+scope\s+global(?:\s+secondary|)\s(dynamic)\s+.*?(\Q$iface_name\E)/) { + elsif ($l =~ /\sinet\s+([0-9\.]+)\/(\d+)\s+(?:metric\s+\d+\s+|)brd\s+(\S+)\s+scope\s+global(?:\s+secondary|)\s(dynamic)\s+.*?(\Q$iface_name\E)/) { # Line like : # inet 193.9.101.120/24 brd 193.9.101.255 scope global secondary dynamic br0 # inet 10.211.55.81/24 metric 100 brd 10.211.55.255 scope global secondary dynamic enp0s5 diff --git a/software/apt-lib.pl b/software/apt-lib.pl index 3785e308c..49827265b 100755 --- a/software/apt-lib.pl +++ b/software/apt-lib.pl @@ -20,6 +20,7 @@ local $force = !$_[2]; local (@rv, @newpacks); # Build the command to run +$ENV{'UCF_FORCE_CONFFOLD'} = 'YES'; $ENV{'DEBIAN_FRONTEND'} = 'noninteractive'; local $uicmd = "$apt_get_command -y ".($force ? " -f" : "")." install $update"; $update = join(" ", map { quotemeta($_) } split(/\s+/, $update)); @@ -75,6 +76,7 @@ return @rv; sub update_system_operations { my ($packages) = @_; +$ENV{'UCF_FORCE_CONFFOLD'} = 'YES'; $ENV{'DEBIAN_FRONTEND'} = 'noninteractive'; my $cmd = "apt-get -s install ". join(" ", map { quotemeta($_) } split(/\s+/, $packages)). diff --git a/software/debian-lib.pl b/software/debian-lib.pl index e2635c238..60c98ae5e 100755 --- a/software/debian-lib.pl +++ b/software/debian-lib.pl @@ -202,6 +202,7 @@ local $args = ($in->{'depends'} ? " --force-depends" : ""). ($in->{'overwrite'} ? " --force-overwrite" : ""). ($in->{'downgrade'} ? " --force-downgrade" : ""); local $qm = quotemeta($_[0]); +$ENV{'UCF_FORCE_CONFFOLD'} = 'YES'; $ENV{'DEBIAN_FRONTEND'} = 'noninteractive'; local $out = &backquote_logged("dpkg --install $args $qm 2>&1