Fix to rename OpenRC init template
ⓘ Rename webmin-gentoo-init to webmin-openrc-init and update setup/distribution references to use the generic OpenRC template name.
This commit is contained in:
+1
-1
@@ -63,7 +63,7 @@ if ($product) {
|
|||||||
my $want_boot = $miniserv{'atboot'} ? 1 : 0;
|
my $want_boot = $miniserv{'atboot'} ? 1 : 0;
|
||||||
my $temp = &transname();
|
my $temp = &transname();
|
||||||
$ENV{'WEBMIN_KILLCMD'} = &has_command('kill');
|
$ENV{'WEBMIN_KILLCMD'} = &has_command('kill');
|
||||||
©_source_dest("$root_directory/webmin-gentoo-init", "$temp");
|
©_source_dest("$root_directory/webmin-openrc-init", "$temp");
|
||||||
my $lref = &read_file_lines($temp);
|
my $lref = &read_file_lines($temp);
|
||||||
foreach my $l (@{$lref}) {
|
foreach my $l (@{$lref}) {
|
||||||
$l =~ s/(WEBMIN_[A-Z]+)/$ENV{$1}/g;
|
$l =~ s/(WEBMIN_[A-Z]+)/$ENV{$1}/g;
|
||||||
|
|||||||
+1
-1
@@ -81,7 +81,7 @@ system("cd $usr_dir && rm -f mount/freebsd-mounts*");
|
|||||||
system("cd $usr_dir && rm -f mount/openbsd-mounts*");
|
system("cd $usr_dir && rm -f mount/openbsd-mounts*");
|
||||||
if ($product eq "webmin") {
|
if ($product eq "webmin") {
|
||||||
system("cd $usr_dir && rm -f mount/macos-mounts*");
|
system("cd $usr_dir && rm -f mount/macos-mounts*");
|
||||||
system("cd $usr_dir && rm -f webmin-gentoo-init");
|
system("cd $usr_dir && rm -f webmin-openrc-init");
|
||||||
system("cd $usr_dir && rm -rf format bsdexports hpuxexports sgiexports zones rbac bsdfdisk");
|
system("cd $usr_dir && rm -rf format bsdexports hpuxexports sgiexports zones rbac bsdfdisk");
|
||||||
system("cd $usr_dir && rm -rf acl/Authen-SolarisRBAC-0.1*");
|
system("cd $usr_dir && rm -rf acl/Authen-SolarisRBAC-0.1*");
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -46,7 +46,7 @@ $vers || usage();
|
|||||||
"defaulttheme",
|
"defaulttheme",
|
||||||
"javascript-lib.pl", "webmin-pam", "webmin-debian-pam", "maketemp.pl",
|
"javascript-lib.pl", "webmin-pam", "webmin-debian-pam", "maketemp.pl",
|
||||||
"run-uninstalls.pl",
|
"run-uninstalls.pl",
|
||||||
"webmin-gentoo-init", "run-postinstalls.pl",
|
"webmin-openrc-init", "run-postinstalls.pl",
|
||||||
"config-lib.pl", "entities_map.txt", "ui-lib.pl",
|
"config-lib.pl", "entities_map.txt", "ui-lib.pl",
|
||||||
"password_form.cgi", "password_change.cgi", "pam_login.cgi",
|
"password_form.cgi", "password_change.cgi", "pam_login.cgi",
|
||||||
"module_chooser.cgi", "config-windows", "xmlrpc.cgi",
|
"module_chooser.cgi", "config-windows", "xmlrpc.cgi",
|
||||||
|
|||||||
+1
-2
@@ -112,7 +112,7 @@ browser and login as root with your root password.
|
|||||||
rm -f mount/freebsd-mounts*
|
rm -f mount/freebsd-mounts*
|
||||||
rm -f mount/openbsd-mounts*
|
rm -f mount/openbsd-mounts*
|
||||||
rm -f mount/macos-mounts*
|
rm -f mount/macos-mounts*
|
||||||
rm -f webmin-gentoo-init
|
rm -f webmin-openrc-init
|
||||||
rm -rf format bsdexports hpuxexports sgiexports zones rbac bsdfdisk
|
rm -rf format bsdexports hpuxexports sgiexports zones rbac bsdfdisk
|
||||||
rm -rf acl/Authen-SolarisRBAC-0.1*
|
rm -rf acl/Authen-SolarisRBAC-0.1*
|
||||||
chmod -R og-w .
|
chmod -R og-w .
|
||||||
@@ -360,4 +360,3 @@ foreach $rpm ("rpm", "newkey/rpm") {
|
|||||||
system("cp $rpm/webmin-$ver-$rel.noarch.rpm /usr/local/webadmin/$rpm/yum");
|
system("cp $rpm/webmin-$ver-$rel.noarch.rpm /usr/local/webadmin/$rpm/yum");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user