Commit ff475ab9 by Christian Brauner Committed by GitHub

Merge pull request #1145 from glensc/pld-patch

add PLD Linux support to upstream repo
parents f39f2eaa 487ea5f6
...@@ -57,6 +57,7 @@ if test "z$with_distro" = "z"; then ...@@ -57,6 +57,7 @@ if test "z$with_distro" = "z"; then
AC_CHECK_FILE(/etc/mandriva-release,with_distro="openmandriva") AC_CHECK_FILE(/etc/mandriva-release,with_distro="openmandriva")
AC_CHECK_FILE(/etc/pardus-release,with_distro="pardus") AC_CHECK_FILE(/etc/pardus-release,with_distro="pardus")
AC_CHECK_FILE(/etc/altlinux-release,with_distro="altlinux") AC_CHECK_FILE(/etc/altlinux-release,with_distro="altlinux")
AC_CHECK_FILE(/etc/pld-release,with_distro="pld")
fi fi
with_distro=`echo ${with_distro} | tr '[[:upper:]]' '[[:lower:]]'` with_distro=`echo ${with_distro} | tr '[[:upper:]]' '[[:lower:]]'`
...@@ -72,7 +73,7 @@ case $with_distro in ...@@ -72,7 +73,7 @@ case $with_distro in
distroconf=default.conf.lxcbr distroconf=default.conf.lxcbr
distrosysconf="$sysconfdir/default" distrosysconf="$sysconfdir/default"
;; ;;
redhat|centos|fedora|oracle|oracleserver|sparclinux|altlinux|suse|opensuse*|plamo) redhat|centos|fedora|oracle|oracleserver|sparclinux|altlinux|suse|opensuse*|plamo|pld)
distroconf=default.conf.lxcbr distroconf=default.conf.lxcbr
distrosysconf="$sysconfdir/sysconfig" distrosysconf="$sysconfdir/sysconfig"
;; ;;
...@@ -108,6 +109,9 @@ case "$with_init_script" in ...@@ -108,6 +109,9 @@ case "$with_init_script" in
ubuntu) ubuntu)
init_script=upstart,systemd init_script=upstart,systemd
;; ;;
pld)
init_script=sysvinit,upstart,systemd
;;
*) *)
echo -n "Linux distribution init system unknown." echo -n "Linux distribution init system unknown."
init_script= init_script=
...@@ -168,7 +172,7 @@ AC_ARG_ENABLE([doc], ...@@ -168,7 +172,7 @@ AC_ARG_ENABLE([doc],
if test "x$enable_doc" = "xyes" -o "x$enable_doc" = "xauto"; then if test "x$enable_doc" = "xyes" -o "x$enable_doc" = "xauto"; then
db2xman="" 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) AC_MSG_CHECKING(for docbook2x-man)
for name in ${dbparsers}; do for name in ${dbparsers}; do
...@@ -834,6 +838,7 @@ AC_CONFIG_FILES([ ...@@ -834,6 +838,7 @@ AC_CONFIG_FILES([
templates/lxc-opensuse templates/lxc-opensuse
templates/lxc-oracle templates/lxc-oracle
templates/lxc-plamo templates/lxc-plamo
templates/lxc-pld
templates/lxc-slackware templates/lxc-slackware
templates/lxc-sshd templates/lxc-sshd
templates/lxc-ubuntu templates/lxc-ubuntu
......
...@@ -15,6 +15,7 @@ templates_SCRIPTS = \ ...@@ -15,6 +15,7 @@ templates_SCRIPTS = \
lxc-opensuse \ lxc-opensuse \
lxc-oracle \ lxc-oracle \
lxc-plamo \ lxc-plamo \
lxc-pld \
lxc-slackware \ lxc-slackware \
lxc-sshd \ lxc-sshd \
lxc-ubuntu \ lxc-ubuntu \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment