VladPolskiy/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2025-07-20 16:48:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove obsolete option to skip use of chkconfig

Browse Source
This commit is contained in:
Jamie Cameron
2022-10-01 18:11:01 -07:00
parent 52d34aea5d
commit 391773274f
46 changed files with 9 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
init/config-aix
View File

@ -11,4 +11,3 @@ local_down=/etc/rc.shutdown
status_check=0
order=0
sort_mode=0
no_chkconfig=0

1
init/config-cobalt-linux-2.2-4.0
View File

@ -12,4 +12,3 @@ status_check=0
order=0
sort_mode=0
boot_levels=2 3 5
no_chkconfig=0

1
init/config-cobalt-linux-5.0-ALL
View File

@ -13,4 +13,3 @@ status_check=0
order=0
sort_mode=0
boot_levels=2 3 5
no_chkconfig=0

1
init/config-coherent-linux
View File

@ -13,4 +13,3 @@ status_check=1
order=0
sort_mode=0
boot_levels=2 3 5
no_chkconfig=0

1
init/config-corel-linux
View File

@ -10,4 +10,3 @@ status_check=0
order=0
sort_mode=0
boot_levels=2 3 5
no_chkconfig=0

1
init/config-debian-linux
View File

@ -10,5 +10,4 @@ status_check=0
order=0
sort_mode=0
boot_levels=2 3 5
no_chkconfig=0
init_info=1

1
init/config-freebsd
View File

@ -5,4 +5,3 @@ local_down=/etc/rc.shutdown
status_check=0
order=0
sort_mode=0
no_chkconfig=0

1
init/config-freebsd-5.0-ALL
View File

@ -5,6 +5,5 @@ local_down=/etc/rc.shutdown
status_check=0
order=0
sort_mode=0
no_chkconfig=0
rc_dir=/etc/rc.d /usr/local/etc/rc.d
rc_conf=/etc/defaults/rc.conf /etc/rc.conf.d/* /etc/rc.conf

1
init/config-generic-linux
View File

@ -11,4 +11,3 @@ status_check=0
order=0
sort_mode=0
boot_levels=2 3 5
no_chkconfig=0

1
init/config-gentoo-linux
View File

@ -7,4 +7,3 @@ status_check=0
order=0
sort_mode=0
local_script=/etc/conf.d/local.start
no_chkconfig=0

1
init/config-hpux
View File

@ -12,4 +12,3 @@ inittab_rl_3=3,2,1
inittab_rl_2=2,1
order=0
sort_mode=0
no_chkconfig=0

1
init/config-irix
View File

@ -9,4 +9,3 @@ expert=0
status_check=0
order=0
sort_mode=0
no_chkconfig=0

1
init/config-macos
View File

@ -8,4 +8,3 @@ plist=StartupParameters.plist
status_check=0
order=0
sort_mode=0
no_chkconfig=0

1
init/config-mandrake-linux
View File

@ -13,4 +13,3 @@ status_check=1
order=0
sort_mode=0
boot_levels=2 3 5
no_chkconfig=0

1
init/config-msc-linux
View File

@ -13,4 +13,3 @@ status_check=1
order=0
sort_mode=0
boot_levels=2 3 5
no_chkconfig=0

1
init/config-netbsd
View File

@ -4,4 +4,3 @@ local_script=/etc/rc.local
status_check=0
order=0
sort_mode=0
no_chkconfig=0

1
init/config-open-linux
View File

@ -10,4 +10,3 @@ status_check=0
order=0
sort_mode=0
boot_levels=2 3 5
no_chkconfig=0

1
init/config-openbsd
View File

@ -4,4 +4,3 @@ local_script=/etc/rc.local
status_check=0
order=0
sort_mode=0
no_chkconfig=0

1
init/config-openmamba-linux
View File

@ -13,4 +13,3 @@ status_check=1
order=0
sort_mode=0
boot_levels=2 3 5
no_chkconfig=0

1
init/config-openserver
View File

@ -10,4 +10,3 @@ status_check=0
inittab_rl_S=2
order=0
sort_mode=0
no_chkconfig=0

1
init/config-osf1
View File

@ -12,4 +12,3 @@ inittab_rl_4=4,3,2
inittab_rl_3=3,2
order=0
sort_mode=0
no_chkconfig=0

1
init/config-pardus-linux
View File

@ -11,4 +11,3 @@ status_check=0
order=0
sort_mode=0
boot_levels=2 3 5
no_chkconfig=0

1
init/config-redhat-linux
View File

@ -13,4 +13,3 @@ status_check=1
order=0
sort_mode=0
boot_levels=2 3 5
no_chkconfig=0

1
init/config-slackware-linux
View File

@ -5,4 +5,3 @@ status_check=0
order=0
sort_mode=0
boot_levels=2 3 5
no_chkconfig=0

1
init/config-solaris
View File

@ -10,4 +10,3 @@ inittab_rl_3=3,2
status_check=0
order=0
sort_mode=0
no_chkconfig=0

1
init/config-solaris-10-ALL
View File

@ -10,6 +10,5 @@ inittab_rl_3=3,2
status_check=0
order=0
sort_mode=0
no_chkconfig=0
boot_levels=2
inittab_extra=2

1
init/config-suse-linux
View File

@ -10,4 +10,3 @@ status_check=0
order=0
sort_mode=0
boot_levels=2 3 5
no_chkconfig=0

1
init/config-suse-linux-7.1-ALL
View File

@ -12,4 +12,3 @@ order=0
sort_mode=0
boot_levels=2 3 5
inittab_extra=boot
no_chkconfig=0

1
init/config-syno-linux
View File

@ -10,5 +10,4 @@ inittab_id=id
expert=0
status_check=1
boot_levels=2 3 5
no_chkconfig=1
desc=1

1
init/config-trustix-linux
View File

@ -13,4 +13,3 @@ status_check=1
order=0
sort_mode=0
boot_levels=2 3 5
no_chkconfig=0

1
init/config-turbo-linux
View File

@ -13,4 +13,3 @@ status_check=0
order=0
sort_mode=0
boot_levels=2 3 5
no_chkconfig=0

1
init/config-united-linux
View File

@ -11,4 +11,3 @@ init_info=1
order=0
sort_mode=0
boot_levels=2 3 5
no_chkconfig=0

1
init/config-unixware
View File

@ -9,4 +9,3 @@ expert=0
status_check=0
order=0
sort_mode=0
no_chkconfig=0

1
init/config-windows
View File

@ -3,4 +3,3 @@ shutdown_command=shutdown.exe -s -t 1 -f
status_check=0
order=0
sort_mode=0
no_chkconfig=0

1
init/config.info
View File

@ -15,7 +15,6 @@ local_down=Local shutdown commands script,3,None
reboot_command=Command to reboot the system,0
shutdown_command=Command to shutdown the system,0
inittab_id=inittab ID for bootup runlevel,0
no_chkconfig=Use chkconfig command to enable actions?,1,0-Yes,1-No
rc_dir=FreeBSD rc scripts directories,3,None
rc_conf=FreeBSD configuration files,3,None
line3=OSX system configuration,11

1
init/config.info.ca
View File

@ -15,7 +15,6 @@ local_down=Script d'ordres de tancament local,3,Cap
reboot_command=Ordre de reinici del sistema,0
shutdown_command=Ordre de tancament del sistema,0
inittab_id=ID d'inittab per al nivell d'engegada per omissió,0
no_chkconfig=Utilitza l'ordre chkconfig per activar les accions,1,0-Sí,1-No
rc_dir=Directori de scripts rc FreeBSD,3,Cap
rc_conf=Fitxers de configuració FreeBSD,3,Cap
line3=Configuració del sistema OSX,11

1
init/config.info.cs
View File

@ -14,7 +14,6 @@ local_down=skript pro příkaz lokálního shození,3,Nic
reboot_command=Příkaz pro rebootování systému,0
shutdown_command=Příkaz pro shození systému,0
inittab_id=ID inittabu pro bootovací úroveň běhu,0
no_chkconfig=Použít příkaz chkconfig pro povolení akcí?,1,0-Ano,1-Ne
rc_dir=Adresáře pro FreeBSD rc skripty,3,Nic
rc_conf=Soubory FreeBSD konfigurace,3,Nic
line3=Konfigurace OSX systému,11

1
init/config.info.de
View File

@ -15,7 +15,6 @@ local_down=Lokales Shutdown-Skript,3,Keines
reboot_command=Kommando zum Neustart des Systems,0
shutdown_command=Kommando zum Herunterfahren des Systems,0
inittab_id=Inittab-ID für Bootup-Runlevel,0
no_chkconfig=Benutze chkconfig-Befehl, um Aktionen zu aktivieren?,1,0-Ja,1-Nein
rc_dir=FreeBSD rc Skripts Verzeichnisse,3,Keine
rc_conf=FreeBSD Konfigurationsdateien,3,Keine
line3=OSX Systemkonfiguration,11

1
init/config.info.eu
View File

@ -14,7 +14,6 @@ local_down=Itzalera lokalerako scripten komandoak3,Ezer ez
reboot_command=Sistema berrabiarazteko komandoa,0
shutdown_command=Sistema itzaltzeko komandoa,0
inittab_id=Abiatzeko unerako inittab-en ID-a exekuzio-mailarentzat
no_chkconfig=Ekintzak gaitzeko chkconfig komandoa erabili?,1,0-Bai,1-Ez
rc_dir=FreeBSD rc scripten katalogoa,3,Ezer ez
rc_conf=FreeBSD konfigurazioa fitxategiak,3,Ezer ez
line3=OSX sistemaren konfigurazioa,11

1
init/config.info.ja
View File

@ -14,7 +14,6 @@ local_down=ローカルなシャットダウン用コマンドのスクリプト
reboot_command=再起動コマンド,0
shutdown_command=シャットダウンコマンド,0
inittab_id=起動ランレベルのinittab ID,0
no_chkconfig=Use chkconfig command to enable actions?,1,0-はい,1-いいえ
rc_dir=FreeBSD rc スクリプトのディレクトリ,3,なし
rc_conf=FreeBSD 設定ファイル,3,なし
line3=OSX システム設定,11

1
init/config.info.ko
View File

@ -14,7 +14,6 @@ local_down=로컬 셧다운 명령 스크립트,3,없음
reboot_command=시스템 리부트 명령,0
shutdown_command=시스템 셧다운 명령,0
inittab_id=bootup 실행레벨의 inittab ID,0
no_chkconfig=동작을 활성화 하기 위해 chkconfig 명령 사용,1,0-예,1-아니오
rc_dir=FreeBSD rc 스크립트 디렉토리,3,없음
rc_conf=FreeBSD 설정 파일
line3=OSX 시스템 설정,11

1
init/config.info.nl
View File

@ -14,7 +14,6 @@ local_down=Lokaal Uitschakel opdrachten script,3,Geen
reboot_command=Opdracht om het systeem te rebooten,0
shutdown_command=Opdracht om het systeem uit te zetten,0
inittab_id=inittab ID voor bootup runlevel,0
no_chkconfig=Gebruik de chkconfig opdracht om acties aan te zetten?,1,0-Ja,1-Nee
rc_dir=FreeBSD rc scripts directory's,3,Geen
rc_conf=FreeBSD configuratie files,3,Geen
line3=OSX systeem configuratie,11

1
init/config.info.no
View File

@ -15,7 +15,6 @@ local_down=Lokalt script med shutdown kommandoer,3,Ingen
reboot_command=Kommando for å omstarte systemet,0
shutdown_command=Kommando for å slå av systemet,0
inittab_id=inittab ID for oppstarts kjørenivå,0
no_chkconfig=Bruk chkconfig kommando for å aktivere handlinger?,1,0-Ja,1-Nei
rc_dir=FreeCSD rc script kataloger,3,Ingen
rc_conf=FreeBSD konfigurasjonsfiler,3,Ingen
line3=OSX system konfigurasjon,11

1
init/config.info.pl
View File

@ -13,7 +13,6 @@ local_down=Lokalny skrypt poleceń wyłączania,3,Brak
reboot_command=Polecenie restartujące system,0
shutdown_command=Polecenie zamykające system,0
inittab_id=ID inicjalnego poziomu pracy w inittab-ie,0
no_chkconfig=Użyć polecenie chkconfig do włączania akcji?,1,0-Tak,1-Nie
rc_dir=Katalogi skryptów rc FreeBSD,3,Brak
rc_conf=Plik konfiguracyjny FreeBSD,3,Brak
line3=Konfiguracja systemu OSX,11

1
init/config.info.ru
View File

@ -14,7 +14,6 @@ local_down=Сценарий локальных команд выключения
reboot_command=Команда для перезагрузки системы,0
shutdown_command=Команда для завершения работы системы,0
inittab_id=Имя процесса inittab, задающего режим работы,0
no_chkconfig=Использовать команду chkconfig при включении сценария?,1,0-Да,1-Нет
rc_dir=Каталоги с rc скриптами FreeBSD,3,None
rc_conf=Конфигурационные файлы FreeBSD,3,None
line3=Конфигурация системы OSX,11

13
init/init-lib.pl
View File

@ -75,6 +75,8 @@ elsif ($config{'local_script'}) {
elsif ($gconfig{'os_type'} eq 'windows') {
$init_mode = "win32";
}
# Do init scripts support start and stop custom messages?
if ($init_mode eq "init" && $gconfig{'os_type'} =~ /^(osf1|hpux)$/) {
$supports_start_stop_msg = 1;
}
@ -82,6 +84,10 @@ else {
$supports_start_stop_msg = 0;
}
# Use the chkconfig command to enable actions?
$use_chkconfig = &has_command("chkconfig") &&
$gconfig{'os_type'} ne 'syno-linux';
=head2 runlevel_actions(level, S|K)
Return a list of init.d actions started or stopped in some run-level, each of
@ -804,7 +810,7 @@ if ($init_mode eq "init" || $init_mode eq "local" || $init_mode eq "upstart" ||
$init_mode eq "systemd")) {
my $data = &read_file_contents($fn);
my $done = 0;
if (&has_command("chkconfig") && !$config{'no_chkconfig'} &&
if ($use_chkconfig &&
(@chk && $chk[3] || $data =~ /Default-Start:/i)) {
# Call the chkconfig command to link up
&system_logged("chkconfig --add ".quotemeta($action));
@ -814,8 +820,7 @@ if ($init_mode eq "init" || $init_mode eq "local" || $init_mode eq "upstart" ||
$done = 1;
}
}
elsif (&has_command("insserv") && !$config{'no_chkconfig'} &&
$data =~ /Default-Start:/i) {
elsif (&has_command("insserv") && $data =~ /Default-Start:/i) {
# Call the insserv command to enable
my $ex = &system_logged("insserv ".quotemeta($action).
" >/dev/null 2>&1");
@ -1080,7 +1085,7 @@ if ($init_mode eq "init" || $init_mode eq "upstart" ||
my @chk = &chkconfig_info($file);
my $data = &read_file_contents($file);
elsif (&has_command("chkconfig") && !$config{'no_chkconfig'} && @chk) {
if ($use_chkconfig && @chk) {
# Call chkconfig to remove the links
&system_logged("chkconfig ".quotemeta($_[0])." off");
}