summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBritney Fransen <brfransen@gmail.com>2012-03-06 00:13:14 (GMT)
committerBritney Fransen <brfransen@gmail.com>2012-03-06 00:13:14 (GMT)
commit5b565b694d7e82a62c1a72f0aa0e563c8352122e (patch)
treea43cadc1a210a564d8e347ace0fc4690bcb6d1b4
parent1d5d59f0eb21a192b4ed5516e0c5183809cf7735 (diff)
downloadlinhes_pkgbuild-5b565b694d7e82a62c1a72f0aa0e563c8352122e.zip
linhes_pkgbuild-5b565b694d7e82a62c1a72f0aa0e563c8352122e.tar.gz
linhes_pkgbuild-5b565b694d7e82a62c1a72f0aa0e563c8352122e.tar.bz2
LinHES-config: install_functions.sh: check if rc dir is empty to quiet an error
-rw-r--r--abs/core/LinHES-config/PKGBUILD4
-rwxr-xr-xabs/core/LinHES-config/install_functions.sh2
2 files changed, 3 insertions, 3 deletions
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 6f21150..1c26f9b 100644
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=2.3
-pkgrel=60
+pkgrel=61
conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
pkgdesc="Install and configure your system"
depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
@@ -106,7 +106,7 @@ md5sums=('64fad755c12f8eb12940e216e403354e'
'e36da536dd651ef182e7642337889e77'
'985891a43f7c4c983eb2a362162f1a0f'
'2f0b85d37b15956b3d92419c886e040c'
- '71030af86cf678a1bef06bbb4b627a55'
+ '893aa1adae52b641ab8cdac53ecf98c0'
'c20f73d4da5d7e15e1f3eb85c7dcb49a'
'8ac1cfd2eca0f641737da0d0aca416a7'
'9ae8d79f620c6d19973c55c32a921874'
diff --git a/abs/core/LinHES-config/install_functions.sh b/abs/core/LinHES-config/install_functions.sh
index 3e70e79..73aec5e 100755
--- a/abs/core/LinHES-config/install_functions.sh
+++ b/abs/core/LinHES-config/install_functions.sh
@@ -312,7 +312,7 @@ function request_dhcp(){
function in_kernel_support() {
#lifted from mythbuntu
#For disabling other protocols, adjust to the new location in 2.6.37. 91
- if [ -d /sys/class/rc ]
+ if [ -d /sys/class/rc ] && [ "$(ls -A /sys/class/rc)" ]
then
for file in `find /sys/class/rc/*/ -name protocols`
do