summaryrefslogtreecommitdiffstats
path: root/abs/core-testing/live-installer
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2008-11-07 03:13:58 (GMT)
committerJames Meyer <james.meyer@operamail.com>2008-11-07 03:13:58 (GMT)
commit1b44c636c6e5e251c263d5ccac938b378e17d3a4 (patch)
tree8d796eec90ceb87773ada3a696114ee067587906 /abs/core-testing/live-installer
parent1b95a1dd7d6392f908a58e819daf232492556b23 (diff)
downloadlinhes_pkgbuild-1b44c636c6e5e251c263d5ccac938b378e17d3a4.zip
linhes_pkgbuild-1b44c636c6e5e251c263d5ccac938b378e17d3a4.tar.gz
linhes_pkgbuild-1b44c636c6e5e251c263d5ccac938b378e17d3a4.tar.bz2
-apply any passwd changes that might occur on upgrade
- use hostsettings instead of syssettings for upgrades.
Diffstat (limited to 'abs/core-testing/live-installer')
-rwxr-xr-xabs/core-testing/live-installer/PKGBUILD2
-rwxr-xr-xabs/core-testing/live-installer/install_proxy.sh12
2 files changed, 9 insertions, 5 deletions
diff --git a/abs/core-testing/live-installer/PKGBUILD b/abs/core-testing/live-installer/PKGBUILD
index fe42458..991e572 100755
--- a/abs/core-testing/live-installer/PKGBUILD
+++ b/abs/core-testing/live-installer/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=live-installer
pkgver=1.0
-pkgrel=81
+pkgrel=90
pkgdesc="Install and configure your system"
depends=(bc libstatgrab mysql-python expect curl dnsutils parted sg3_utils nmbscan)
arch=('i686')
diff --git a/abs/core-testing/live-installer/install_proxy.sh b/abs/core-testing/live-installer/install_proxy.sh
index d5aec45..ae31d5b 100755
--- a/abs/core-testing/live-installer/install_proxy.sh
+++ b/abs/core-testing/live-installer/install_proxy.sh
@@ -258,7 +258,6 @@ function upgrade () {
chmod -R 755 ${mountpoint}/root
chown root:mythtv "$mountpoint"/etc/systemconfig
chmod 775 "$mountpoint"/etc/systemconfig
- touch $mountpoint/home/mythtv/.configure && chmod 777 $mountpoint/home/mythtv/.configure
#mount /proc and /dev
mount --bind /dev "$mountpoint/dev"
mount --bind /proc "$mountpoint/proc"
@@ -268,15 +267,20 @@ function upgrade () {
##### do I need to start mysql?
/etc/rc.d/mysqld stop
chroot "$mountpoint" "$MV_ROOT/bin/restore_km_db_chroot.sh" > /tmp/chrootdb_km.out
- 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 [ -f /tmp/etc/KnoppMyth-version ]
+ then
+ chroot "$mountpoint" $MV_ROOT/bin/restore_default_settings.sh -c restore -t hostsettings
+ else
+ chroot "$mountpoint" $MV_ROOT/bin/restore_default_settings.sh -c restore -t syssettings
+ fi
#
#Run second time
chroot "$mountpoint" $MV_ROOT/bin/systemconfig.sh misc,hostype,network,advanced,this_is_install
chroot "$mountpoint" $MV_ROOT/bin/systemconfig.sh advanced,this_is_install
+ apply_new_auth
umount "$mountpoint/dev"
umount "$mountpoint/proc"
+
echo "Done" > /tmp/.install_state
cp /tmp/mythvantage_install.log $mountpoint/var/log/