From 03e928006035cb5dcc51f0071ca3103c6ea5af00 Mon Sep 17 00:00:00 2001 From: Cecil Hugh Watson Date: Mon, 9 Feb 2009 22:15:31 -0800 Subject: Fixes for Atomic Ant. --- abs/core-testing/LinHES-config/PKGBUILD | 2 +- abs/core-testing/LinHES-config/systemconfig.sh | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD index 9e40e6f..e10d697 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=242 +pkgrel=243 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 ) diff --git a/abs/core-testing/LinHES-config/systemconfig.sh b/abs/core-testing/LinHES-config/systemconfig.sh index 82c2b97..9a0828a 100755 --- a/abs/core-testing/LinHES-config/systemconfig.sh +++ b/abs/core-testing/LinHES-config/systemconfig.sh @@ -165,14 +165,15 @@ ln -s "/usr/share/zoneinfo/$timezone" ${BASE}/etc/localtime # echo CLOCK_SYSTOCH="yes" >> ${BASE}/etc/conf.d/clock # echo TIMEZONE="$timezone" >> ${BASE}/etc/conf.d/clock cp_and_log $TEMPLATES/rc.conf ${BASE}/etc/rc.conf -# #Check for Atomic Ant -# if grep disablemodules=agpart,intel_agp /proc/cmdline >/dev/null -# then -# cat /etc/rc.conf.1 | sed -e '/MOD_BLACKLIST/ c\MOD_BLACKLIST=($ALSABLACKLIST agpart intel_agp)' > /etc/rc.conf -# rm -fr /etc/rc.conf.1 +#Check for Atomic Ant + if grep disablemodules=agpart,intel_agp /proc/cmdline >/dev/null + then + cat /etc/rc.conf | sed -e '/MOD_BLACKLIST/ c\MOD_BLACKLIST=($ALSABLACKLIST agpart intel_agp)' > /etc/rc.conf.aa + mv /etc/rc.conf /etc/rc.conf.preaa + mv /etc/rc.conf.aa /etc/rc.conf # else # exit 1 -# fi + fi } -- cgit v0.12