From 47f97e1953d70596531c40816faf3c325ed0d47d Mon Sep 17 00:00:00 2001 From: James Meyer Date: Mon, 2 Feb 2009 17:12:39 -0600 Subject: More code reversion -Copy back the correct rc.conf. --- abs/core-testing/LinHES-config/PKGBUILD | 2 +- abs/core-testing/LinHES-config/systemconfig.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD index 4c06690..40914cf 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=236 +pkgrel=237 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 1bad622..9f4df7a 100755 --- a/abs/core-testing/LinHES-config/systemconfig.sh +++ b/abs/core-testing/LinHES-config/systemconfig.sh @@ -164,7 +164,7 @@ ln -s "/usr/share/zoneinfo/$timezone" ${BASE}/etc/localtime # echo CLOCK="UTC" > ${BASE}/etc/conf.dclock # echo CLOCK_SYSTOCH="yes" >> ${BASE}/etc/conf.d/clock # echo TIMEZONE="$timezone" >> ${BASE}/etc/conf.d/clock -cp_and_log $TEMPLATES/rc.conf /etc/rc.conf.1 +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 -- cgit v0.12