summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBritney Fransen <brfransen@gmail.com>2016-05-14 22:36:30 (GMT)
committerBritney Fransen <brfransen@gmail.com>2016-05-14 22:36:30 (GMT)
commit4eaadadcacd43380816f9ad14a1c7a9900e319ee (patch)
tree3caec353381ea520342c8123591b3abaf05a7da2
parent268ca43aebb3cee45e0d91125f1652cd53386663 (diff)
downloadlinhes_pkgbuild-4eaadadcacd43380816f9ad14a1c7a9900e319ee.zip
linhes_pkgbuild-4eaadadcacd43380816f9ad14a1c7a9900e319ee.tar.gz
linhes_pkgbuild-4eaadadcacd43380816f9ad14a1c7a9900e319ee.tar.bz2
LinHES-config: install_db_chroot.sh: don't try to reinstall mysql
-rwxr-xr-xabs/core/LinHES-config/PKGBUILD4
-rw-r--r--abs/core/LinHES-config/install_db_chroot.sh13
2 files changed, 2 insertions, 15 deletions
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 240e45d..363c691 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=8.4
-pkgrel=7
+pkgrel=8
conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
pkgdesc="Install and configure your system"
depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
@@ -145,7 +145,7 @@ md5sums=('17d9dd5a097fbbd4dae75dff8e2677ff'
'261ba62515edd7a13d46cbeb1b0eadca'
'6821fdfacf2aac44275200d3acaadb56'
'f73d6d6f98839e900cb6685bf5dc4eae'
- 'b8becf69d4309b938ceba3178c799270'
+ '27e4fcacca9b9662dd782fbdc92fceea'
'2a7f3b34e522acfd08283b86c8926aba'
'b596d2e3779a434435bc0f0277b1ba3e'
'9ecf4cb455aee12372832b1e7700988c'
diff --git a/abs/core/LinHES-config/install_db_chroot.sh b/abs/core/LinHES-config/install_db_chroot.sh
index 47de18c..077481d 100644
--- a/abs/core/LinHES-config/install_db_chroot.sh
+++ b/abs/core/LinHES-config/install_db_chroot.sh
@@ -11,8 +11,6 @@ echo "install_db_chroot hostname is $hostname"
. $MV_ROOT/bin/install_functions.sh
#myhost=`cat /etc/hostname`
-#mount -t proc none /proc
-pacman --noconfirm -S --force mysql
/etc/rc.d/mysqld
status=1
@@ -49,21 +47,10 @@ do
$MV_ROOT/bin/myth_settings_wrapper.sh -c USERJOBALLOW
$MV_ROOT/bin/myth_settings_wrapper.sh -c ACCESSCONTROL
if [ -d /data/srv/mysql/mythconverg ]
- #if [ -d /var/lib/mysql/mythconverg ]
then
- # pacman --noconfirm -R webcalendar
- # pacman --noconfirm --nodeps -S webcalendar
status=0
fi
-# if [ $SystemType = "Master_backend" ]
-# then
-# $MV_ROOT/bin/myth_settings_wrapper.sh -c BECONFIG -s master -a $dbhost
-# fi
fi
fi
done
/etc/rc.d/mysqld stop
-#umount /proc
-
-
-