diff options
| author | Greg Frost <gregfrost1@bigpond.com> | 2009-08-15 00:09:35 (GMT) |
|---|---|---|
| committer | Greg Frost <gregfrost1@bigpond.com> | 2009-08-15 00:09:35 (GMT) |
| commit | c3005d971da44524b9e12452bf2227080ef15863 (patch) | |
| tree | e86384a1033b88e0b88ecd737e40147c64301d0f | |
| parent | 6c4901889a457474ca21927e352060bc48382482 (diff) | |
| parent | 99dac2be8a6f2da7e477fef480f4f221ad1ba7eb (diff) | |
| download | linhes_pkgbuild-c3005d971da44524b9e12452bf2227080ef15863.zip linhes_pkgbuild-c3005d971da44524b9e12452bf2227080ef15863.tar.gz linhes_pkgbuild-c3005d971da44524b9e12452bf2227080ef15863.tar.bz2 | |
Merge branch 'master' of ssh://gregfrost@knoppmyth.net/mount/repository/LinHES-PKGBUILD
| -rw-r--r-- | abs/core-testing/LinHES-config/PKGBUILD | 2 | ||||
| -rwxr-xr-x | abs/core-testing/LinHES-config/mv_install.py | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD index 423a5ea..43ed4f8 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=80 +pkgrel=85 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 aaf3a07..1ebc2f1 100755 --- a/abs/core-testing/LinHES-config/mv_install.py +++ b/abs/core-testing/LinHES-config/mv_install.py @@ -1078,11 +1078,13 @@ def find_upgrade(): cp_and_log2(data_config.TEMP_TEMPLATES, TEMPLATES, '') cp_and_log(srcfile, "/etc/systemconfig") cp_and_log(data_config.MOUNTPOINT+"/etc/", "/tmp/etc/") + cp_and_log(data_config.MOUNTPOINT+"/var/lib/alsa/", "/tmp/alsa") cp_and_log(data_config.MOUNTPOINT+"/var/lib/oss/", "/tmp/oss") cp_and_log("/tmp/etc/mdadm.conf", "/etc/mdadm.conf") else: logging.info("Could not find systemconfig file %s", srcfile) cp_and_log(data_config.MOUNTPOINT+"/etc/", "/tmp/etc/") + cp_and_log(data_config.MOUNTPOINT+"/var/lib/alsa/", "/tmp/alsa") cp_and_log("/tmp/etc/mdadm.conf", "/etc") timezone_to_db("/tmp/etc/timezone") unmount_it() @@ -1191,11 +1193,11 @@ 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 + cmd = "rm -rf %s/alsa.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/alsa/", data_config.MOUNTPOINT+"/alsa.old/") cp_and_log("/tmp/oss", data_config.MOUNTPOINT+"/var/lib/oss.old") srcfile = "%s/etc.old/ssh/" %(data_config.MOUNTPOINT) @@ -1207,8 +1209,12 @@ def upgrade(hostoptions): mdfile = mdadm_find("/tmp") cp_and_log("/tmp"+mdfile, data_config.MOUNTPOINT+"/etc") + srcfile = "%s/etc.old/asound.conf" %(data_config.MOUNTPOINT) + destfile = "%s/etc/asound.conf" %(data_config.MOUNTPOINT) + cp_and_log(srcfile, destfile) + # R5.5 -> R6 - srcfile = "%s/varlibalsa.old/asound.state" %(data_config.MOUNTPOINT) + srcfile = "%s/alsa.old/asound.state" %(data_config.MOUNTPOINT) destfile = "%s/etc/asound.state" %(data_config.MOUNTPOINT) cp_and_log(srcfile, destfile) # R6 -> R6 |