Merge branch 'master' of github.com:webmin/webmin

crazysnowboy · Nov 13, 2020 · 4ea9235 · 4ea9235
2 parents d3be5b8 + 7960288
commit 4ea9235
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/net/net-lib.pl b/net/net-lib.pl
@@ -21,8 +21,10 @@
 	# Special case for Slackware 9.1+
 	do "$gconfig{'os_type'}-9.1-ALL-lib.pl";
 	}
-elsif ($gconfig{'os_type'} eq 'debian-linux' && -d "/etc/netplan" &&
-       &has_command("netplan")) {
+elsif ($gconfig{'os_type'} eq 'debian-linux' && 
+       &has_command("netplan") &&
+       -d "/etc/netplan" &&
+       glob("/etc/netplan/*")) {
 	# Special case for newer Ubuntu versions
 	do "netplan-lib.pl";
 	}

diff --git a/password_change.cgi b/password_change.cgi
@@ -201,19 +201,13 @@ if (&get_product_name() eq 'usermin' &&
 
 # Show ok page
 &header(undef, undef, undef, undef, 1, 1);
-
-print "<center><h3>",&text('password_done', "/"),"</h3></center>\n";
-
+print &ui_alert_box(&text('password_done', "/"), "success");
 &footer();
 
 sub pass_error
 {
-&header(undef, undef, undef, undef, 1, 1);
-print &ui_hr();
-
-print "<center><h3>",$text{'password_err'}," : ",@_,"</h3></center>\n";
-
-print &ui_hr();
+&header(undef, undef, undef, undef, 1, 1, undef, undef);
+print &ui_alert_box("$text{'password_err'}: @_.", "danger");
 &footer();
 exit;
 }