diff --git a/time/config-*-linux b/time/config-*-linux index a79712568..15c79d175 100644 --- a/time/config-*-linux +++ b/time/config-*-linux @@ -1,5 +1,4 @@ lease=5 -hwtime=2 seconds=1 timeserver_hardware=1 zone_style=linux diff --git a/time/config-freebsd b/time/config-freebsd index 4e17aa124..1e5e82a0c 100644 --- a/time/config-freebsd +++ b/time/config-freebsd @@ -1,5 +1,4 @@ lease=5 -hwtime=0 seconds=2 timeserver_hardware=1 zone_style=freebsd diff --git a/time/config-hpux b/time/config-hpux index 79d880cf9..e7df15a57 100644 --- a/time/config-hpux +++ b/time/config-hpux @@ -1,5 +1,4 @@ lease=5 -hwtime=0 seconds=0 timeserver_hardware=1 ntp_only=1 diff --git a/time/config-irix b/time/config-irix index d3bd0f600..cd3b5e557 100644 --- a/time/config-irix +++ b/time/config-irix @@ -1,5 +1,4 @@ lease=5 -hwtime=0 seconds=1 timeserver_hardware=1 ntp_only=1 diff --git a/time/config-macos b/time/config-macos index aeb998b04..ac2d15a85 100644 --- a/time/config-macos +++ b/time/config-macos @@ -1,5 +1,4 @@ lease=5 -hwtime=0 seconds=2 timeserver_hardware=1 ntp_only=1 diff --git a/time/config-netbsd b/time/config-netbsd index aeb998b04..ac2d15a85 100644 --- a/time/config-netbsd +++ b/time/config-netbsd @@ -1,5 +1,4 @@ lease=5 -hwtime=0 seconds=2 timeserver_hardware=1 ntp_only=1 diff --git a/time/config-openserver b/time/config-openserver index 79d880cf9..e7df15a57 100644 --- a/time/config-openserver +++ b/time/config-openserver @@ -1,5 +1,4 @@ lease=5 -hwtime=0 seconds=0 timeserver_hardware=1 ntp_only=1 diff --git a/time/config-redhat-linux b/time/config-redhat-linux index 150a31f1c..e9bc97e7c 100644 --- a/time/config-redhat-linux +++ b/time/config-redhat-linux @@ -1,5 +1,4 @@ lease=5 -hwtime=1 seconds=1 timeserver_hardware=1 zone_style=linux diff --git a/time/config-solaris b/time/config-solaris index 4296ec4f8..47e5b549b 100644 --- a/time/config-solaris +++ b/time/config-solaris @@ -1,5 +1,4 @@ lease=5 -hwtime=0 seconds=1 timeserver_hardware=1 zone_style=solaris diff --git a/time/config.info b/time/config.info index 859d98501..123f197af 100644 --- a/time/config.info +++ b/time/config.info @@ -3,7 +3,6 @@ lease=Acceptable number seconds of delay between system time and hardware time,0 timeserver=Default time server,3,None ntp_only=Only use NTP for time synchronization?,1,1-Yes,0-No line2=System configuration,11 -hwtime=System supports hardware time,1,1-Yes,0-No,2-Detect automatically seconds=System time setting format,1,1-MMDDHHMMYYYY.SS,0-MMDDHHMMYY,2-YYYYMMDDHHMM.SS zone_style=Timezone configuration method,4,linux-Linux,freebsd-FreeBSD,solaris-Solaris,-<Not supported on this OS> hwclock_flags=Command-line flags for hwclock,10,-None,sysconfig-From /etc/sysconfig/clock diff --git a/time/config.info.ca b/time/config.info.ca index e2156e307..388110950 100644 --- a/time/config.info.ca +++ b/time/config.info.ca @@ -3,7 +3,6 @@ lease=Nombre de segons de retard acceptables entre l'hora del sistema i l'hora d timeserver=Servidor horari per defecte,3,Cap ntp_only=Utilitza NTP noms per a la sincronitzaci horria,1,1-S,0-No line2=Configuraci del sistema,11 -hwtime=El sistema suporta hora del maquinari,1,1-S,0-No,2-Detecta-ho automticament seconds=Format de l'hora del sistema,1,1-MMDDHHMMAAAA.SS,0-MMDDHHMMAA,2-AAAAMMDDHHMM.SS zone_style=Mtode de configuraci de zones horries,linux-Linux,freebsd-FreeBSD,solaris-Solaris,-<No suportat en aquest SO> hwclock_flags=Arguments de la lnia d'ordres de hwclock,10,-Cap,sysconfig-De /etc/sysconfig/clock diff --git a/time/config.info.cz b/time/config.info.cz index 35c90e234..80d9abc41 100644 --- a/time/config.info.cz +++ b/time/config.info.cz @@ -3,7 +3,6 @@ lease=Akceptovateln timeserver=Vchoz as serveru,3,Nic ntp_only=Pout pouze NTP pro asovou synchronizaci?,1,1-Ano,0-Ne line2=Konfigurace systmu,11 -hwtime=Systm podporuje hardwarov as?,1,1-ano,0-ne seconds=Formt nastaven systmovho asu,1,1-MMDDHHMMYYYY.SS,0-MMDDHHMMYY,2-YYYYMMDDHHMM.SS zone_style=Metoda konfigurace asov zny,4,linux-Linux,freebsd-FreeBSD,solaris-Solaris,-<Nen v tomto OS podporovn> hwclock_flags=Signly pkazovho dku pro hw hodiny,10,-Nic,sysconfig-Z /etc/sysconfig/clock diff --git a/time/config.info.de b/time/config.info.de index d2a349c91..b85969789 100644 --- a/time/config.info.de +++ b/time/config.info.de @@ -3,7 +3,6 @@ lease=Akzeptabler Unterschied in Sekunden zwischen System- und Hardwarezeit, timeserver=Standard Zeit-Server,3,Keiner ntp_only=Nur NTP für Zeitsynchronisation benutzen?,1,1-Ja,0-Nein line2=Systemkonfiguration,11 -hwtime=System unterstützt Hardwarezeit,1,1-Ja,0-Nein,2-Automatisch erkennen seconds=Format der Systemzeit,1,1-MMDDHHMMYYYY.SS,0-MMDDHHMMYY,2-YYYYMMDDHHMM.SS zone_style=Zeitzonen Konfigurationsmethode,4,linux-Linux,freebsd-FreeBSD,solaris-Solaris,-<Nicht auf diesem System unterstützt> hwclock_flags=Kommandozeilenoptionen für hwclock,10,-Kein,sysconfig-Aus /etc/sysconfig/clock diff --git a/time/config.info.es b/time/config.info.es index ebc26a796..aad359d69 100644 --- a/time/config.info.es +++ b/time/config.info.es @@ -3,7 +3,6 @@ lease=Número de segundos de retraso aceptables entre la hora del sistema y timeserver=Servidor horario por defecto,3,Ninguno ntp_only=¿Usar sólo NTP para sincronización horaria?,1,1-Sí,0-No line2=Configuracion del sistema,11 -hwtime=El sistema soporta hora por hardware,1,1-Sí,0-No seconds=Formato de ajuste de hora de sistema,1,1-MMDDHHMMYYYY.SS,0-MMDDHHMMYY,2-YYYYMMDDHHMM.SS zone_style=Método de configuración de zona horaria,4,linux-Linux,freebsd-FreeBSD,solaris-Solaris,-<No soportado en este OS> hwclock_flags=Flags de linea de comandos para hwclock,10,-Ninguno,sysconfig-Desde /etc/sysconfig/clock diff --git a/time/config.info.fa b/time/config.info.fa index 38598e553..3574fc4cd 100644 --- a/time/config.info.fa +++ b/time/config.info.fa @@ -4,7 +4,6 @@ lease=تعداد ثانيه‌هاي قابل قبول براي تاخير بي timeserver=کارساز زمان پيش‌گزيده،3،هيچ ntp_only=آيا فقط از NTPبراي همگام سازي زمان استفاده شود؟،1،1-بله،0-خير line2=پيکربندي سيستم،11 -hwtime=آيا سيستم از زمان سخت افزار پشتيباني کند؟،1،1-بله،0-خير seconds=قالب تنظيمات زمان سيستم،1،1-MMDDHHMMYYYY.SS،0-MMDDHHMMYY،2-YYYYMMDDHHMM.SS zone_style=روش پيکربندي زمان منطقه،4،linux-Linux،freebsd-FreeBSD،solaris-Solaris،-<برروي اين OS> پشتيباني نمي‌شود; hwclock_flags=خط فرمان نشانها براي، ساعت سخت افزاري،10،-هيچ،از رويsysconfig-From /etc/sysconfig/clock diff --git a/time/config.info.fr b/time/config.info.fr index d2f6b5bc6..7f7358ea5 100644 --- a/time/config.info.fr +++ b/time/config.info.fr @@ -3,6 +3,5 @@ lease=Nombre de secondes acceptable entre l'heure système et l'heure mat timeserver=Serveur de temps par defaut,3,Aucun ntp_only=N'utiliser que le protocole NTP lors de la synchronisation de l'heure et de la date ? line2=Configuration du systeme,11 -hwtime=Le système supporte le temps Matériel,1,1-Oui,0-Non seconds=Format de parametrage du temps System,1,1-MMDDHHMMYYYY.SS,0-MMDDHHMMYY,2-YYYYMMDDHHMM.SS zone_style=Méthode de configuration du fuseau horaire,4,linux-Linux,freebsd-FreeBSD,solaris-Solaris,-<Non supporté par ce systèmeOS> diff --git a/time/config.info.hu b/time/config.info.hu index 4a00e34f7..c5b2cd44c 100644 --- a/time/config.info.hu +++ b/time/config.info.hu @@ -3,7 +3,6 @@ lease=Elfogadhat timeserver=alaprtelmezett idszerver,3,Nincs ntp_only=Csak NTP protokoll hasznlata idszinkronizlshoz?,1,1-Igen,0-Nem line2=Rendszer konfigurci -hwtime=Rendszer tmogatja a hardveridt,1,1-Igen,0-Nem seconds=Rendszerid formtuma,1,1-MMDDHHMMYYYY.SS,0-MMDDHHMMYY,2-YYYYMMDDHHMM.SS zone_style=Idzna belltsi eljrs:,4,linux-Linux,freebsd-FreeBSD,solaris-Solaris,-<Nem tmogatja ez az OS> hwclock_flags=Parancs-sori zszl a hwclock -hoz,10,-nincs,sysconfig-A /etc/sysconfig/clock -rl diff --git a/time/config.info.it b/time/config.info.it index 9a0169809..45a90d2fe 100644 --- a/time/config.info.it +++ b/time/config.info.it @@ -3,7 +3,6 @@ lease=Numero di secondi di ritardo tra l'ora di sistema e l'ora hardware conside timeserver=Time server di default,3,Nessuno ntp_only=Usare solo NTP per la sincronizzazione dell'ora?,1,1-Si,0-No line2=Configurazione di sistema,11 -hwtime=Il sistema supporta l'ora hardware,1,1-Si,0-No seconds=Formato dell'ora di sistema,1,1-MMDDHHMMYYYY.SS,0-MMDDHHMMYY,2-YYYYMMDDHHMM.SS zone_style=Metodo di configurazione del fuso orario,4,linux-Linux,freebsd-FreeBSD,solaris-Solaris,-<Non supportato su questo sistema> hwclock_flags=Flag a linea di comando per l'orologio hardware,10,-Nessuno,sysconfig-Da /etc/sysconfig/clock diff --git a/time/config.info.ja_JP.euc b/time/config.info.ja_JP.euc index 199b51904..e437cc068 100644 --- a/time/config.info.ja_JP.euc +++ b/time/config.info.ja_JP.euc @@ -2,7 +2,6 @@ line1= lease=ƥפȥϡɥפȤεƸ,0 timeserver=ǥեȤΥॵС,3,ʤ line2=ƥ,11 -hwtime=ϡɥץݡ,1,1-,0-ʤ seconds=ƥॿ,1,1-MMDDHHMMYYYY.SS,0-MMDDHHMMYY zonelink=ॾե,0 zonetab=ǽʥॾΥꥹ,0 diff --git a/time/config.info.ko_KR.euc b/time/config.info.ko_KR.euc index 1ff28c77a..53d5b6ff6 100644 --- a/time/config.info.ko_KR.euc +++ b/time/config.info.ko_KR.euc @@ -3,7 +3,6 @@ lease= timeserver=⺻ Ÿ ,3, ntp_only=ð ȭ NTP ϰڽϱ?,1,1-,0-ƴϿ line2=ý ,11 -hwtime=ý ϵ ð ,1,1-,0-ƴϿ seconds=ý ð ,1,1-MMDDHHMMYYYY.SS,0-MMDDHHMMYY,2-YYYYMMDDHHMM.SS zone_style=ð 4,linux-Linux,freebsd-FreeBSD,solaris-Solaris,-< OS > hwclock_flags=hwclock ɼ,10,-,syscnofig-/etc/sysconfig/clock diff --git a/time/config.info.ms b/time/config.info.ms index 0af6913b2..8501a0d2a 100644 --- a/time/config.info.ms +++ b/time/config.info.ms @@ -2,7 +2,6 @@ line1=Pilihan boleh konfigurasi,11 lease=Bilangan saat lengah yang boleh diterima antara masa sistem dan masa perkakasan,0 timeserver=Pelayan masa default,3,Tiada line2=Konfigurasi sistem,11 -hwtime=Sistem menyokong masa perkakasan,1,1-Ya,0-Tidak seconds=Format tetapan masa sistem,1,1-MMDDHHMMYYYY.SS,0-MMDDHHMMYY,2-YYYYMMDDHHMM.SS zonelink=Fail zonmasa,0 zonetab=Fail senarai zonmasa yang mungkin,0 diff --git a/time/config.info.ms_MY b/time/config.info.ms_MY index dba42547a..aec99949f 100644 --- a/time/config.info.ms_MY +++ b/time/config.info.ms_MY @@ -3,7 +3,6 @@ lease=Bilangan saat lengah yang boleh diterima antara masa sistem dan masa perka timeserver=Pelayan masa default,3,Tiada ntp_only=Hanya gunakan NTP untuk penyegerakan masa?,1,1-Ya,0-Tidak line2=Konfigurasi sistem,11 -hwtime=Sistem menyokong masa perkakasan,1,1-Ya,0-Tidak seconds=Format tetapan masa sistem,1,1-MMDDHHMMYYYY.SS,0-MMDDHHMMYY,2-YYYYMMDDHHMM.SS zone_style=Kaedah konfigurasi zon waktu,4,linux-Linux,freebsd-FreeBSD,solaris-Solaris,-<Tidak disokong oleh sistem operasi ini> hwclock_flags=Baris arahan serasi untuk hwclock,10,-Tiada,sysconfig-Dari /etc/sysconfig/clock diff --git a/time/config.info.nl b/time/config.info.nl index bd9979f17..bef77fae9 100644 --- a/time/config.info.nl +++ b/time/config.info.nl @@ -3,7 +3,6 @@ lease=Geaccepteerd aantal seconden vertraging tussen systeemtijd en hardware-tij timeserver=Standaard tijd server,3,Geen ntp_only=Gebruik alleen NTP voor tijd synchronisatie?,1,1-Ja,0-Nee line2=Systeem configuratie,11 -hwtime=Systeem ondersteund hardware-tijd?,1,1-Ja,0-Nee,2-Detecteer automatisch seconds=Systeem tijd formaat,1,1-MMDDUUMMJJJJ.SS,0-MMDDUUMMJJ,2-JJJJMMDDUUMM.SS zone_style=Tijdzone configuratie methoden,4,linux-Linux,freebsd-FreeBSD,solaris-Solaris,-<Niet ondersteund op dit OS> hwclock_flags=Opdracht regel flags voor hwclock,10,-Geen,sysconfig-Van /etc/sysconfig/clock diff --git a/time/config.info.no b/time/config.info.no index 148179c80..e259acf7a 100644 --- a/time/config.info.no +++ b/time/config.info.no @@ -3,7 +3,6 @@ lease=Akseptabelt antall sekunders avvik mellom systemtid og maskinvaretid,0 timeserver=Standard tids-tjener,3,Ingen ntp_only=Bruk bare NTP for synkronisering av tid?,1,1-Ja,0-Nei line2=System konfigurasjon,11 -hwtime=Systemet støtter maskinvaretid,1,1-Ja,0-Nei,2-Oppdag automatisk seconds=Format for setting av systemtid,1,1-MMDDHHMMYYYY.SS,0-MMDDHHMMYY,2-YYYYMMDDHHMM.SS zone_style=Metode for tidssone konfigurering,4,linux-Linux,freebsd-FreeBSD,solaris-Solaris,-<Støttes ikke på dette OSet> hwclock_flags=Kommando-linje flagg for hwclock,10,-Ingen,sysconfig-Fra /etc/sysconfig/clock diff --git a/time/config.info.pl b/time/config.info.pl index 861b64b8c..5d938d010 100755 --- a/time/config.info.pl +++ b/time/config.info.pl @@ -3,7 +3,6 @@ lease=Dozwolona liczba sekund r timeserver=Domylny serwer czasu,3,Brak ntp_only=Uy tylko NTP do synchronizacji czasu?,1,1-Tak,0-Nie line2=Konfiguracja systemu,11 -hwtime=System obsuguje czas sprztowy,1,1-Tak,0-Nie seconds=Format dla ustawiania czasu systemowego,1,1-MMDDGGMMRRRR.SS,0-MMDDGGMMRR,2-RRRRMMDDGGMM.SS zone_style=Metoda konfiguracji strefy czasowej,4,linux-Linux,freebsd-FreeBSD,solaris-Solaris,-<Nie obsugiwany na tym systemie operacyjnym> hwclock_flags=Flagi linii polece dla hwclock,10,-Brak,sysconfig-Z /etc/sysconfig/clock diff --git a/time/config.info.pt_BR b/time/config.info.pt_BR index 057f96ce5..789574c40 100644 --- a/time/config.info.pt_BR +++ b/time/config.info.pt_BR @@ -3,7 +3,6 @@ lease=Tempo aceit timeserver=Servidor de horrio padro,3,Nenhum ntp_only=Usar s NTP para sincronizao da hora?,1,1-Sim,0-No line2=Configurao do sistema,11 -hwtime=Sistema suporta hora do hardware,1,1-Sim,0-No seconds=Formato da configurao de hora do sistema,1,1-MMDDHHMMYYYY.SS,0-MMDDHHMMYY,2-YYYYMMDDHHMM.SS zone_style=Mtodo de configurao de fuso-horrio,4,linux-Linux,freebsd-FreeBSD,solaris-Solaris,-<No suportado neste sistema operacional> hwclock_flags=Flags de linhas de comando para hwclock,10,-Nenhuma,sysconfig-Importar de /etc/sysconfig/clock diff --git a/time/config.info.ru_RU b/time/config.info.ru_RU index 6c43c9d76..42a8f4d8b 100644 --- a/time/config.info.ru_RU +++ b/time/config.info.ru_RU @@ -1,5 +1,4 @@ lease= ,0 -hwtime= ,1,1-,0-,2- seconds= ,1,1-.,0-,2-. line1= ,11 line2= ,11 diff --git a/time/config.info.ru_SU b/time/config.info.ru_SU index 4152ec50d..bf5711c17 100644 --- a/time/config.info.ru_SU +++ b/time/config.info.ru_SU @@ -3,7 +3,6 @@ lease= timeserver= ,3, ntp_only= NTP?,1,1-,0- line2= ,11 -hwtime= ,1,1-,0-,2- seconds= ,1,1-.,0-,2-. zone_style= ,4,linux-Linux,freebsd-FreeBSD,solaris-Solaris,-< > hwclock_flags= ,10,-,sysconfig- /etc/sysconfig/clock diff --git a/time/config.info.sk b/time/config.info.sk index d7518466e..164fdbafd 100644 --- a/time/config.info.sk +++ b/time/config.info.sk @@ -3,7 +3,6 @@ lease=Akceptovate timeserver=tandardn asov server,3,iadny ntp_only=Pouva len NTP pre synchronizciu asu?,1,1-no,0-Nie line2=Systmov konfigurcia,11 -hwtime=Systm podporuje hardvrov as,1,1-no,0-Nie seconds=Formt systmovho asu ,1,1-MMDDHHMMRRRR.SS,0-MMDDHHMMRR,2-RRRRMMDDHHMM.SS zone_style=Metda konfigurcie asovej zny,4,linux-Linux,freebsd-FreeBSD,solaris-Solaris,-<Nepodporovan na tomto OS> hwclock_flags=Parametre pre hwclock,10,iadne,sysconfig-z /etc/sysconfig/clock diff --git a/time/config.info.sv b/time/config.info.sv index 8068fcd43..401b5979e 100644 --- a/time/config.info.sv +++ b/time/config.info.sv @@ -1,6 +1,5 @@ lease=Accepterad frdrjning mellan systemtid och hrdvarutid (sekunder),0 timeserver=Standardtidserver,3,Ingen -hwtime=Systemet stder hrdvarutid,1,1-Ja,0-Nej seconds=Systemtidsformat,1,1-MMDDTTMM.SS,0-MMDDTTMM zonelink=Tidszonfil,0 zonetab=Fil med tidszoner,0 diff --git a/time/config.info.tr b/time/config.info.tr index 3ed9eb30a..cb042e89c 100644 --- a/time/config.info.tr +++ b/time/config.info.tr @@ -2,6 +2,5 @@ line1=Yap lease=Sistem ve donanm saatleri arasndaki kabul edilebilir fark(saniye),0 timeserver=ntanml zaman sunucusu,3,Hibiri line2=Sistem yaplandrmas,11 -hwtime=Sistem donanm saatini desteklesin mi?,1,1-Evet,0-Hayr seconds=Sistem zaman ayar biimi,1,1-AAGGSSDDYYYY.SS,0-AAGGSSDDYY,2-YYYYAAGGSSDD.SS zone_style=Zaman dilimi yaplandrma metodu,4,linux-Linux,freebsd-FreeBSD,solaris-Solaris,-<Bu iletim sistemi desteklenmiyor> diff --git a/time/config.info.uk_UA b/time/config.info.uk_UA index d4a5e6e10..dbbf570b0 100644 --- a/time/config.info.uk_UA +++ b/time/config.info.uk_UA @@ -1,7 +1,6 @@ lease= ,0 zonedir= ,0 zonetab= ,0 -hwtime= ,1,1-,0- seconds= ,1,1-.,0-,2-. zonelink= ,0 line1= , ,11 diff --git a/time/config.info.zh_TW.Big5 b/time/config.info.zh_TW.Big5 index 0f604f09a..70f089637 100644 --- a/time/config.info.zh_TW.Big5 +++ b/time/config.info.zh_TW.Big5 @@ -2,7 +2,6 @@ line1= lease=ү౵tήɶPwɶ,0 timeserver=w]ɶA,3,L line2=tβպA,11 -hwtime=tΤ䴩wɶ,1,1-O,0-_ seconds=tήɶ榡,1,1-MMDDHHMMYYYY.SS,0-MMDDHHMMYY,2-YYYYMMDDHHMM.SS zonelink=ɰɮ,0 zonetab=i઺ɰɮ,0 diff --git a/time/index.cgi b/time/index.cgi index a9160577e..6fd97d733 100755 --- a/time/index.cgi +++ b/time/index.cgi @@ -24,11 +24,6 @@ if (!$access{'sysdate'} && !&has_command("date")) { &ui_print_footer("/", $text{'index'}); exit; } -if (!$access{'hwdate'} && $config{'hwtime'} == 1 && !&has_command("hwclock")) { - print &text( 'error_cnf', "hwclock"),"

\n"; - &ui_print_footer("/", $text{'index'}); - exit; - } # Show tabs for times, timezones and syncing @tabs = ( ); diff --git a/time/time-lib.pl b/time/time-lib.pl index 6cb38429d..c99b9b8ac 100755 --- a/time/time-lib.pl +++ b/time/time-lib.pl @@ -226,18 +226,10 @@ return ucfirst($weekday_names[$_[0]]); # Returns 1 if this system supports setting the hardware clock. sub support_hwtime { -if ($config{'hwtime'} == 1) { - return 1; - } -elsif ($config{'hwtime'} == 0) { - return 0; - } -else { - return &has_command("hwclock") && - &execute_command("hwclock") == 0 && - !&running_in_xen() && !&running_in_vserver() && - !&running_in_openvz() && !&running_in_zone(); - } +return &has_command("hwclock") && + &execute_command("hwclock") == 0 && + !&running_in_xen() && !&running_in_vserver() && + !&running_in_openvz() && !&running_in_zone(); } 1;