Skip to content

Commit

Permalink
Merge pull request #1145 from glensc/pld-patch
Browse files Browse the repository at this point in the history
add PLD Linux support to upstream repo
  • Loading branch information
Christian Brauner committed Aug 23, 2016
2 parents f39f2ea + 487ea5f commit ff475ab
Show file tree
Hide file tree
Showing 3 changed files with 491 additions and 2 deletions.
9 changes: 7 additions & 2 deletions configure.ac
Expand Up @@ -57,6 +57,7 @@ if test "z$with_distro" = "z"; then
AC_CHECK_FILE(/etc/mandriva-release,with_distro="openmandriva")
AC_CHECK_FILE(/etc/pardus-release,with_distro="pardus")
AC_CHECK_FILE(/etc/altlinux-release,with_distro="altlinux")
AC_CHECK_FILE(/etc/pld-release,with_distro="pld")
fi
with_distro=`echo ${with_distro} | tr '[[:upper:]]' '[[:lower:]]'`

Expand All @@ -72,7 +73,7 @@ case $with_distro in
distroconf=default.conf.lxcbr
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
distrosysconf="$sysconfdir/sysconfig"
;;
Expand Down Expand Up @@ -108,6 +109,9 @@ case "$with_init_script" in
ubuntu)
init_script=upstart,systemd
;;
pld)
init_script=sysvinit,upstart,systemd
;;
*)
echo -n "Linux distribution init system unknown."
init_script=
Expand Down Expand Up @@ -168,7 +172,7 @@ AC_ARG_ENABLE([doc],

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 ${dbparsers}; do
Expand Down Expand Up @@ -834,6 +838,7 @@ AC_CONFIG_FILES([
templates/lxc-opensuse
templates/lxc-oracle
templates/lxc-plamo
templates/lxc-pld
templates/lxc-slackware
templates/lxc-sshd
templates/lxc-ubuntu
Expand Down
1 change: 1 addition & 0 deletions templates/Makefile.am
Expand Up @@ -15,6 +15,7 @@ templates_SCRIPTS = \
lxc-opensuse \
lxc-oracle \
lxc-plamo \
lxc-pld \
lxc-slackware \
lxc-sshd \
lxc-ubuntu \
Expand Down

0 comments on commit ff475ab

Please sign in to comment.