[X2Go-Commits] x2gothinclient.git - build-main (branch) updated: 1.0.1.8-5-g30e3aac

X2Go dev team git-admin at x2go.org
Fri Jul 19 23:38:06 CEST 2013


The branch, build-main has been updated
       via  30e3aac705162504e222e5dc5d0ec0e05270394c (commit)
      from  d7ce549428428b76c605a24c6d117fac2072358c (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

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

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 1ae3cae..7cb0428 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ x2gothinclient (1.0.1.9-0~x2go1) UNRELEASED; urgency=low
     - When X2Go TCE has plymouth installed, make sure pressing the
       halt button does not change to the wrong tty.
     - Truncate echo output lines to less than 80 chars.
+    - Use sed to patch initramfs configuration (rather than a patch
+      that fails on wheezy). The change is needed for squeeze only.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 10 Aug 2012 14:13:49 +0200
 
diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create
index 434ec14..ebe10fc 100755
--- a/x2gothinclientmanagement/sbin/x2gothinclient_create
+++ b/x2gothinclientmanagement/sbin/x2gothinclient_create
@@ -145,12 +145,8 @@ chmod +x /sbin/start-stop-daemon
 # Pulsaudio must come afterwards until the thinclient-package is fixed
 [ \$? -eq 0 ] && apt-get install alsa-base pulseaudio -y
 [ \$? -eq 0 ] && apt-get install patch -y
-[ \$? -eq 0 ] && patch /etc/initramfs-tools/initramfs.conf <<PATCH
-39c39
-< BOOT=local
----
-> BOOT=nfs
-PATCH
+[ \$? -eq 0 ] && sed -e 's/BOOT=local/BOOT=nfs/' -i /etc/initramfs-tools/initramfs.conf
+
 [ \$? -eq 0 ] && rm -f /etc/udev/rules.d/*-persistent-*.rules
 [ \$? -eq 0 ] && useradd x2goclient
 [ \$? -eq 0 ] && adduser x2goclient audio


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).




More information about the x2go-commits mailing list