From 6eb0dfa50945f3af9d2da2171b43e71a32600cd2 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Wed, 7 Jan 2009 21:32:23 -0600 Subject: fix the upgrade process as well. --- abs/core-testing/LinHES-config/PKGBUILD | 2 +- abs/core-testing/LinHES-config/install_proxy.sh | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD index 44cb38a..1e2ede9 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=152 +pkgrel=153 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/install_proxy.sh b/abs/core-testing/LinHES-config/install_proxy.sh index e29417e..670238b 100755 --- a/abs/core-testing/LinHES-config/install_proxy.sh +++ b/abs/core-testing/LinHES-config/install_proxy.sh @@ -261,12 +261,13 @@ function upgrade () { then rootfs=`grep \/\ /tmp/etc/fstab |awk ' { print $3 } '` fi - $run fstab_fix_it $disk UPGRADE - - #this is here to copy in the systemconfig file as soon as possible. + #this is here to copy in the systemconfig file as soon as possible. cp_and_log /etc/systemconfig "$mountpoint"/etc/systemconfig echo "Configuring system" > /tmp/.install_state progress 100 + $run fstab_fix_it $disk UPGRADE + + #echo "Writing boot sector" > /tmp/.install_state #progress 99 sleep 1 -- cgit v0.12