Version: 1.1.1

[packages/lxc.git] / lxc-pld.patch

diff --git a/lxc-pld.patch b/lxc-pld.patch
index 66b8daaa35847c8acf01bf7efd6b9eb6f71d74b3..accf43733e640fd1aea84d86c1e35513ab822c13 100644 (file)
--- a/lxc-pld.patch
+++ b/lxc-pld.patch
@@ -1,20 +1,50 @@
---- lxc-0.9.0/configure.ac.orig        2013-04-05 11:47:10.000000000 +0200
-+++ lxc-0.9.0/configure.ac     2013-04-17 20:04:27.905564169 +0200
-@@ -67,7 +67,7 @@
+diff -durN -x '*~' -x '*.orig' lxc-1.1.1.orig/configure.ac lxc-1.1.1/configure.ac
+--- lxc-1.1.1.orig/configure.ac        2015-03-16 20:57:47.000000000 +0100
++++ lxc-1.1.1/configure.ac     2015-04-02 14:40:25.000000000 +0200
+@@ -63,7 +63,7 @@
+               distroconf=default.conf.lxcbr
+               distrosysconf="$sysconfdir/default"
+               ;;
+-      redhat|centos|fedora|oracle|oracleserver|suse|opensuse*)
++      redhat|centos|fedora|oracle|oracleserver|suse|opensuse*|pld)
+               distroconf=default.conf.lxcbr
+               distrosysconf="$sysconfdir/sysconfig"
+               ;;
+@@ -99,6 +99,9 @@
+                       ubuntu)
+                               init_script=upstart,systemd
+                               ;;
++                      pld)
++                              init_script=upstart,systemd
++                              ;;
+                       *)
+                               echo -n "Linux distribution init system unknown."
+                               init_script=
+@@ -152,7 +154,7 @@
+ 
+ if test "x$enable_doc" = "xyes" -o "x$enable_doc" = "xauto"; then
        db2xman=""
+-      dbparsers="docbook2x-man db2x_docbook2man docbook2man docbook-to-man"
++      dbparsers="docbook2X2man docbook2x-man db2x_docbook2man docbook2man docbook-to-man"
  
        AC_MSG_CHECKING(for docbook2x-man)
--      for name in docbook2x-man db2x_docbook2man; do
-+      for name in docbook2X2man docbook2x-man db2x_docbook2man; do
-               if "$name" --help >/dev/null 2>&1; then
-                       db2xman="$name"
-                       break;
-@@ -140,6 +140,8 @@
- # Lua module and scripts
- if test x"$with_distro" = "xdebian" -o x"$with_distro" = "xubuntu" ; then
-     LUAPKGCONFIG=lua5.1
-+elif test x"$with_distro" = "xpld"; then
-+    LUAPKGCONFIG=lua51
- else
-     LUAPKGCONFIG=lua
- fi
+       for name in ${dbparsers}; do
+@@ -756,6 +758,7 @@
+       templates/lxc-opensuse
+       templates/lxc-oracle
+       templates/lxc-plamo
++      templates/lxc-pld
+       templates/lxc-sshd
+       templates/lxc-ubuntu
+       templates/lxc-ubuntu-cloud
+diff -durN -x '*~' -x '*.orig' lxc-1.1.1.orig/templates/Makefile.am lxc-1.1.1/templates/Makefile.am
+--- lxc-1.1.1.orig/templates/Makefile.am       2015-03-16 20:57:47.000000000 +0100
++++ lxc-1.1.1/templates/Makefile.am    2015-04-02 14:38:17.000000000 +0200
+@@ -15,6 +15,7 @@
+       lxc-opensuse \
+       lxc-oracle \
+       lxc-plamo \
++      lxc-pld \
+       lxc-sshd \
+       lxc-ubuntu \
+       lxc-ubuntu-cloud