Index: /ipk/source.sh4/emus_gbox_804/var/bin/startgbox_804
===================================================================
--- /ipk/source.sh4/emus_gbox_804/var/bin/startgbox_804	(revision 17769)
+++ /ipk/source.sh4/emus_gbox_804/var/bin/startgbox_804	(revision 17770)
@@ -1,30 +1,61 @@
+#!/bin/bash
+#
+
 echo start
 rm /tmp/gbox.read
 (sleep 5;touch /tmp/gbox.kill)&
-/var/emu/gbox_804 > /tmp/gbox.read
+/var/bin/gbox_804 > /tmp/gbox.read
 
-#cat /tmp/gbox.read
-ident=`cat /tmp/gbox.read | grep "CAM IDent" | cut -d ":" -f3`
-echo ident $ident
-echo end
+echo "###########################################################################################"
+echo "###########################################################################################"
+echo "###########################      read CAM IDent       #####################################"
+echo "###########################################################################################"
+echo "###########################################################################################"
 
-count=0
-rsa=""
+card1=`cat /tmp/gbox.read | grep "CAM IDent" | grep -v UA:0x | cut -d ":" -f3`
 
-echo $ident | sed 's/^//'
-#| sed -e 's/.\{7\}$//'
-v1=`echo $ident | cut -c1`
-v2=`echo $ident | cut -c2`
-v3=`echo $ident | cut -c3`
-v4=`echo $ident | cut -c4`
-v5=`echo $ident | cut -c5`
-v6=`echo $ident | cut -c6`
-v7=`echo $ident | cut -c7`
-v8=`echo $ident | cut -c8`
+if [ ! -z "$card" ];then 
+	echo "[startgbox] card1 $card1"
 
-rsa="$v1$v2 $v3$v4 $v5$v6 $v7$v8"
-echo rsa $rsa
+	#| sed -e 's/.\{7\}$//'
+	v1=`echo $card1 | cut -c1`
+	v2=`echo $card1 | cut -c2`
+	v3=`echo $card1 | cut -c3`
+	v4=`echo $card1 | cut -c4`
+	v5=`echo $card1 | cut -c5`
+	v6=`echo $card1 | cut -c6`
+	v7=`echo $card1 | cut -c7`
+	v8=`echo $card1 | cut -c8`
+	
+	rsa1="$v1$v2 $v3$v4 $v5$v6 $v7$v8"
+	echo "[startgbox] rsa1 $rsa1"
+	
+	sed "s/B: {.*/B: { $rsa1 { A7 64 2F 57 BC 96 D3 7C }}/" -i /var/keys/nagra
+fi
 
-sed "s/B: {.*/B: { $rsa { A7 64 2F 57 BC 96 D3 7C }}/" -i /var/keys/nagra
+card2=`cat /tmp/gbox.read | grep "CAM IDent" | grep UA:0x | cut -d ":" -f3 | sed -e 's/^0x//'`
 
-/var/emu/gbox_804 &
+if [ ! -z "$card2" ];then 
+	echo "[startgbox] card2 $card2"
+
+	#| sed -e 's/.\{7\}$//'
+	v1=`echo $card2 | cut -c1`
+	v2=`echo $card2 | cut -c2`
+	v3=`echo $card2 | cut -c3`
+	v4=`echo $card2 | cut -c4`
+	v5=`echo $card2 | cut -c5`
+	v6=`echo $card2 | cut -c6`
+	v7=`echo $card2 | cut -c7`
+	v8=`echo $card2 | cut -c8`
+	
+	rsa2="$v1$v2 $v3$v4 $v5$v6 $v7$v8"
+	echo "[startgbox] rsa2 $rsa2"
+	
+	sed "s/B: {.*/B: { $rsa2 { A7 64 2F 57 BC 96 D3 7C }}/" -i /var/keys/nagra
+fi
+
+if [ ! -z "$card1" ] && [ ! -z "$card2" ];then 
+	sed "s/B: {.*/B: { $rsa1 { A7 64 2F 57 BC 96 D3 7C }}\nB: { $rsa2 { A7 64 2F 57 BC 96 D3 7C }}/" -i /var/keys/nagra
+fi
+
+/var/bin/gbox_804 &
Index: /ipk/source.sh4/swapemus_gbox_804/var/swap/bin/startgbox_804_swap
===================================================================
--- /ipk/source.sh4/swapemus_gbox_804/var/swap/bin/startgbox_804_swap	(revision 17769)
+++ /ipk/source.sh4/swapemus_gbox_804/var/swap/bin/startgbox_804_swap	(revision 17770)
@@ -1,31 +1,61 @@
+#!/bin/bash
+#
+
 echo start
 rm /tmp/gbox.read
 (sleep 5;touch /tmp/gbox.kill)&
-cd /var/swap/bin
-/var/emu/gbox_804_swap > /tmp/gbox.read
+/var/swap/bin/gbox_804_swap > /tmp/gbox.read
 
-#cat /tmp/gbox.read
-ident=`cat /tmp/gbox.read | grep "CAM IDent" | cut -d ":" -f3`
-echo ident $ident
-echo end
+echo "###########################################################################################"
+echo "###########################################################################################"
+echo "###########################      read CAM IDent       #####################################"
+echo "###########################################################################################"
+echo "###########################################################################################"
 
-count=0
-rsa=""
+card1=`cat /tmp/gbox.read | grep "CAM IDent" | grep -v UA:0x | cut -d ":" -f3`
 
-echo $ident | sed 's/^//'
-#| sed -e 's/.\{7\}$//'
-v1=`echo $ident | cut -c1`
-v2=`echo $ident | cut -c2`
-v3=`echo $ident | cut -c3`
-v4=`echo $ident | cut -c4`
-v5=`echo $ident | cut -c5`
-v6=`echo $ident | cut -c6`
-v7=`echo $ident | cut -c7`
-v8=`echo $ident | cut -c8`
+if [ ! -z "$card" ];then 
+	echo "[startgbox] card1 $card1"
 
-rsa="$v1$v2 $v3$v4 $v5$v6 $v7$v8"
-echo rsa $rsa
+	#| sed -e 's/.\{7\}$//'
+	v1=`echo $card1 | cut -c1`
+	v2=`echo $card1 | cut -c2`
+	v3=`echo $card1 | cut -c3`
+	v4=`echo $card1 | cut -c4`
+	v5=`echo $card1 | cut -c5`
+	v6=`echo $card1 | cut -c6`
+	v7=`echo $card1 | cut -c7`
+	v8=`echo $card1 | cut -c8`
+	
+	rsa1="$v1$v2 $v3$v4 $v5$v6 $v7$v8"
+	echo "[startgbox] rsa1 $rsa1"
+	
+	sed "s/B: {.*/B: { $rsa1 { A7 64 2F 57 BC 96 D3 7C }}/" -i /var/swap/keys/nagra
+fi
 
-sed "s/B: {.*/B: { $rsa { A7 64 2F 57 BC 96 D3 7C }}/" -i /var/keys/nagra
+card2=`cat /tmp/gbox.read | grep "CAM IDent" | grep UA:0x | cut -d ":" -f3 | sed -e 's/^0x//'`
 
-/var/emu/gbox_804_swap &
+if [ ! -z "$card2" ];then 
+	echo "[startgbox] card2 $card2"
+
+	#| sed -e 's/.\{7\}$//'
+	v1=`echo $card2 | cut -c1`
+	v2=`echo $card2 | cut -c2`
+	v3=`echo $card2 | cut -c3`
+	v4=`echo $card2 | cut -c4`
+	v5=`echo $card2 | cut -c5`
+	v6=`echo $card2 | cut -c6`
+	v7=`echo $card2 | cut -c7`
+	v8=`echo $card2 | cut -c8`
+	
+	rsa2="$v1$v2 $v3$v4 $v5$v6 $v7$v8"
+	echo "[startgbox] rsa2 $rsa2"
+	
+	sed "s/B: {.*/B: { $rsa2 { A7 64 2F 57 BC 96 D3 7C }}/" -i /var/swap/keys/nagra
+fi
+
+if [ ! -z "$card1" ] && [ ! -z "$card2" ];then 
+	sed "s/B: {.*/B: { $rsa1 { A7 64 2F 57 BC 96 D3 7C }}\nB: { $rsa2 { A7 64 2F 57 BC 96 D3 7C }}/" -i /var/swap/keys/nagra
+fi
+
+/var/swap/bin/gbox_804_swap &