summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2008-12-01 04:01:18 (GMT)
committerJames Meyer <james.meyer@operamail.com>2008-12-01 04:01:18 (GMT)
commit49ff2f6d2db3c35161e9be05ec59da2c9d1ece2b (patch)
tree18193b1ba9a9361c288992ecace72653ffb73c0d
parent822137989d4f6ebb0a503608f91f690ee19ba311 (diff)
downloadlinhes_pkgbuild-49ff2f6d2db3c35161e9be05ec59da2c9d1ece2b.zip
linhes_pkgbuild-49ff2f6d2db3c35161e9be05ec59da2c9d1ece2b.tar.gz
linhes_pkgbuild-49ff2f6d2db3c35161e9be05ec59da2c9d1ece2b.tar.bz2
copy anything name lircrc* instead of strictly lircrc
-rwxr-xr-xabs/core-testing/LinHES-config/PKGBUILD2
-rwxr-xr-xabs/core-testing/LinHES-config/systemconfig.sh2
-rwxr-xr-xabs/mv-core/MythVantage-system/firstboot.sh2
3 files changed, 3 insertions, 3 deletions
diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD
index 8a6611b..f1da83d 100755
--- a/abs/core-testing/LinHES-config/PKGBUILD
+++ b/abs/core-testing/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=1.0
-pkgrel=49
+pkgrel=50
conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev )
pkgdesc="Install and configure your system"
depends=(bc libstatgrab mysql-python expect curl dnsutils parted sg3_utils nmbscan hwd)
diff --git a/abs/core-testing/LinHES-config/systemconfig.sh b/abs/core-testing/LinHES-config/systemconfig.sh
index 08d9488..6c72b92 100755
--- a/abs/core-testing/LinHES-config/systemconfig.sh
+++ b/abs/core-testing/LinHES-config/systemconfig.sh
@@ -191,7 +191,7 @@ function setupremote {
do
cat $i >> ${BASE}/etc/lircd.conf
done
- cp lircrc ${BASE}/etc/lircrc
+ cp -f lircrc* $BASE/etc/lircrc 2> /dev/null
if [ -f $TEMPLATES/LCD/$LCDtype/lircrc ]
then
cat $TEMPLATES/LCD/$LCDtype/lircrc >> /etc/lircrc
diff --git a/abs/mv-core/MythVantage-system/firstboot.sh b/abs/mv-core/MythVantage-system/firstboot.sh
index 366874a..b329f5a 100755
--- a/abs/mv-core/MythVantage-system/firstboot.sh
+++ b/abs/mv-core/MythVantage-system/firstboot.sh
@@ -3,7 +3,7 @@
ATTEMPT=0
function try_smolt {
((ATTEMPT=ATTEMPT+1))
- echo $ATTEMPT
+# echo $ATTEMPT
status=$(echo "jump mythsmolt" | telnet localhost 6546 2>&1)
echo $status|grep -q refused
status=$?