summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2010-01-31 00:54:39 (GMT)
committerJames Meyer <james.meyer@operamail.com>2010-01-31 00:54:39 (GMT)
commit6ce5f7daf1ab8a3ba4b792e50c34f59b8af94304 (patch)
tree9d210632432581f73e0267f6c7e8d95b4a7abd1f
parent096c6d9acfabaa87e8f25c7d4274a0970455a2e9 (diff)
downloadlinhes_pkgbuild-6ce5f7daf1ab8a3ba4b792e50c34f59b8af94304.zip
linhes_pkgbuild-6ce5f7daf1ab8a3ba4b792e50c34f59b8af94304.tar.gz
linhes_pkgbuild-6ce5f7daf1ab8a3ba4b792e50c34f59b8af94304.tar.bz2
linhes-system: update firstboot to use mythsmolt jumppoint, instead of telnet interface.
-rw-r--r--abs/core-testing/LinHES-system/PKGBUILD2
-rwxr-xr-xabs/core-testing/LinHES-system/firstboot.sh33
2 files changed, 21 insertions, 14 deletions
diff --git a/abs/core-testing/LinHES-system/PKGBUILD b/abs/core-testing/LinHES-system/PKGBUILD
index 156d027..f4718bb 100644
--- a/abs/core-testing/LinHES-system/PKGBUILD
+++ b/abs/core-testing/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
pkgver=1.0
-pkgrel=70
+pkgrel=71
arch=('i686')
MVDIR=$startdir/pkg/usr/LH
BINDIR=$startdir/pkg/usr/bin
diff --git a/abs/core-testing/LinHES-system/firstboot.sh b/abs/core-testing/LinHES-system/firstboot.sh
index 47aa0f9..7e2f603 100755
--- a/abs/core-testing/LinHES-system/firstboot.sh
+++ b/abs/core-testing/LinHES-system/firstboot.sh
@@ -1,22 +1,29 @@
#!/bin/bash
. ~/.configured
ATTEMPT=0
+
function try_smolt {
- ((ATTEMPT=ATTEMPT+1))
- status=$(echo "jump mythsmolt" | telnet localhost 6546 2>&1)
- echo $status|grep -q refused
- status=$?
- if [ $status != 0 ]
- then
- fb_status=0
- echo "FB=NO" > ~/.configured
- fi
- if [ $ATTEMPT = 200 ]
- then
- fb_status=0
- fi
+ ((ATTEMPT=ATTEMPT+1))
+ WID=`xdotool search "mythfrontend" | head -1`
+ xdotool windowfocus $WID
+ status=$?
+ if [ $status = 0 ]
+ then
+ sleep 2
+ xdotool key "ctrl+alt+p"
+ xdotool key "ctrl+alt+p"
+ fb_status=0
+ echo "FB=NO" > ~/.configured
+ fi
+
+ if [ $ATTEMPT = 200 ]
+ then
+ fb_status=0
+ fi
+
}
+
if [ ! -e /tmp/debug ]
then
if [ ! -e /tmp/nomfe ]