Fix to use alternating page name

e418b4c
webmin · Dec 29, 2023 · c4f39f5 · c4f39f5
1 parent 6b2b727
commit c4f39f5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/package-updates/update.cgi b/package-updates/update.cgi
@@ -112,6 +112,8 @@ else {
 
 		# Do it
 		$msg = $in{'mode'} eq 'new' ? 'update_pkg2' : 'update_pkg';
+		$flags = join(" ", map { /^--/ ? $_ : () } @pkgs);
+		@pkgs = grep { !/^--/ } @pkgs;
 		&start_update_progress([ map { (split(/\//, $_))[0] } @pkgs ]);
 		if ($config{'update_multiple'} && @pkgs > 1) {
 			# Update all packages at once
@@ -124,6 +126,7 @@ else {
 			print &text($msg, "<tt>".&html_escape(join(" ", @pkgnames))."</tt>"),
 			      "<br>\n";
 			print "<ul data-package-updates='1'>\n";
+			push(@pkgnames, $flags) if ($flags);
 			@got = &package_install_multiple(
 				\@pkgnames, $pkgsystem, $in{'mode'} eq 'new');
 			print "</ul><br>\n";
@@ -135,6 +138,7 @@ else {
 				next if ($donedep{$p});
 				print &text($msg, "<tt>@{[&html_escape($p)]}</tt>"),"<br>\n";
 				print "<ul data-package-updates='2'>\n";
+				$p = "$p $flags" if ($flags);
 				@pgot = &package_install(
 					$p, $s, $in{'mode'} eq 'new');
 				foreach $g (@pgot) {

diff --git a/software/yum-lib.pl b/software/yum-lib.pl
@@ -216,16 +216,14 @@ sub update_system_resolve
 local $maria = $gconfig{'real_os_type'} =~ /CentOS|Redhat|Scientific/ &&
 	       $gconfig{'real_os_version'} >= 7;
 return $name eq "apache" ? "httpd mod_.*" :
-       $name eq "dhcpd" && $gconfig{'os_type'} >= 16 ? "dhcp-server" :
-       $name eq "dhcpd" ? "dhcp" :
+       $name eq "dhcpd" ? "dhcp dhcp-server --skip-broken" :
        $name eq "mysql" && $maria ? "mariadb mariadb-server mariadb-devel" :
        $name eq "mysql" && !$maria ? "mysql mysql-server mysql-devel" :
        $name eq "openssh" ? "openssh openssh-server" :
        $name eq "postgresql" ? "postgresql postgresql-libs postgresql-server" :
        $name eq "openldap" ? "openldap-servers openldap-clients" :
        $name eq "ldap" ? "nss-pam-ldapd pam_ldap nss_ldap" :
-       $name eq "virtualmin-modules" ? "wbm-.*" :
-       			  $name;
+       $name eq "virtualmin-modules" ? "wbm-.*" : $name;
 }
 
 # update_system_repo(package)