proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-09 12:43:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix some configure.ac issues

Browse Source 
- Run on distro without lsb_release
 - Don't try and interpret with_runtime_path as a command
 - Don't print stuff on screen while in the middle of a check

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
This commit is contained in:
Stéphane Graber 2014-02-12 17:46:06 -05:00
parent 4d213bd3d7
commit 5a15791eb2
No known key found for this signature in database
GPG Key ID: C638974D64792D67
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@ -35,7 +35,7 @@ AC_GNU_SOURCE
# for some distro-specific build options. # for some distro-specific build options.
AC_MSG_CHECKING([host distribution]) AC_MSG_CHECKING([host distribution])
AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, oracle, centos, fedora, suse, gentoo, debian, arch, slackware, paldo, openmandriva or pardus.])) AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, oracle, centos, fedora, suse, gentoo, debian, arch, slackware, paldo, openmandriva or pardus.]))
if test "z$with_distro" = "z"; then if type lsb_release >/dev/null 2>&1 && test "z$with_distro" = "z"; then
with_distro=`lsb_release -is` with_distro=`lsb_release -is`
fi fi
if test "z$with_distro" = "z"; then if test "z$with_distro" = "z"; then
@ -66,7 +66,6 @@ case $with_distro in
distroconf=default.conf.libvirt distroconf=default.conf.libvirt
;; ;;
*) *)
echo -n "Linux distribution network config unknown, defaulting to lxc.network.type = empty"
distroconf=default.conf.unknown distroconf=default.conf.unknown
;; ;;
esac esac
@ -432,7 +431,7 @@ AC_ARG_WITH([usernic-db],
[AC_HELP_STRING( [AC_HELP_STRING(
[--with-usernic-db], [--with-usernic-db],
[lxc user nic database] [lxc user nic database]
)], [], [with_usernic_db=['$(with_runtime_path)/lxc/nics']]) )], [], [with_usernic_db=['${with_runtime_path}/lxc/nics']])
# Rootfs path, where the container mount structure is assembled # Rootfs path, where the container mount structure is assembled
AC_ARG_WITH([rootfs-path], AC_ARG_WITH([rootfs-path],