#50503 Issue 50425 - Add jemalloc LD_PRELOAD to systemd drop-in file
Closed 3 years ago by spichugi. Opened 4 years ago by mhonek.
mhonek/389-ds-base fix-ds-setup-regression  into  master

file modified
+9 -7
@@ -654,10 +654,8 @@ 

  #------------------------

  config_DATA = $(srcdir)/lib/ldaputil/certmap.conf \

  	$(srcdir)/ldap/schema/slapd-collations.conf \

+ 	ldap/admin/src/template-initconfig \

  	ldap/servers/snmp/ldap-agent.conf

- if !SYSTEMD

- config_DATA += ldap/admin/src/template-initconfig

- endif

  

  # the schema files in this list are either not

  # standard schema, not tested, or not compatible
@@ -987,14 +985,12 @@ 

          man/man5/slapd-collations.conf.5 \

          man/man8/suffix2instance.8 \

          man/man8/syntax-validate.pl.8 \

+         man/man5/template-initconfig.5 \

          man/man8/upgradednformat.8 \

          man/man8/upgradedb.8 \

          man/man8/usn-tombstone-cleanup.pl.8 \

          man/man8/vlvindex.8 \

          man/man8/verify-db.pl.8

- if !SYSTEMD

- dist_man_MANS += man/man5/template-initconfig.5

- endif

  

  #------------------------

  # updates
@@ -2298,14 +2294,20 @@ 

  	if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi

  	$(fixupcmd) $^ > $@

  

- if !SYSTEMD

  %/$(PACKAGE_NAME): %/base-initconfig.in

  	if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi

+ if SYSTEMD

+ 	$(fixupcmd) $^ | sed -e 's/@preamble@/# This file is in systemd EnvironmentFile format - see man systemd.exec/' > $@

+ else

  	$(fixupcmd) $^ | sed -n -e 's/@preamble@//' -e '/^#/{p;d;}' -e '/^$$/{p;d;}' -e 's/^\([^=]*\)\(=.*\)$$/\1\2 ; export \1/ ; p' > $@

  	$(fixupcmd) $(srcdir)/ldap/admin/src/initconfig.in >> $@

+ endif

  

  %/template-initconfig: %/template-initconfig.in

  	if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi

+ if SYSTEMD

+ 	$(fixupcmd) $^ | sed -e 's/@preamble@/# This file is in systemd EnvironmentFile format - see man systemd.exec/' > $@

+ else

  	$(fixupcmd) $^ | sed -n -e 's/@preamble@//' -e '/^#/{p;d;}' -e '/^$$/{p;d;}' -e 's/^\([^=]*\)\(=.*\)$$/\1\2 ; export \1/ ; p' > $@

  endif

  

file modified
+2
@@ -741,6 +741,8 @@ 

  %{_libexecdir}/%{pkgname}/ds_selinux_enabled

  %{_libexecdir}/%{pkgname}/ds_selinux_port_query

  %if %{use_perl}

+ %config(noreplace)%{_sysconfdir}/%{pkgname}/config/template-initconfig

+ %{_mandir}/man5/template-initconfig.5.gz

  %{_datadir}/%{pkgname}/properties/*.res

  %{_datadir}/%{pkgname}/script-templates

  %{_datadir}/%{pkgname}/updates

The previous fix (7466be3) for jemalloc inclusion stopped installing
template-initconfig rendering ds-setup.pl unusable.

This fix moves the template-initconfig into -legacy-tools
to make it available only when necessary.

Relates: https://pagure.io/389-ds-base/issue/50425

Reviewed by: ???

thanks for fixing this, ack

rebased onto 76c0e75

4 years ago

Pull-Request has been merged by mhonek

4 years ago

389-ds-base is moving from Pagure to Github. This means that new issues and pull requests
will be accepted only in 389-ds-base's github repository.

This pull request has been cloned to Github as issue and is available here:
- https://github.com/389ds/389-ds-base/issues/3559

If you want to continue to work on the PR, please navigate to the github issue,
download the patch from the attachments and file a new pull request.

Thank you for understanding. We apologize for all inconvenience.

Pull-Request has been closed by spichugi

3 years ago
Metadata