summaryrefslogtreecommitdiffstats
path: root/abs
diff options
context:
space:
mode:
Diffstat (limited to 'abs')
-rw-r--r--abs/core-testing/LinHES-config/PKGBUILD2
-rwxr-xr-xabs/core-testing/LinHES-config/mv_install.py6
2 files changed, 6 insertions, 2 deletions
diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD
index de90229..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=83
+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 60d49a2..1ebc2f1 100755
--- a/abs/core-testing/LinHES-config/mv_install.py
+++ b/abs/core-testing/LinHES-config/mv_install.py
@@ -1197,7 +1197,7 @@ def upgrade(hostoptions):
runcmd(cmd)
cp_and_log("/tmp/etc/", data_config.MOUNTPOINT+"/etc.old/")
- cp_and_log("/tmp/alsa", data_config.MOUNTPOINT+"/alsa.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)
@@ -1209,6 +1209,10 @@ 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/alsa.old/asound.state" %(data_config.MOUNTPOINT)
destfile = "%s/etc/asound.state" %(data_config.MOUNTPOINT)