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

[Lucas Nussbaum]

The following commit has been merged in the master branch:
commit 316fe2471e5340aaf7f9196f028d0e05a400e7f4
Author: Lucas Nussbaum <lucas at debian.org>
Date:   Tue Jul 16 14:07:45 2013 +0200

    Move startup checks to a separate script

diff --git a/debian/marionnet-prestart-checks b/debian/marionnet-prestart-checks
new file mode 100755
index 0000000..b0c8aa9
--- /dev/null
+++ b/debian/marionnet-prestart-checks
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+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
+  cat <<-EOF
+  /!\\  No kernels/filesystems for marionnet found!  /!\\
+  Marionnet will start with very limited functionality.
+
+  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
diff --git a/debian/marionnet.init b/debian/marionnet.init
index d324957..f4bc128 100644
--- a/debian/marionnet.init
+++ b/debian/marionnet.init
@@ -69,28 +69,7 @@ do_stop()
 # check for filesystems and kernels
 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
-    cat <<-EOF
-  /!\\  No kernels/filesystems for marionnet found!  /!\\
-  Marionnet will start with very limited functionality.
-
-  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
+  /usr/share/marionnet/marionnet-prestart-checks
 }
 
 
diff --git a/debian/marionnet.install b/debian/marionnet.install
index 5a31260..59b2f8e 100644
--- a/debian/marionnet.install
+++ b/debian/marionnet.install
@@ -1 +1,2 @@
 useful-scripts/marionnet_from_scratch /usr/share/marionnet/
+debian/marionnet-prestart-checks /usr/share/marionnet/

-- 
marionnet packaging