merge?

2 files changed, 16 insertions, 20 deletions

diff --git a/remote/modules/rsyslogd/rsyslogd.build b/remote/modules/rsyslogd/rsyslogd.build
index 43aa112d..cee5c7ed 100644
--- a/remote/modules/rsyslogd/rsyslogd.build
+++ b/remote/modules/rsyslogd/rsyslogd.build
@@ -3,30 +3,22 @@ fetch_source() {
 }
 
 build() {
+	COPYLIST="list_dpkg_output"
+	[ -e "$COPYLIST" ] && rm "$COPYLIST"
 
-	FILELIST="list_binaries_and_files"
-	BIN_LOCATION=$(which rsyslogd)
-	if [ ! -z ${BIN_LOCATION} -a -e ${BIN_LOCATION} ];
-	then
-		get_link_chain "${BIN_LOCATION}" >> "${FILELIST}"
-	else
-		perror "${BIN} not found on the system! Please install it."
-		exit 1
-	fi
-
-	for ENTRY in ${REQUIRED_FILES} ${REQUIRED_DIRECTORIES}; do
-		get_link_chain "${ENTRY}" >> "${FILELIST}"
-	done
-	
-	tarcopy "$(cat ${FILELIST}|sort -u)" "${MODULE_BUILD_DIR}"
+	list_packet_files >> "$COPYLIST"
+	tarcopy "$(cat "$COPYLIST" | sort -u)" "${MODULE_BUILD_DIR}"
 
+	return 0
 }
 
-post_copy() {	
+post_copy() {
+	# pwd = module's build dir
 	mkdir -p "${TARGET_BUILD_DIR}"/var/spool/rsyslog
-	
-	[ -e /lib/systemd/system/rsyslog.service ] \
-		&& cp /lib/systemd/system/rsyslog.service "${TARGET_BUILD_DIR}"/etc/systemd/system/
+
+	local RSL="$(find /usr/lib/ /lib/ -name rsyslog.service | head -1)"
+	[ -z "$RSL" -o ! -e "$RSL" ] && perror "rsyslog.service not found on vorlage"
+	cp -L "$RSL" "$TARGET_BUILD_DIR/etc/systemd/system/"
 	sed -i 's/\/bin\/systemctl/-\/usr\/bin\/systemctl/g' "${TARGET_BUILD_DIR}"/etc/systemd/system/rsyslog.service
 	sed -i 's/^Before=udev/#&/' "${TARGET_BUILD_DIR}"/etc/systemd/system/rsyslog.service
 	
diff --git a/remote/modules/rsyslogd/rsyslogd.conf.zypper b/remote/modules/rsyslogd/rsyslogd.conf.zypper
index c41d7922..a70940e8 100644
--- a/remote/modules/rsyslogd/rsyslogd.conf.zypper
+++ b/remote/modules/rsyslogd/rsyslogd.conf.zypper
@@ -1,2 +1,6 @@
+REQUIRED_BINARIES="	rsyslogd
+			rsyslog-service-prepare"
+REQUIRED_PACKAGES="	rsyslog"
 REQUIRED_DIRECTORIES="	/etc/rsyslog.d
-			/lib/rsyslog"
+			/usr/lib/rsyslog
+			/var/run"