diff options
| author | Greg Frost <gregfrost1@bigpond.com> | 2009-08-13 13:17:51 (GMT) |
|---|---|---|
| committer | Greg Frost <gregfrost1@bigpond.com> | 2009-08-13 13:17:51 (GMT) |
| commit | d68de00767d3ef08d8c026f249b6dc03ad85370f (patch) | |
| tree | a563933ad1a7c808d8a2edfb5e28de0e3949cec7 /abs/core-testing/LinHES-config | |
| parent | 32963835372e645dde587ac66e63003ff7849434 (diff) | |
| parent | 11de4aebdd13e06d096a08548addefe43ae0bf14 (diff) | |
| download | linhes_pkgbuild-d68de00767d3ef08d8c026f249b6dc03ad85370f.zip linhes_pkgbuild-d68de00767d3ef08d8c026f249b6dc03ad85370f.tar.gz linhes_pkgbuild-d68de00767d3ef08d8c026f249b6dc03ad85370f.tar.bz2 | |
Merge branch 'master' of ssh://gregfrost@knoppmyth.net/mount/repository/LinHES-PKGBUILD
Diffstat (limited to 'abs/core-testing/LinHES-config')
| -rw-r--r-- | abs/core-testing/LinHES-config/PKGBUILD | 2 | ||||
| -rwxr-xr-x | abs/core-testing/LinHES-config/mv_install.py | 20 |
2 files changed, 19 insertions, 3 deletions
diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD index c6d0754..423a5ea 100644 --- a/abs/core-testing/LinHES-config/PKGBUILD +++ b/abs/core-testing/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=2.0 -pkgrel=77 +pkgrel=80 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev ) pkgdesc="Install and configure your system" depends=(bc libstatgrab mysql-python expect curl dnsutils parted diff --git a/abs/core-testing/LinHES-config/mv_install.py b/abs/core-testing/LinHES-config/mv_install.py index 0b34650..aaf3a07 100755 --- a/abs/core-testing/LinHES-config/mv_install.py +++ b/abs/core-testing/LinHES-config/mv_install.py @@ -701,7 +701,7 @@ def fix_permissions(): SE = os.environ["TEMPLATES"]+"/settings/syssettings" cmd = " chmod -R 755 %s" %(data_config.MOUNTPOINT+SE) runcmd(cmd) - cmd = " chmod 755 %s" %(data_config.MOUNTPOINT+"/etc/systemconfig") + cmd = " chmod 775 %s" %(data_config.MOUNTPOINT+"/etc/systemconfig") runcmd(cmd) cmd = " chmod 755 %s" %(data_config.MOUNTPOINT+"/root") runcmd(cmd) @@ -1071,7 +1071,7 @@ def find_upgrade(): srcfile = data_config.MOUNTPOINT+"/etc/systemconfig" logging.info("Searching for systemconfig file %s", srcfile) if os.path.exists(srcfile): - logging.info("Found systemconfig file %fs", srcfile) + logging.info("Found systemconfig file %s", srcfile) TEMPLATES = os.environ["TEMPLATES"]+"/settings/syssettings" cp_and_log2(data_config.MOUNTPOINT+TEMPLATES, data_config.TEMP_TEMPLATES, '') sane_settings("/tmp/templates/settings/syssettings/settings.txt") @@ -1191,19 +1191,35 @@ def upgrade(hostoptions): copy_it("upgrade") cmd = "rm -rf %s/etc.old" %data_config.MOUNTPOINT runcmd(cmd) + cmd = "rm -rf %s/varlibalsa.old" %data_config.MOUNTPOINT + runcmd(cmd) cp_and_log("/tmp/etc/", data_config.MOUNTPOINT+"/etc.old/") + cp_and_log("/tmp/var/lib/alsa/", data_config.MOUNTPOINT+"/varlibalsa.old/") cp_and_log("/tmp/oss", data_config.MOUNTPOINT+"/var/lib/oss.old") + srcfile = "%s/etc.old/ssh/" %(data_config.MOUNTPOINT) destfile = "%s/etc/ssh/" %(data_config.MOUNTPOINT) cp_and_log2(srcfile, destfile, '*.pub') cp_and_log2(srcfile, destfile, '*.key') cp_and_log2(srcfile, destfile, '*key') + mdfile = mdadm_find("/tmp") cp_and_log("/tmp"+mdfile, data_config.MOUNTPOINT+"/etc") + + # R5.5 -> R6 + srcfile = "%s/varlibalsa.old/asound.state" %(data_config.MOUNTPOINT) + destfile = "%s/etc/asound.state" %(data_config.MOUNTPOINT) + cp_and_log(srcfile, destfile) + # R6 -> R6 srcfile = "%s/etc.old/asound.state" %(data_config.MOUNTPOINT) destfile = "%s/etc/asound.state" %(data_config.MOUNTPOINT) cp_and_log(srcfile, destfile) + + srcfile = "%s/etc.old/mplayer/mplayer.conf" %(data_config.MOUNTPOINT) + destfile = "%s/etc/mplayer/mplayer.conf" %(data_config.MOUNTPOINT) + cp_and_log(srcfile, destfile) + if not os.path.exists("/tmp/etc/KnoppMyth-version"): logging.debug(" standard upgrade, restoring auth files") cp_and_log(data_config.MOUNTPOINT+"/etc.old/passwd", data_config.MOUNTPOINT+"/etc/passwd") |