Skip to contentSkip to conversation

systemd: fix sed line in "sanitize path in units" hook

PATCH New Ivan Sergeev 2 participants 3 messages Feb 15, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 systemd: fix sed line in "sanitize path in units" hook

The expanded SED variable already contains -e, so the extra -e was being interpreted as the sed command and causing sed to fail.

---
 package/systemd/systemd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/systemd/systemd.mk +1 -1
index 9086045..36ef704 100644
@@ -103,7 +103,7 @@ endef
 
 define SYSTEMD_SANITIZE_PATH_IN_UNITS
 	find $(TARGET_DIR)/lib/systemd/system -name '*.service' \
-		-exec $(SED) -e 's,$(HOST_DIR),,g' {} \;
+		-exec $(SED) 's,$(HOST_DIR),,g' {} \;
 endef
 
 SYSTEMD_POST_INSTALL_TARGET_HOOKS += \
Signature · 1 line
1.8.5.4
#1 lore raw

PATCH 1/1 systemd: fix sed line in "sanitize path in units" hook

Please note that this is intended for the next branch with the systemd v207 bump (which I am very happy about! thanks!).

Quoted 22 lines · Ivan Sergeev

The expanded SED variable already contains -e, so the extra -e was being interpreted as the sed command and causing sed to fail.

---
 package/systemd/systemd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/systemd/systemd.mk +1 -2
index 9086045..36ef704 100644
@@ -103,7 +103,7 @@ endef
 
 define SYSTEMD_SANITIZE_PATH_IN_UNITS
        find $(TARGET_DIR)/lib/systemd/system -name '*.service' \
-               -exec $(SED) -e 's,$(HOST_DIR),,g' {} \;
+               -exec $(SED) 's,$(HOST_DIR),,g' {} \;
 endef
 
 SYSTEMD_POST_INSTALL_TARGET_HOOKS += \
--
Quoted 3 lines

1.8.5.4

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20140214/3a8108e5/attachment.html>

#2 lore raw

PATCH 1/1 systemd: fix sed line in "sanitize path in units" hook

In reply to Ivan Sergeev
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Ivan" == Ivan Sergeev <[email protected]> writes:

The expanded SED variable already contains -e, so the extra -e was being interpreted as the sed command and causing sed to fail.

Committed to next, thanks.

Signature · 1 line
Bye, Peter Korsgaard