From 5b2fefd682a1eaa4cfc7e6b44a1c846684c180ab Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 6 May 2013 11:40:40 +0200
Subject: Make mounting squashfs smarter; fix module loading logging Fixes to
 rsyslogd module buildscript

---
 remote/modules/rsyslogd/rsyslogd.build | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'remote/modules')

diff --git a/remote/modules/rsyslogd/rsyslogd.build b/remote/modules/rsyslogd/rsyslogd.build
index 14e6de8b..c35d07b7 100644
--- a/remote/modules/rsyslogd/rsyslogd.build
+++ b/remote/modules/rsyslogd/rsyslogd.build
@@ -26,8 +26,9 @@ post_copy() {
 	sed -i 's/^Before=udev/#&/' "${TARGET_BUILD_DIR}"/etc/systemd/system/rsyslog.service
 	
 	# activate the service
-        ln -s rsyslog.service "${TARGET_BUILD_DIR}"/etc/systemd/system/syslog.service
+        ln -sf rsyslog.service "${TARGET_BUILD_DIR}"/etc/systemd/system/syslog.service
 	[ ! -d "${TARGET_BUILD_DIR}"/etc/systemd/system/basic.target.wants ] && mkdir -p "${TARGET_BUILD_DIR}"/etc/systemd/system/basic.target.wants
-	ln -s ../syslog.service "${TARGET_BUILD_DIR}"/etc/systemd/system/basic.target.wants/syslog.service
-	
+	ln -sf ../syslog.service "${TARGET_BUILD_DIR}"/etc/systemd/system/basic.target.wants/syslog.service
+	# TODO: more checks
+	sed -i.bak '/^After\=var-run.mount/d;/^Requires\=var-run.mount/d;/^Before\=syslog.target/d' "$TARGET_BUILD_DIR/etc/systemd/system/rsyslog.service"
 }
-- 
cgit v1.2.3-55-g7522