diff options
Diffstat (limited to 'abs/core-testing/LinHES-config')
| -rwxr-xr-x | abs/core-testing/LinHES-config/PKGBUILD | 2 | ||||
| -rwxr-xr-x | abs/core-testing/LinHES-config/install_db_chroot.sh | 4 | ||||
| -rw-r--r-- | abs/core-testing/LinHES-config/restore_km_db_chroot.sh | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD index ebb9a5b..2e8ced9 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=4 +pkgrel=5 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_db_chroot.sh b/abs/core-testing/LinHES-config/install_db_chroot.sh index 514dd3c..1ec8cec 100755 --- a/abs/core-testing/LinHES-config/install_db_chroot.sh +++ b/abs/core-testing/LinHES-config/install_db_chroot.sh @@ -35,8 +35,8 @@ do #update database to allow user jobs on this host. $MV_ROOT/bin/restore_default_settings.sh -c USERJOBALLOW $MV_ROOT/bin/restore_default_settings.sh -c ACCESSCONTROL - #if [ -d /data/srv/mysql/mythconverg ] - if [ -d /var/lib/mysql/mythconverg ] + if [ -d /data/srv/mysql/mythconverg ] + #if [ -d /var/lib/mysql/mythconverg ] then # pacman --noconfirm -R webcalendar # pacman --noconfirm --nodeps -S webcalendar diff --git a/abs/core-testing/LinHES-config/restore_km_db_chroot.sh b/abs/core-testing/LinHES-config/restore_km_db_chroot.sh index 9467ffd..35e8fbd 100644 --- a/abs/core-testing/LinHES-config/restore_km_db_chroot.sh +++ b/abs/core-testing/LinHES-config/restore_km_db_chroot.sh @@ -33,8 +33,8 @@ if [ $SystemType = "Master_backend" -o $SystemType = "Standalone" ] gunzip -c /myth/backup/mythconverg.sql.gz > /myth/backup/mythconverg.sql mysql mythconverg < /myth/backup/mythconverg.sql - - if [ -d /var/lib/mysql/mythconverg ] + if [ -d /data/srv/mysql/mythconverg ] + #if [ -d /var/lib/mysql/mythconverg ] then status=0 fi |