[X2Go-Commits] x2gothinclient.git - master (branch) updated: 1.1.0.0-22-gd316128

[X2Go dev team]

The branch, master has been updated
       via  d31612857aa5d01ed112f5f3c4cc4c1fee209ddc (commit)
      from  7543b68dca2a36249038011ae3ef2e7e693ace22 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d31612857aa5d01ed112f5f3c4cc4c1fee209ddc
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Nov 12 15:16:46 2013 +0100

    Work around Debian bug #729373 during TCE creation. Patch alsa-utils init script and ALSA's utils.sh.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                   |    2 ++
 .../sbin/x2gothinclient_create                     |    4 ++++
 2 files changed, 6 insertions(+)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index fb95cf0..395b45c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ x2gothinclient (1.1.0.1-0~x2go1) UNRELEASED; urgency=low
       during thin client startup.
     - Patch /etc/init.d/checkroot-bootclean.sh during TCE creation to
       avoid failures when clean tmp files on the read-only NFS root-fs.
+    - Work around Debian bug #729373 during TCE creation. Patch alsa-utils
+      init script and ALSA's utils.sh.
   * debian/control:
     + New bin:package x2gothinclient-chroot.
     + Make sure x2gothinclient-chroot pulls in editing tools like
diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create
index 1e6595f..1bb0bc0 100755
--- a/x2gothinclientmanagement/sbin/x2gothinclient_create
+++ b/x2gothinclientmanagement/sbin/x2gothinclient_create
@@ -214,6 +214,10 @@ fi
 # no need to clean up tmp directories, they are on RAM disks anyway...
 [ \$? -eq 0 ] && test -e /etc/init.d/checkroot-bootclean.sh && sed -e "s/clean_all/#clean_all/" -i /etc/init.d/checkroot-bootclean.sh || true
 
+# modify alsa-utils script until Debian bug #729373 is fixed
+[ \$? -eq 0 ] && test -e /etc/init.d/alsa-utils && sed "s/^ALSACTLHOME=/export ALSACTLHOME=/" -i /etc/init.d/alsa-utils || true
+[ \$? -eq 0 ] && test -e /usr/share/alsa/utils.sh && sed "s/amixer \\\$CARDOPT/HOME=\\\$ALSACTLHOME amixer \\\$CARDOPT/g" -i /usr/share/alsa/utils.sh || true
+
 [ \$? -eq 0 ] && apt-get clean
 
 EOF


hooks/post-receive
-- 
x2gothinclient.git (X2Go Thin Client Environment)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2gothinclient.git" (X2Go Thin Client Environment).