fixed runlevel of cbox-init-scripts
minor improvements of german interface at-call of 'box-init-bg' fixed delay of network reconfiguration reduced to 5 seconds
This commit is contained in:
parent
98e4b4e4b7
commit
e5a36943ce
|
@ -192,10 +192,9 @@ function check_at_command_queue()
|
|||
# 1) get the available job numbers
|
||||
# 2) remove empty lines (especially the last one)
|
||||
# 3) check every associated command for the regexp
|
||||
at -l | cut -f 1 -d " " | while read jobnum
|
||||
do at -c $jobnum | sed '/^$/d' | tail -1 | grep -q "$1" && return 0
|
||||
done
|
||||
return 1
|
||||
at -l | cut -f 1 | while read jobnum
|
||||
do at -c $jobnum | sed '/^$/d' | tail -1
|
||||
done | grep -q "$1"
|
||||
}
|
||||
|
||||
|
||||
|
@ -403,8 +402,8 @@ case "$ACTION" in
|
|||
;;
|
||||
update_ip_address )
|
||||
# reconfigure the network interface to a new IP address
|
||||
# wait for 15 seconds to finish present http requests
|
||||
echo -n "sleep 15; ifconfig $NET_IFACE `get_config ip`" | at now
|
||||
# wait for 5 seconds to finish present http requests
|
||||
echo -n "sleep 5; ifconfig $NET_IFACE `config_get_value ip`" | at now
|
||||
;;
|
||||
crypto-mount )
|
||||
mount_crypto
|
||||
|
|
|
@ -4,8 +4,8 @@ Lang {
|
|||
|
||||
Title {
|
||||
Init = Initialisierung der CryptoBox
|
||||
Mount = Aktivierung der Cryptodaten
|
||||
Umount = Deaktivierung der Cryptodaten
|
||||
Mount = Aktivierung der Crypto-Daten
|
||||
Umount = Deaktivierung der Crypto-Daten
|
||||
Config = Konfiguration der CryptoBox
|
||||
Log = Protokoll der CryptoBox
|
||||
ShutDown = System
|
||||
|
@ -120,7 +120,7 @@ Lang {
|
|||
|
||||
ConfigSaved {
|
||||
Title = Konfiguration gespeichert
|
||||
Text = Falls Sie die Netzwerkadresse der CryptoBox geändert haben, dann wird diese erst beim nächsten Neustart gesetzt.
|
||||
Text = Die neuen Einstellungen der CryptoBox wurden übernommem.
|
||||
}
|
||||
|
||||
MountDone {
|
||||
|
|
|
@ -417,6 +417,7 @@ if ( ! &check_ssl()) {
|
|||
|
||||
# TODO: check for success by comparing with new config and report success
|
||||
$pagedata->setValue('Data.Success', 'ConfigSaved');
|
||||
# TODO: maybe the intro page does not fit here ...
|
||||
$pagedata->setValue('Data.Action', 'intro');
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue