From d073dccd2012a524f510fd7cae2906ac0330856d Mon Sep 17 00:00:00 2001 From: James Meyer Date: Sun, 1 Mar 2009 23:18:45 -0600 Subject: chroot change for FE only installs --- abs/core-testing/LinHES-config/PKGBUILD | 2 +- abs/core-testing/LinHES-config/install_proxy.sh | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD index 651e17a..e3e1a22 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=291 +pkgrel=293 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 3f626a1..824c76e 100755 --- a/abs/core-testing/LinHES-config/install_proxy.sh +++ b/abs/core-testing/LinHES-config/install_proxy.sh @@ -236,6 +236,7 @@ full_install () { /etc/rc.d/mysqld stop mount --bind /dev "$mountpoint/dev" mount --bind /proc "$mountpoint/proc" + mount -t sysfs none $mountpoint/sys chroot "$mountpoint" "$MV_ROOT/bin/install_db_chroot.sh" 2>&1 |tee /tmp/chrootdb.out #chroot "$mountpoint" "$MV_ROOT/bin/install_db_chroot.sh" chroot "$mountpoint" $MV_ROOT/bin/systemconfig.sh misc,hostype,network,advanced,this_is_install @@ -246,11 +247,15 @@ full_install () { lsof |grep new_boot umount -l "$mountpoint/dev" umount -l "$mountpoint/proc" + umount -l "$mountpoint/sys" echo "---------------------END CHROOT INSTALLDB-------------------------" /etc/rc.d/mysqld start else #update remotedb with this host settings + mount --bind /dev "$mountpoint/dev" + mount --bind /proc "$mountpoint/proc" + mount -t sysfs none $mountpoint/sys chroot "$mountpoint" DISPLAY=127.0.0.1:0 /usr/local/bin/MythVantage -t restore,default_1 chroot "$mountpoint" $MV_ROOT/bin/restore_default_settings.sh -c restore -t syssettings if [ ! $? = 0 ] @@ -261,6 +266,9 @@ full_install () { #Run second time chroot "$mountpoint" $MV_ROOT/bin/systemconfig.sh misc,hostype,network,advanced,this_is_install chroot "$mountpoint" $MV_ROOT/bin/restore_default_settings.sh -c ACCESSCONTROL + umount -l "$mountpoint/dev" + umount -l "$mountpoint/proc" + umount -l "$mountpoint/sys" fi fi chroot "$mountpoint" $MV_ROOT/bin/systemconfig.sh advanced @@ -294,7 +302,8 @@ function upgrade () { if [ ! x$rootfs = "xDo_not_format" ] then - echo "Formating $disk" > /tmp/.install_state + echo "Formating + $disk" > /tmp/.install_state progress 2 sleep 1 $run format_it $disk $rootfs NO -- cgit v0.12