From 05224a8c82df924573978ba44c897900dcd2d0eb Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 10 May 2012 09:00:05 -0500 Subject: LinHES-config: install_functions.sh: in_kernel_support: disable and restart lcdd If lcdd is running when pushing a protocol it will stop execution of the script. --- abs/core/LinHES-config/PKGBUILD | 4 ++-- abs/core/LinHES-config/install_functions.sh | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index ad8b9b6..7d23be3 100644 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=2.3 -pkgrel=71 +pkgrel=72 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' @@ -110,7 +110,7 @@ md5sums=('18af4fe481e1fc2ae02050026eb5cd27' 'e36da536dd651ef182e7642337889e77' '985891a43f7c4c983eb2a362162f1a0f' '2f0b85d37b15956b3d92419c886e040c' - '5b41574597ac5096fe3462afeb0376e4' + '5a31addfbdc1154b05997f972a32fa33' 'c20f73d4da5d7e15e1f3eb85c7dcb49a' '68199e861c2933ccbb84735b9b440157' '9ae8d79f620c6d19973c55c32a921874' diff --git a/abs/core/LinHES-config/install_functions.sh b/abs/core/LinHES-config/install_functions.sh index c807f15..08206fc 100755 --- a/abs/core/LinHES-config/install_functions.sh +++ b/abs/core/LinHES-config/install_functions.sh @@ -315,6 +315,11 @@ function in_kernel_support() { #For disabling other protocols, adjust to the new location in 2.6.37. 91 if [ -d /sys/class/rc ] && [ "$(ls -A /sys/class/rc)" ] then + LCDDSTOP=0 + if [ -d /service/lcdd ]; then + sv stop lcdd + LCDDSTOP=1 + fi for file in `find /sys/class/rc/*/ -name protocols` do if [ "$1" = "disable" ] @@ -327,6 +332,9 @@ function in_kernel_support() { done fi done + if [ $LCDDSTOP -eq 1 ]; then + sv start lcdd + fi fi } -- cgit v0.12