Attachment 41260 Details for Bug 32509 – systemd install: Use -f for "ln"

[patch] systemd install: Use -f for "ln"

systemd-install-Use--f-for-ln.patch (text/plain), 1.50 KB, created by Colin Walters on 2010-12-19 12:02:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Colin Walters

Created: 2010-12-19 12:02:55 UTC

Size: 1.50 KB

patch

obsolete

>From 6c21e4eb7d38e018b8759b38dced2bd42f23841a Mon Sep 17 00:00:00 2001
>From: Colin Walters <walters@verbum.org>
>Date: Sun, 19 Dec 2010 14:42:18 -0500
>Subject: [PATCH] systemd install: Use -f for "ln"
>
>We do want to overwrite an existing install; use case is "jhbuild"
>type setup.
>
>https://bugs.freedesktop.org/show_bug.cgi?id=32509
>---
> bus/Makefile.am |    6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/bus/Makefile.am b/bus/Makefile.am
>index efa8ab5..a3ff315 100644
>--- a/bus/Makefile.am
>+++ b/bus/Makefile.am
>@@ -228,12 +228,12 @@ endif
> if HAVE_SYSTEMD
> # Install dbus.socket as default implementation of a D-Bus stack
> 	$(mkinstalldirs) $(DESTDIR)$(systemdsystemunitdir)/dbus.target.wants
>-	$(LN_S) ../dbus.socket $(DESTDIR)$(systemdsystemunitdir)/dbus.target.wants/dbus.socket
>+	$(LN_S) -f ../dbus.socket $(DESTDIR)$(systemdsystemunitdir)/dbus.target.wants/dbus.socket
> # Unconditionally enable D-Bus on systemd installations
> 	$(mkinstalldirs) $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants
>-	$(LN_S) ../dbus.socket $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants/dbus.socket
>+	$(LN_S) -f ../dbus.socket $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants/dbus.socket
> 	$(mkinstalldirs) $(DESTDIR)$(systemdsystemunitdir)/multi-user.target.wants
>-	$(LN_S) ../dbus.service $(DESTDIR)$(systemdsystemunitdir)/multi-user.target.wants/dbus.service
>+	$(LN_S) -f ../dbus.service $(DESTDIR)$(systemdsystemunitdir)/multi-user.target.wants/dbus.service
> endif
> 
> #### Init scripts fun
>-- 
>1.7.3.3

Actions: View | Splinter Review

Attachments on bug 32509: 41260 | 41261 | 41262 | 41273

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.