Attachment 84612 Details for Bug 68541 – proposed patch

[patch] proposed patch

0001-timedated-Look-in-rootprefix.patch (text/plain), 1.34 KB, created by Sjoerd Simons on 2013-08-25 19:05:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sjoerd Simons

Created: 2013-08-25 19:05:13 UTC

Size: 1.34 KB

patch

obsolete

>From 8a776ba0fb493a0573537cc9ede8914f63c87c0d Mon Sep 17 00:00:00 2001
>From: Sjoerd Simons <sjoerd@luon.net>
>Date: Sun, 25 Aug 2013 17:20:33 +0200
>Subject: [PATCH] timedated: Look in rootprefix
>
>Instead of hardcoding /usr/lib/systemd look in
>ROOTPREFIX/lib/systemd/ntp-units
>---
> Makefile.am              | 2 +-
> src/timedate/timedated.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/Makefile.am b/Makefile.am
>index fd38e82..5f0aad5 100644
>--- a/Makefile.am
>+++ b/Makefile.am
>@@ -3568,7 +3568,7 @@ dbusinterface_DATA += \
> 	org.freedesktop.timedate1.xml
> 
> INSTALL_DIRS += \
>-	$(prefix)/lib/systemd/ntp-units.d \
>+	$(rootprefix)/lib/systemd/ntp-units.d \
> 	$(sysconfdir)/systemd/ntp-units.d
> 
> SYSTEM_UNIT_ALIASES += \
>diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
>index 525c72e..b6cc433 100644
>--- a/src/timedate/timedated.c
>+++ b/src/timedate/timedated.c
>@@ -278,7 +278,7 @@ static char** get_ntp_services(void) {
>                             "/etc/systemd/ntp-units.d",
>                             "/run/systemd/ntp-units.d",
>                             "/usr/local/lib/systemd/ntp-units.d",
>-                            "/usr/lib/systemd/ntp-units.d",
>+                            ROOTPREFIX"/lib/systemd/ntp-units.d",
>                             NULL);
>         if (k < 0)
>                 return NULL;
>-- 
>1.8.4.rc3
>

Actions: View | Splinter Review

Attachments on bug 68541: 84612

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.