From c8cb5e5580ca99e55e5eade4b43b3cb34dc96c0d Mon Sep 17 00:00:00 2001 From: William Brown Date: Mon, 5 Dec 2016 14:27:14 +1000 Subject: [PATCH] Ticket 49052 - Environment quoting on fedora causes ds to fail to start. Bug Description: Systemd made a silent breaking change to the way they process environment values in .service files. This crippeled ASAN variants of DS. Fix Description: Change the quoting style. https://fedorahosted.org/389/ticket/49052 Author: wibrown Review by: ??? --- Makefile.am | 2 +- wrappers/systemd.template.asan.service.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 9cf30ee..b425354 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2020,7 +2020,7 @@ rpmroot: $(MKDIR_P) $(RPMBUILD)/SPECS $(MKDIR_P) $(RPMBUILD)/SRPMS -rpmbrprep: dist-bzip2 rpmroot +rpmbrprep: git-archive rpmroot cp $(distdir).tar.bz2 $(RPMBUILD)/SOURCES cp $(srcdir)/rpm/389-ds-base-git.sh $(RPMBUILD)/SOURCES cp $(srcdir)/rpm/389-ds-base-devel.README $(RPMBUILD)/SOURCES diff --git a/wrappers/systemd.template.asan.service.in b/wrappers/systemd.template.asan.service.in index 5de91de..8741a42 100644 --- a/wrappers/systemd.template.asan.service.in +++ b/wrappers/systemd.template.asan.service.in @@ -23,7 +23,7 @@ EnvironmentFile=@initconfigdir@/@package_name@ EnvironmentFile=@initconfigdir@/@package_name@-%i PIDFile=@localstatedir@/run/@package_name@/slapd-%i.pid # We can't symbolize here, as llvm symbolize crashes when it goes near systemd. -Environment='ASAN_OPTIONS="detect_leaks=1 symbolize=0 log_path=@localstatedir@/run/@package_name@/ns-slapd-%i.asan detect_deadlocks=1"' +Environment=ASAN_OPTIONS='detect_leaks=1 symbolize=0 log_path=@localstatedir@/run/@package_name@/ns-slapd-%i.asan detect_deadlocks=1' LimitCORE=infinity ExecStartPre=@sbindir@/ds_systemd_ask_password_acl @instconfigdir@/slapd-%i/dse.ldif ExecStart=@sbindir@/ns-slapd -D @instconfigdir@/slapd-%i -i @localstatedir@/run/@package_name@/slapd-%i.pid -- 1.8.3.1