shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-22 13:33:56 +03:00
Code

ldconfig: add configure option to disable

Browse Source
This commit is contained in:
Umut Tezduyar Lindskog 2014-08-05 12:17:09 +02:00 committed by Lennart Poettering
parent 438ca2bbd4
commit 12e34d9d58
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile.am
View File

@ -490,8 +490,7 @@ dist_systemunit_DATA = \
units/systemd-udevd-control.socket \ units/systemd-udevd-control.socket \
units/systemd-udevd-kernel.socket \ units/systemd-udevd-kernel.socket \
units/system-update.target \ units/system-update.target \
units/initrd-switch-root.target \ units/initrd-switch-root.target
units/ldconfig.service
nodist_systemunit_DATA = \ nodist_systemunit_DATA = \
units/getty@.service \ units/getty@.service \
@ -919,6 +918,16 @@ libsystemd_label_la_CFLAGS = \
libsystemd_label_la_LIBADD = \ libsystemd_label_la_LIBADD = \
$(SELINUX_LIBS) $(SELINUX_LIBS)
# -----------------------------------------------------------------------------
if ENABLE_LDCONFIG
dist_systemunit_DATA += \
units/ldconfig.service
SYSINIT_TARGET_WANTS += \
ldconfig.service
endif
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
if HAVE_SECCOMP if HAVE_SECCOMP
@ -5789,8 +5798,7 @@ endif
SYSINIT_TARGET_WANTS += \ SYSINIT_TARGET_WANTS += \
systemd-update-utmp.service \ systemd-update-utmp.service \
systemd-update-done.service \ systemd-update-done.service
ldconfig.service
LOCAL_FS_TARGET_WANTS += \ LOCAL_FS_TARGET_WANTS += \
systemd-remount-fs.service \ systemd-remount-fs.service \

5
configure.ac
View File

@ -1182,7 +1182,12 @@ AS_IF([test "x$enable_manpages" != xno], [have_manpages=yes])
AM_CONDITIONAL(ENABLE_MANPAGES, [test "x$have_manpages" = "xyes"]) AM_CONDITIONAL(ENABLE_MANPAGES, [test "x$have_manpages" = "xyes"])
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
AC_ARG_ENABLE(ldconfig,
[AC_HELP_STRING([--disable-ldconfig], [disable ldconfig])],
enable_ldconfig=$enableval, enable_ldconfig=yes)
AM_CONDITIONAL(ENABLE_LDCONFIG, [test x$enable_ldconfig = xyes])
# ------------------------------------------------------------------------------
# Location of the init scripts as mandated by LSB # Location of the init scripts as mandated by LSB
SYSTEM_SYSVINIT_PATH=/etc/init.d SYSTEM_SYSVINIT_PATH=/etc/init.d
SYSTEM_SYSVRCND_PATH=/etc/rc.d SYSTEM_SYSVRCND_PATH=/etc/rc.d

1
units/ldconfig.service
View File

@ -13,7 +13,6 @@ Conflicts=shutdown.target
After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-remount-fs.service After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-remount-fs.service
Before=sysinit.target shutdown.target systemd-update-done.service Before=sysinit.target shutdown.target systemd-update-done.service
ConditionNeedsUpdate=/etc ConditionNeedsUpdate=/etc
ConditionFileIsExecutable=/sbin/ldconfig
[Service] [Service]
Type=oneshot Type=oneshot