[Pkg-ocaml-maint-commits] [SCM] marionnet packaging branch, master, updated. debian/0.90.6+bzr434-1-1-ga287db7

[Lucas Nussbaum]

The following commit has been merged in the master branch:
commit a287db73f9b48cf3d3566f6247ebf45c7f2fed37
Author: Lucas Nussbaum <lucas at debian.org>
Date:   Thu Jul 11 19:32:12 2013 +0200

    add warning about -nolisten tcp in init script

diff --git a/debian/README.Debian b/debian/README.Debian
index 377ceaf..1919a91 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -21,10 +21,20 @@ To install the i386 libc on an amd64 system, as root, run:
   apt-get update
   apt-get install libc6:i386
 
-Running Marionnet on Ubuntu
-===========================
-lightdm starts X with '-nolisten tcp'. You need to allow TCP connections
-to the X server. Edit /etc/lightdm/lightdm.conf and add
+Allowing TCP connections to the X server
+========================================
+Marionnet needs your X server to allow TCP connections, so that you
+can e.g. run wireshark inside virtual machines. If X is started with
+"-nolisten tcp", then TCP connections to the X server are disabled.
+
+gdm3
+----
+Edit /etc/gdm3/daemon.conf and make sure you have:
+  [security]
+  DisallowTCP = false
+
+lightdm (on Ubuntu)
+-------------------
+Edit /etc/lightdm/lightdm.conf and add
        xserver-allow-tcp=true
    in the [SeatDefaults] section.
-[FIXME: the init script should check for that and issue a warning]
diff --git a/debian/marionnet.init b/debian/marionnet.init
index b2c9922..d324957 100644
--- a/debian/marionnet.init
+++ b/debian/marionnet.init
@@ -67,7 +67,7 @@ do_stop()
 }
 
 # check for filesystems and kernels
-check_for_filesystems()
+startup_checks()
 {
   FS=$(ls /usr/share/marionnet/filesystems/ | grep -v '\.conf$' | wc -l)
   if [ ! \( -d /usr/share/marionnet/filesystems/ -a "$FS" -gt 0 -a -d /usr/share/marionnet/kernels \) ]; then
@@ -77,6 +77,18 @@ check_for_filesystems()
 
   For more information about donwloading kernels and filesystems,
   read /usr/share/doc/marionnet/README.Debian
+
+EOF
+  fi
+  if ps -C Xorg | grep -q -- '-nolisten tcp'; then
+    cat <<-EOF
+  /!\\  Xorg running with -nolisten tcp  /!\\
+  It seems that Xorg is running with -nolisten tcp. You will not be able
+  to run graphical applications inside Marionnet virtual machines.
+
+  For more information about fixing your Xorg configuration,
+  read /usr/share/doc/marionnet/README.Debian
+
 EOF
   fi
 }
@@ -84,7 +96,7 @@ EOF
 
 case "$1" in
   start)
-    check_for_filesystems
+    startup_checks
     [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME"
     do_start
     case "$?" in

-- 
marionnet packaging