From 4f8b96cfeb55382e8dbba2d4696ff5737eaecd5f Mon Sep 17 00:00:00 2001 From: Jamie Cameron Date: Sat, 1 Oct 2022 17:07:53 -0700 Subject: [PATCH] Remove start/stop messages option from configs, as it can be determined by the OS --- init/config-aix | 1 - init/config-hpux | 1 - init/config-osf1 | 1 - init/config-syno-linux | 1 - init/config.info | 1 - init/config.info.ca | 1 - init/config.info.cs | 1 - init/config.info.de | 1 - init/config.info.es | 1 - init/config.info.eu | 1 - init/config.info.fa | 1 - init/config.info.fr | 1 - init/config.info.ja | 1 - init/config.info.ko | 1 - init/config.info.nl | 1 - init/config.info.no | 1 - init/config.info.pl | 1 - init/config.info.ru | 1 - init/config.info.sv | 1 - init/config.info.tr | 1 - init/config.info.uk | 1 - init/config.info.zh | 1 - init/config.info.zh_TW | 1 - init/edit_action.cgi | 2 +- init/init-lib.pl | 6 ++++++ init/save_action.cgi | 4 ++-- 26 files changed, 9 insertions(+), 26 deletions(-) diff --git a/init/config-aix b/init/config-aix index aabee4df4..f7b931682 100644 --- a/init/config-aix +++ b/init/config-aix @@ -1,7 +1,6 @@ show_opts=0 inittab_id=init expert=0 -start_stop_msg=0 reboot_command=reboot shutdown_command=shutdown -Fh soft_links=1 diff --git a/init/config-hpux b/init/config-hpux index 249c38f9f..7bb7e2dca 100644 --- a/init/config-hpux +++ b/init/config-hpux @@ -1,4 +1,3 @@ -start_stop_msg=1 soft_links=1 show_opts=0 init_base=/sbin diff --git a/init/config-osf1 b/init/config-osf1 index fc8d07abe..22a7c66ca 100644 --- a/init/config-osf1 +++ b/init/config-osf1 @@ -2,7 +2,6 @@ daemons_dir= show_opts=0 inittab_id=is expert=0 -start_stop_msg=1 reboot_command=reboot shutdown_command=init 0 soft_links=1 diff --git a/init/config-syno-linux b/init/config-syno-linux index 3588f2d13..8623a4cef 100644 --- a/init/config-syno-linux +++ b/init/config-syno-linux @@ -10,7 +10,6 @@ reboot_command=/sbin/poweroff inittab_id=id expert=0 soft_links=1 -start_stop_msg=0 status_check=1 boot_levels=2 3 5 no_chkconfig=1 diff --git a/init/config.info b/init/config.info index c2080511a..aaf91cb97 100644 --- a/init/config.info +++ b/init/config.info @@ -15,7 +15,6 @@ local_script=Local startup commands script,3 local_down=Local shutdown commands script,3,None reboot_command=Command to reboot the system,0 shutdown_command=Command to shutdown the system,0 -start_stop_msg=System supports bootup/shutdown messages,1,0-No,1-Yes inittab_id=inittab ID for bootup runlevel,0 daemons_dir=Caldera daemons directory,3,None no_chkconfig=Use chkconfig command to enable actions?,1,0-Yes,1-No diff --git a/init/config.info.ca b/init/config.info.ca index e61b5e301..ca9f4791c 100644 --- a/init/config.info.ca +++ b/init/config.info.ca @@ -15,7 +15,6 @@ local_script=Script local d'execució d'ordres,3 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 -start_stop_msg=El sistema suporta missatges d'engegada/tancament,1,0-No,1-Sí inittab_id=ID d'inittab per al nivell d'engegada per omissió,0 daemons_dir=Directori de dimonis de Caldera,3,Cap no_chkconfig=Utilitza l'ordre chkconfig per activar les accions,1,0-Sí,1-No diff --git a/init/config.info.cs b/init/config.info.cs index 28d44b4f7..73d9db9d1 100644 --- a/init/config.info.cs +++ b/init/config.info.cs @@ -14,7 +14,6 @@ local_script=Skript lokálních spouštěcích příkazů,3 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 -start_stop_msg=Podporuje systém bootup/shutdown zprávy?,1,0-ne,1-ano inittab_id=ID inittabu pro bootovací úroveň běhu,0 daemons_dir=Adresář Caldera démonů,3,Nic no_chkconfig=Použít příkaz chkconfig pro povolení akcí?,1,0-Ano,1-Ne diff --git a/init/config.info.de b/init/config.info.de index f23c04926..c03f096ca 100644 --- a/init/config.info.de +++ b/init/config.info.de @@ -15,7 +15,6 @@ local_script=Lokales Start-Skript,3 local_down=Lokales Shutdown-Skript,3,Keines reboot_command=Kommando zum Neustart des Systems,0 shutdown_command=Kommando zum Herunterfahren des Systems,0 -start_stop_msg=System unterstützt 'Bootup-/Shutdown-' Nachrichten,1,0-Nein,1-Ja inittab_id=Inittab-ID für Bootup-Runlevel,0 daemons_dir=Caldera-Verzeichnis für Daemonen,3,Keines no_chkconfig=Benutze chkconfig-Befehl, um Aktionen zu aktivieren?,1,0-Ja,1-Nein diff --git a/init/config.info.es b/init/config.info.es index 24c7ad108..9f1e5902a 100644 --- a/init/config.info.es +++ b/init/config.info.es @@ -14,7 +14,6 @@ local_script=Script de comandos de arranque local,3 local_down=Script de comandos de apagado local,3,Ninguno reboot_command=Comando para rearrancar el sistema,0 shutdown_command=Comando para apagar el sistema,0 -start_stop_msg=El sistema soporta mensajes de arranque/parada,1,0-No,1-Sí inittab_id=ID de inittab para nivel de ejecución en arranque,0 daemons_dir=Directorio de demonios de Caldera,3,Ninguno startup_dirs=Directorios de Elementos de arranque de Darwin,0 diff --git a/init/config.info.eu b/init/config.info.eu index a57f62dbf..2f3b984c6 100644 --- a/init/config.info.eu +++ b/init/config.info.eu @@ -14,7 +14,6 @@ local_script=Abiatze lokalerako scripten komandoak,3 local_down=Itzalera lokalerako scripten komandoak3,Ezer ez reboot_command=Sistema berrabiarazteko komandoa,0 shutdown_command=Sistema itzaltzeko komandoa,0 -start_stop_msg=Sistemak abiatze/itzaltze mezuak onartzen ditu1,0-Ez,1-Bai inittab_id=Abiatzeko unerako inittab-en ID-a exekuzio-mailarentzat daemons_dir=Caldera deabruen katalogoa,3,Ezer ez no_chkconfig=Ekintzak gaitzeko chkconfig komandoa erabili?,1,0-Bai,1-Ez diff --git a/init/config.info.fa b/init/config.info.fa index bfabef620..f9a7bdb43 100644 --- a/init/config.info.fa +++ b/init/config.info.fa @@ -14,7 +14,6 @@ local_script=دست نوشته فرمانهاي راه‌اندازي محلي local_down=دست نوشته فرمانهاي خاموش محلي,3,هيچ reboot_command=فرماني جهت بازآغازي سيستم,0 shutdown_command=فرماني جهت خاموش کردن سيستم,0 -start_stop_msg=آيا سيستم از پيغامهاي راه‌اندازي/خاموش کردن پشتيباني کند؟,1,0-خير,1-بله inittab_id=مقدار اوليه ID براي اجراي سطح1,0 daemons_dir=فهرست راهنماي شبحهاي caldera,3,هيچ startup_dirs=فهرست راهنما اقلام راه‌اندازي darwin,0 diff --git a/init/config.info.fr b/init/config.info.fr index 755bd1686..c18e4f433 100644 --- a/init/config.info.fr +++ b/init/config.info.fr @@ -13,7 +13,6 @@ boot_levels=Niveaux de demarrage creent nouvelles actions dans,3,/etc/inittab local_script=Script local de démarrage,3 reboot_command=Commande pour redémarrer le système,0 shutdown_command=Commande pour arrêter le système,0 -start_stop_msg=Le système supporte les messages de démarrage et d'arrêt,1,0-Non,1-Oui inittab_id=Numéro du niveau d'exécution du démarrage,0 daemons_dir=Repertoire des demons Caldera,3,Aucun startup_dirs=Repertoires des StartupItems Darwin,0 diff --git a/init/config.info.ja b/init/config.info.ja index b80c9b2ab..53899f095 100644 --- a/init/config.info.ja +++ b/init/config.info.ja @@ -14,7 +14,6 @@ local_script=ローカルなスタートアップ用コマンドのスクリプ local_down=ローカルなシャットダウン用コマンドのスクリプト,3,なし reboot_command=再起動コマンド,0 shutdown_command=シャットダウンコマンド,0 -start_stop_msg=システムがbootup/shutdownメッセージをサポートしていますか?,1,0-いいえ,1-はい inittab_id=起動ランレベルのinittab ID,0 daemons_dir=Caldera daemonのディレクトリ,3,無し no_chkconfig=Use chkconfig command to enable actions?,1,0-はい,1-いいえ diff --git a/init/config.info.ko b/init/config.info.ko index 948eed030..939c01ab0 100644 --- a/init/config.info.ko +++ b/init/config.info.ko @@ -14,7 +14,6 @@ local_script=로컬 시작 명령 스크립트,3 local_down=로컬 셧다운 명령 스크립트,3,없음 reboot_command=시스템 리부트 명령,0 shutdown_command=시스템 셧다운 명령,0 -start_stop_msg=bootup/shutdown 메시지를 제공하겠습니까?1,0-아니오,1-예 inittab_id=bootup 실행레벨의 inittab ID,0 daemons_dir=칼데라 데몬 디렉토리,3,없음 no_chkconfig=동작을 활성화 하기 위해 chkconfig 명령 사용,1,0-예,1-아니오 diff --git a/init/config.info.nl b/init/config.info.nl index c277c6858..c3e062863 100644 --- a/init/config.info.nl +++ b/init/config.info.nl @@ -14,7 +14,6 @@ local_script=Lokaal Opstart opdrachten script,3 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 -start_stop_msg=Systeem ondersteunende boot / uitschakel berichten,1,0-Nee,1-Ja inittab_id=inittab ID voor bootup runlevel,0 daemons_dir=Caldera daemons directory,3,Geen no_chkconfig=Gebruik de chkconfig opdracht om acties aan te zetten?,1,0-Ja,1-Nee diff --git a/init/config.info.no b/init/config.info.no index cf84b5377..fedcb0d38 100644 --- a/init/config.info.no +++ b/init/config.info.no @@ -15,7 +15,6 @@ local_script=Lokalt script med oppstartskommandoer,3 local_down=Lokalt script med shutdown kommandoer,3,Ingen reboot_command=Kommando for å omstarte systemet,0 shutdown_command=Kommando for å slå av systemet,0 -start_stop_msg=Systemet støtter oppstart/avstengings meldinger,1,0-Nei,1-Ja inittab_id=inittab ID for oppstarts kjørenivå,0 daemons_dir=Caldera daemons katalog,3,Ingen no_chkconfig=Bruk chkconfig kommando for å aktivere handlinger?,1,0-Ja,1-Nei diff --git a/init/config.info.pl b/init/config.info.pl index 59c4c7ac0..0613851b8 100644 --- a/init/config.info.pl +++ b/init/config.info.pl @@ -13,7 +13,6 @@ local_script=Lokalny skrypt poleceń startowych,3 local_down=Lokalny skrypt poleceń wyłączania,3,Brak reboot_command=Polecenie restartujące system,0 shutdown_command=Polecenie zamykające system,0 -start_stop_msg=System wspomaga komunikaty startowe/zamykające,1,0-Nie,1-Tak inittab_id=ID inicjalnego poziomu pracy w inittab-ie,0 daemons_dir=Katalog demonów Caldery,3,Brak no_chkconfig=Użyć polecenie chkconfig do włączania akcji?,1,0-Tak,1-Nie diff --git a/init/config.info.ru b/init/config.info.ru index c3bcbeb07..37edf29a7 100644 --- a/init/config.info.ru +++ b/init/config.info.ru @@ -14,7 +14,6 @@ local_script=Сценарий локальных команд загрузки local_down=Сценарий локальных команд выключения системы,3,Нет reboot_command=Команда для перезагрузки системы,0 shutdown_command=Команда для завершения работы системы,0 -start_stop_msg=Система поддерживает сообщения загрузки/завершения работы,1,0-Нет,1-Да inittab_id=Имя процесса inittab, задающего режим работы,0 daemons_dir=Каталог служб Caldera,3,Нет no_chkconfig=Использовать команду chkconfig при включении сценария?,1,0-Да,1-Нет diff --git a/init/config.info.sv b/init/config.info.sv index 1107fcaa4..5014c931c 100644 --- a/init/config.info.sv +++ b/init/config.info.sv @@ -8,6 +8,5 @@ order_digits=Antal siffror i utförandeordning,0 local_script=Lokalt startkommandoscript,3 reboot_command=Kommando för att starta om systemet,0 shutdown_command=Kommando för att stänga av systemet,0 -start_stop_msg=Systemet stödjer omstarts-/avstängningsmeddelanden,1,0-Nej,1-Ja inittab_id=inittab-ID för startkörnivå,0 daemons_dir=Katalog för Caldera-demoner,3,Ingen diff --git a/init/config.info.tr b/init/config.info.tr index 294a4e2b5..0a1750e14 100644 --- a/init/config.info.tr +++ b/init/config.info.tr @@ -7,6 +7,5 @@ order_digits=İşlem sıralamasındaki rakam sayısı,0 local_script=Yerel başlangıç komutları betiği,3 reboot_command=Sistemi yeniden başlatma komutu,0 shutdown_command=Sistemi kapatma komutu,0 -start_stop_msg=Sistem açılış/kapanış mesajlarını desteklesin,1,0-Hayır,1-Evet inittab_id=Açılış çalışma seviyesi için inittab ID ,0 daemons_dir=Caldera daemon'ları dizini,3,Hiçbiri diff --git a/init/config.info.uk b/init/config.info.uk index 021319229..d3a62f524 100644 --- a/init/config.info.uk +++ b/init/config.info.uk @@ -10,7 +10,6 @@ order_digits=Кількість цифр черговості виконання local_script=Сценарій локальних команд завантаження системи,3 reboot_command=Команда для перезавантаження системи,0 shutdown_command=Команда для завершення роботи системи,0 -start_stop_msg=Система підтримує повідомлення завантаження/завершення роботи,1,0-немає,1-да inittab_id=Ім'я процесу inittab, режим роботи, що задає,0 daemons_dir=Каталог служб Caldera,3,Немає startup_dirs=Каталоги Darwin StartupItems,0 diff --git a/init/config.info.zh b/init/config.info.zh index f53b66d03..87238b7f3 100644 --- a/init/config.info.zh +++ b/init/config.info.zh @@ -7,6 +7,5 @@ order_digits=执行顺序的数字个数,0 local_script=本地启动命令脚本,3 reboot_command=重启系统命令,0 shutdown_command=关机命令,0 -start_stop_msg=系统支持启动/关机信息,1,0-不,1-是 inittab_id=引导级别的inittab ID,0 daemons_dir=Caldera 守护进程目录,3,None diff --git a/init/config.info.zh_TW b/init/config.info.zh_TW index 5a0133099..91f195e5d 100644 --- a/init/config.info.zh_TW +++ b/init/config.info.zh_TW @@ -8,7 +8,6 @@ order_digits=命令順序的位置,0 local_script=本地端啟動指令稿,3 reboot_command=重新開機的命令,0 shutdown_command=關閉系統的命令,0 -start_stop_msg=系統是否支援 開機/關機 訊息,1,0-否,1-是 inittab_id=開機執行階層在 inittab 中的編號,0 daemons_dir=Caldera 守護器目錄,3,無 startup_dirs=達爾文(Darwin)開機項目目錄,0 diff --git a/init/edit_action.cgi b/init/edit_action.cgi index 95f7e209f..bc62eee2e 100755 --- a/init/edit_action.cgi +++ b/init/edit_action.cgi @@ -62,7 +62,7 @@ if ($ty == 2) { print &ui_table_row($text{'edit_desc'}, &ui_textarea("desc", undef, 2, 80)); - if ($config{'start_stop_msg'}) { + if ($supports_start_stop_msg) { print &ui_table_row($text{'edit_startmsg'}, &ui_textbox("start_msg", undef, 40)); diff --git a/init/init-lib.pl b/init/init-lib.pl index 0972d97a0..c15ecdc5c 100755 --- a/init/init-lib.pl +++ b/init/init-lib.pl @@ -75,6 +75,12 @@ elsif ($config{'local_script'}) { elsif ($gconfig{'os_type'} eq 'windows') { $init_mode = "win32"; } +if ($init_mode eq "init" && $gconfig{'os_type'} =~ /^(osf1|hpux)$/) { + $supports_start_stop_msg = 1; + } +else { + $supports_start_stop_msg = 0; + } =head2 runlevel_actions(level, S|K) diff --git a/init/save_action.cgi b/init/save_action.cgi index d903d21cb..38c53f379 100755 --- a/init/save_action.cgi +++ b/init/save_action.cgi @@ -196,7 +196,7 @@ else { } } $data .= "\ncase \"\$1\" in\n"; - if ($config{'start_stop_msg'}) { + if ($supports_start_stop_msg) { $data .= "'start_msg')\n"; $data .= "\techo \"$in{'start_msg'}\"\n"; $data .= "\t;;\n"; @@ -222,7 +222,7 @@ else { } $data .= "\t;;\n"; $data .= "*)\n"; - if ($config{'start_stop_msg'}) { + if ($supports_start_stop_msg) { $data .= "\techo \"Usage: \$0 { start | stop | start_msg | stop_msg }\"\n"; } else {