From bb59e3365d888226cd564c0ea4459d6ed43c0321 Mon Sep 17 00:00:00 2001
From: Bob Igo <bob@stormlogic.com>
Date: Thu, 13 Aug 2009 20:22:13 -0400
Subject: Copy /var/lib/alsa for R5.5 -> R6 upgrades; needed for asound.state
 restoration

---
 abs/core-testing/LinHES-config/PKGBUILD      | 2 +-
 abs/core-testing/LinHES-config/mv_install.py | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD
index 423a5ea..de90229 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=83
 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..60d49a2 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)
@@ -1208,7 +1210,7 @@ def upgrade(hostoptions):
     cp_and_log("/tmp"+mdfile, data_config.MOUNTPOINT+"/etc")
 
     # 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
-- 
cgit v0.12


From 99dac2be8a6f2da7e477fef480f4f221ad1ba7eb Mon Sep 17 00:00:00 2001
From: Bob Igo <bob@stormlogic.com>
Date: Fri, 14 Aug 2009 16:01:08 -0400
Subject: fixed alsa dir copy bug; now copying asound.conf too

---
 abs/core-testing/LinHES-config/PKGBUILD      | 2 +-
 abs/core-testing/LinHES-config/mv_install.py | 6 +++++-
 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)
-- 
cgit v0.12

