From e5a36943cec24798dc559ef6237d23c026fdcada Mon Sep 17 00:00:00 2001
From: lars <lars@systemausfall.org>
Date: Sun, 28 Aug 2005 19:23:33 +0000
Subject: [PATCH] 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

---
 cbox-tree.d/etc/{rc2.d => rc3.d}/S98cb-services       |  0
 cbox-tree.d/etc/{rc2.d => rc3.d}/S99cb-devel-features |  0
 cbox-tree.d/usr/lib/cryptobox/cbox-manage.sh          | 11 +++++------
 cbox-tree.d/usr/share/cryptobox/lang/de.hdf           |  6 +++---
 cbox-tree.d/var/www/cgi-bin/cryptobox.pl              |  1 +
 5 files changed, 9 insertions(+), 9 deletions(-)
 rename cbox-tree.d/etc/{rc2.d => rc3.d}/S98cb-services (100%)
 rename cbox-tree.d/etc/{rc2.d => rc3.d}/S99cb-devel-features (100%)

diff --git a/cbox-tree.d/etc/rc2.d/S98cb-services b/cbox-tree.d/etc/rc3.d/S98cb-services
similarity index 100%
rename from cbox-tree.d/etc/rc2.d/S98cb-services
rename to cbox-tree.d/etc/rc3.d/S98cb-services
diff --git a/cbox-tree.d/etc/rc2.d/S99cb-devel-features b/cbox-tree.d/etc/rc3.d/S99cb-devel-features
similarity index 100%
rename from cbox-tree.d/etc/rc2.d/S99cb-devel-features
rename to cbox-tree.d/etc/rc3.d/S99cb-devel-features
diff --git a/cbox-tree.d/usr/lib/cryptobox/cbox-manage.sh b/cbox-tree.d/usr/lib/cryptobox/cbox-manage.sh
index 807f77c..d88035e 100755
--- a/cbox-tree.d/usr/lib/cryptobox/cbox-manage.sh
+++ b/cbox-tree.d/usr/lib/cryptobox/cbox-manage.sh
@@ -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
diff --git a/cbox-tree.d/usr/share/cryptobox/lang/de.hdf b/cbox-tree.d/usr/share/cryptobox/lang/de.hdf
index b375b5d..879f6ec 100644
--- a/cbox-tree.d/usr/share/cryptobox/lang/de.hdf
+++ b/cbox-tree.d/usr/share/cryptobox/lang/de.hdf
@@ -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&auml;ndert haben, dann wird diese erst beim n&auml;chsten Neustart gesetzt.
+	Text  =	Die neuen Einstellungen der CryptoBox wurden &uuml;bernommem.
     }
 
     MountDone {
diff --git a/cbox-tree.d/var/www/cgi-bin/cryptobox.pl b/cbox-tree.d/var/www/cgi-bin/cryptobox.pl
index bd801d8..163b546 100755
--- a/cbox-tree.d/var/www/cgi-bin/cryptobox.pl
+++ b/cbox-tree.d/var/www/cgi-bin/cryptobox.pl
@@ -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');
 	    }
 	}