From 49ff2f6d2db3c35161e9be05ec59da2c9d1ece2b Mon Sep 17 00:00:00 2001 From: James Meyer Date: Sun, 30 Nov 2008 22:01:18 -0600 Subject: copy anything name lircrc* instead of strictly lircrc --- abs/core-testing/LinHES-config/PKGBUILD | 2 +- abs/core-testing/LinHES-config/systemconfig.sh | 2 +- abs/mv-core/MythVantage-system/firstboot.sh | 2 +- 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=$? -- cgit v0.12