shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-10-27 01:55:32 +03:00
Code

systemctl: enable chkconfig compat only if chkconfig is found rather than based on distro

Browse Source
This commit is contained in:
Lennart Poettering 2013-01-04 22:32:31 +01:00
parent 32f992a514
commit 77e68fa2f0
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
configure.ac
View File

@ -232,6 +232,25 @@ if test "x${have_ima}" != xno ; then
AC_DEFINE(HAVE_IMA, 1, [Define if IMA is available])
fi
# ------------------------------------------------------------------------------
have_chkconfig=yes
AC_ARG_ENABLE([chkconfig], AS_HELP_STRING([--disable-chkconfig],[Disable optional chkconfig support]),
[case "${enableval}" in
yes) have_chkconfig=yes ;;
no) have_chkconfig=no ;;
*) AC_MSG_ERROR(bad value ${enableval} for --disable-chkconfig) ;;
esac],
[AC_PATH_PROG(CHKCONFIG, chkconfig)
if test -z "$CHKCONFIG"; then
have_chkconfig=no
else
have_chkconfig=yes
fi])
if test "x${have_chkconfig}" != xno ; then
AC_DEFINE(HAVE_CHKCONFIG, 1, [Define if CHKCONFIG is available])
fi
# ------------------------------------------------------------------------------
have_selinux=no
AC_ARG_ENABLE(selinux, AS_HELP_STRING([--disable-selinux], [Disable optional SELINUX support]))
@ -873,6 +892,7 @@ AC_MSG_RESULT([
GCRYPT: ${have_gcrypt}
QRENCODE: ${have_qrencode}
MICROHTTPD: ${have_microhttpd}
CHKCONFIG: ${have_chkconfig}
binfmt: ${have_binfmt}
vconsole: ${have_vconsole}
readahead: ${have_readahead}

2
src/systemctl/systemctl.c
View File

@ -3436,7 +3436,7 @@ finish:
static int enable_sysv_units(char **args) {
int r = 0;
#if defined (HAVE_SYSV_COMPAT) && (defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_SUSE) || defined(TARGET_ALTLINUX) || defined(TARGET_MAGEIA))
#if defined(HAVE_SYSV_COMPAT) && defined(HAVE_CHKCONFIG)
const char *verb = args[0];
unsigned f = 1, t = 1;
LookupPaths paths;