From 09021a0d9941e47da837f38a0826ee4a52ac3aa0 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Fri, 14 Nov 2008 14:13:33 -0600 Subject: add /data to the squashlist for upgrades. This should fix km->lh->km->lh upgrade path. --- abs/core-testing/LinHES-config/PKGBUILD | 2 +- abs/core-testing/LinHES-config/install_proxy.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD index c5c73b9..f40694a 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=12 +pkgrel=14 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 86db000..ae3f316 100755 --- a/abs/core-testing/LinHES-config/install_proxy.sh +++ b/abs/core-testing/LinHES-config/install_proxy.sh @@ -168,7 +168,7 @@ then rm -f $1 fi -for i in bin boot etc home lib opt root sbin usr var +for i in bin boot etc home lib opt root sbin usr var data do echo $i >> $1 done @@ -206,7 +206,7 @@ function upgrade () { $run copy_it $disk $SQUASHLIST #copy back ssh keys - cp -rp /data/var/cache/pacman/pkg/* /new_boot/data/var/cache/pacman/pkg/ +# cp -rp /data/var/cache/pacman/pkg/* /new_boot/data/var/cache/pacman/pkg/ cp -fp /new_boot/etc.old/ssh/*.pub /new_boot/etc/ssh/ cp -fp /new_boot/etc.old/ssh/*.key /new_boot/etc/ssh/ cp -fp /new_boot/etc.old/ssh/*key /new_boot/etc/ssh/ -- cgit v0.12