diff options
| author | James Meyer <james.meyer@operamail.com> | 2011-10-21 21:22:38 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2011-10-21 21:22:38 (GMT) |
| commit | 9eef516e0aeb596daff3c8911055c5a2a8f4e143 (patch) | |
| tree | 25164c49940a978e18d1d4c4fcad2bb2c9f517b0 /abs | |
| parent | e68afef00820a4fd7bab67bf5b36916e6ca89a92 (diff) | |
| download | linhes_pkgbuild-9eef516e0aeb596daff3c8911055c5a2a8f4e143.zip linhes_pkgbuild-9eef516e0aeb596daff3c8911055c5a2a8f4e143.tar.gz linhes_pkgbuild-9eef516e0aeb596daff3c8911055c5a2a8f4e143.tar.bz2 | |
xconfig.sh: check for Xorg configuration status in /etc/mythvantage.cfg
Diffstat (limited to 'abs')
| -rw-r--r-- | abs/core/LinHES-config/PKGBUILD | 4 | ||||
| -rwxr-xr-x | abs/core/LinHES-config/xconfig.sh | 10 |
2 files changed, 12 insertions, 2 deletions
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index 1ed38a6..527e944 100644 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=2.3 -pkgrel=34 +pkgrel=36 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=('6259677916192a92d1adf47b276f7829' 'c20f73d4da5d7e15e1f3eb85c7dcb49a' '8ac1cfd2eca0f641737da0d0aca416a7' '9ae8d79f620c6d19973c55c32a921874' - '0fc9a99aa4a62c3880c2204cc5001294' + '7af56cecd1081d45f57fb207df0a0c87' 'ecf9e5df20683a769c4a8a8f2d65de85' 'e459ed069317bccb20351f037a9df3d2' '97de45a04f4efbd9d40d9fc0e1db1c3f' diff --git a/abs/core/LinHES-config/xconfig.sh b/abs/core/LinHES-config/xconfig.sh index cf31ef8..4237fcc 100755 --- a/abs/core/LinHES-config/xconfig.sh +++ b/abs/core/LinHES-config/xconfig.sh @@ -362,6 +362,16 @@ function setupX { } #MAIN + + +LINE=`grep -i xorg /etc/mythvantage.cfg|grep -q False` +rc=$? +if [ $rc = 0 ] +then + echo "xorg configuration disabled in /etc/mythvantage.cfg" + exit 0 +fi + TESTMODE="$1" if [ "$TESTMODE" = "test" ] then |