From c9377b9582b69b54517d89c388f19d56df3fd6f4 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 9 Jun 2019 00:57:08 +0200 Subject: [PATCH] - move syslogd init script away from skel-root --- .../scripts/syslogd.init | 0 make/rootfs.mk | 1 - make/system-scripts.mk | 7 +++++- skel-root/coolstream/hd1/etc/init.d/syslogd | 23 ------------------- skel-root/coolstream/hd2/etc/init.d/syslogd | 23 ------------------- 5 files changed, 6 insertions(+), 48 deletions(-) rename skel-root/armbox/hd51/etc/init.d/syslogd => archive-imagefiles/scripts/syslogd.init (100%) mode change 100755 => 100644 delete mode 100755 skel-root/coolstream/hd1/etc/init.d/syslogd delete mode 100755 skel-root/coolstream/hd2/etc/init.d/syslogd diff --git a/skel-root/armbox/hd51/etc/init.d/syslogd b/archive-imagefiles/scripts/syslogd.init old mode 100755 new mode 100644 similarity index 100% rename from skel-root/armbox/hd51/etc/init.d/syslogd rename to archive-imagefiles/scripts/syslogd.init diff --git a/make/rootfs.mk b/make/rootfs.mk index e84aba9e..a8fb4f54 100644 --- a/make/rootfs.mk +++ b/make/rootfs.mk @@ -133,7 +133,6 @@ endif $(CD) $(ROOTFS)/etc/init.d; \ ln -sf fstab K99fstab; \ ln -sf fstab S01fstab; \ - ln -sf syslogd K98syslogd; \ ln -sf networking K99networking ifeq ($(BOXSERIES), hd2) $(CD) $(ROOTFS)/etc; \ diff --git a/make/system-scripts.mk b/make/system-scripts.mk index 3d63ea9f..21f9b5a6 100644 --- a/make/system-scripts.mk +++ b/make/system-scripts.mk @@ -12,7 +12,8 @@ init-scripts: \ $(TARGET_DIR)/etc/init.d/crond \ $(TARGET_DIR)/etc/init.d/hostname \ $(TARGET_DIR)/etc/init.d/inetd \ - $(TARGET_DIR)/etc/init.d/swap + $(TARGET_DIR)/etc/init.d/swap \ + $(TARGET_DIR)/etc/init.d/syslogd $(TARGET_DIR)/etc/init.d/globals: install -D -m 0644 $(IMAGEFILES)/scripts/init.globals $@ @@ -52,6 +53,10 @@ ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51)) ln -sf swap $(TARGET_DIR)/etc/init.d/K99swap endif +$(TARGET_DIR)/etc/init.d/syslogd: + install -D -m 0755 $(IMAGEFILES)/scripts/syslogd.init $@ + ln -sf syslogd $(TARGET_DIR)/etc/init.d/K98syslogd + # ----------------------------------------------------------------------------- scripts: \ diff --git a/skel-root/coolstream/hd1/etc/init.d/syslogd b/skel-root/coolstream/hd1/etc/init.d/syslogd deleted file mode 100755 index ced64520..00000000 --- a/skel-root/coolstream/hd1/etc/init.d/syslogd +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# you can set options in /etc/profile.locale, variable SYSLOGD_OPTS -# -# without options and without /var/log (!), syslogd will simply -# log to the console. If /var/log/ exists, it will log to /var/log/messages - -. /etc/init.d/globals - -case "$1" in - start) - /sbin/syslogd $SYSLOGD_OPTS - ;; - stop) - killall syslogd - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "[$BASENAME] Usage: $0 {start|restart|stop}" - ;; -esac diff --git a/skel-root/coolstream/hd2/etc/init.d/syslogd b/skel-root/coolstream/hd2/etc/init.d/syslogd deleted file mode 100755 index ced64520..00000000 --- a/skel-root/coolstream/hd2/etc/init.d/syslogd +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# you can set options in /etc/profile.locale, variable SYSLOGD_OPTS -# -# without options and without /var/log (!), syslogd will simply -# log to the console. If /var/log/ exists, it will log to /var/log/messages - -. /etc/init.d/globals - -case "$1" in - start) - /sbin/syslogd $SYSLOGD_OPTS - ;; - stop) - killall syslogd - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "[$BASENAME] Usage: $0 {start|restart|stop}" - ;; -esac