From 6b00c90d709a01822027fb9986ec8ace605dd991 Mon Sep 17 00:00:00 2001 From: "\"Steven J. Hill\"" Date: Wed, 9 May 2007 22:48:41 +0000 Subject: [PATCH] Rename all INIT scripts to have the numerical prefixes to easily see the start-up order. --- package/dbus/{init-dbus => S97messagebus} | 0 package/dbus/dbus.mk | 2 +- package/dhcp/{init-relay => S80dhcp-relay} | 0 package/dhcp/{init-server => S80dhcp-server} | 0 package/dhcp/dhcp.mk | 4 ++-- package/hal/{init-hal => S98haldaemon} | 0 package/hal/hal.mk | 2 +- package/ltt/{init-tracer => S27tracer} | 0 package/ltt/ltt.mk | 2 +- package/netplug/{init-netplug => S29netplug} | 0 package/netplug/netplug.mk | 2 +- package/nfs-utils/{init-nfs => S60nfs} | 0 package/nfs-utils/nfs-utils.mk | 2 +- package/portmap/{init-portmap => S13portmap} | 0 package/portmap/portmap.mk | 2 +- package/proftpd/{init-proftpd => S50proftpd} | 0 package/proftpd/proftpd.mk | 2 +- package/samba/{init-samba => S91smb} | 0 package/samba/samba.mk | 2 +- package/sysklogd/{init-syslog => S25syslog} | 0 package/sysklogd/sysklogd.mk | 2 +- package/tftpd/{init-tftpd => S80tftpd-hpa} | 0 package/tftpd/tftpd.mk | 2 +- package/udev/{init-udev => S10udev} | 0 package/udev/udev.mk | 2 +- 25 files changed, 13 insertions(+), 13 deletions(-) rename package/dbus/{init-dbus => S97messagebus} (100%) rename package/dhcp/{init-relay => S80dhcp-relay} (100%) rename package/dhcp/{init-server => S80dhcp-server} (100%) rename package/hal/{init-hal => S98haldaemon} (100%) rename package/ltt/{init-tracer => S27tracer} (100%) rename package/netplug/{init-netplug => S29netplug} (100%) rename package/nfs-utils/{init-nfs => S60nfs} (100%) rename package/portmap/{init-portmap => S13portmap} (100%) rename package/proftpd/{init-proftpd => S50proftpd} (100%) rename package/samba/{init-samba => S91smb} (100%) rename package/sysklogd/{init-syslog => S25syslog} (100%) rename package/tftpd/{init-tftpd => S80tftpd-hpa} (100%) rename package/udev/{init-udev => S10udev} (100%) diff --git a/package/dbus/init-dbus b/package/dbus/S97messagebus similarity index 100% rename from package/dbus/init-dbus rename to package/dbus/S97messagebus diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index 47210708f7..289811dda5 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -65,7 +65,7 @@ $(TARGET_DIR)/$(DBUS_TARGET_BINARY): $(STAGING_DIR)/usr/lib/libdbus-1.so rm -f $(TARGET_DIR)/usr/lib/libdbus-1.so -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libdbus-1.so.3.2.0 $(MAKE) DESTDIR=$(TARGET_DIR) initddir=/etc/init.d -C $(DBUS_DIR)/bus install - $(INSTALL) -m 0755 -D package/dbus/init-dbus $(TARGET_DIR)/etc/init.d/S97messagebus + $(INSTALL) -m 0755 -D package/dbus/S97messagebus $(TARGET_DIR)/etc/init.d rm -f $(TARGET_DIR)/etc/init.d/messagebus rm -rf $(TARGET_DIR)/usr/man rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share diff --git a/package/dhcp/init-relay b/package/dhcp/S80dhcp-relay similarity index 100% rename from package/dhcp/init-relay rename to package/dhcp/S80dhcp-relay diff --git a/package/dhcp/init-server b/package/dhcp/S80dhcp-server similarity index 100% rename from package/dhcp/init-server rename to package/dhcp/S80dhcp-server diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk index 75fd554b23..ec219e737f 100644 --- a/package/dhcp/dhcp.mk +++ b/package/dhcp/dhcp.mk @@ -43,7 +43,7 @@ $(DHCP_DIR)/$(DHCP_RELAY_BINARY): $(DHCP_DIR)/.configured $(TARGET_DIR)/$(DHCP_SERVER_TARGET_BINARY): $(DHCP_DIR)/$(DHCP_RELAY_BINARY) (cd $(TARGET_DIR)/var/lib; ln -snf /tmp dhcp) $(INSTALL) -m 0755 -D $(DHCP_DIR)/$(DHCP_SERVER_BINARY) $(TARGET_DIR)/$(DHCP_SERVER_TARGET_BINARY) - $(INSTALL) -m 0755 -D package/dhcp/init-server $(TARGET_DIR)/etc/init.d/S80dhcp-server + $(INSTALL) -m 0755 -D package/dhcp/S80dhcp-server $(TARGET_DIR)/etc/init.d $(INSTALL) -m 0644 -D package/dhcp/dhcpd.conf $(TARGET_DIR)/etc/dhcp/dhcpd.conf rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc @@ -51,7 +51,7 @@ $(TARGET_DIR)/$(DHCP_SERVER_TARGET_BINARY): $(DHCP_DIR)/$(DHCP_RELAY_BINARY) $(TARGET_DIR)/$(DHCP_RELAY_TARGET_BINARY): $(DHCP_DIR)/$(DHCP_RELAY_BINARY) (cd $(TARGET_DIR)/var/lib; ln -snf /tmp dhcp) $(INSTALL) -m 0755 -D $(DHCP_DIR)/$(DHCP_RELAY_BINARY) $(TARGET_DIR)/$(DHCP_RELAY_TARGET_BINARY) - $(INSTALL) -m 0755 -D package/dhcp/init-relay $(TARGET_DIR)/etc/init.d/S80dhcp-relay + $(INSTALL) -m 0755 -D package/dhcp/S80dhcp-relay $(TARGET_DIR)/etc/init.d rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc diff --git a/package/hal/init-hal b/package/hal/S98haldaemon similarity index 100% rename from package/hal/init-hal rename to package/hal/S98haldaemon diff --git a/package/hal/hal.mk b/package/hal/hal.mk index 3d35a4c675..130d0da465 100644 --- a/package/hal/hal.mk +++ b/package/hal/hal.mk @@ -74,7 +74,7 @@ $(TARGET_DIR)/$(HAL_TARGET_BINARY): $(HAL_DIR)/hald/hald rm -rf $(TARGET_DIR)/usr/lib/libhal*.la rm -rf $(TARGET_DIR)/usr/lib/hal rm -rf $(TARGET_DIR)/etc/PolicyKit - $(INSTALL) -m 0755 -D package/hal/init-hal $(TARGET_DIR)/etc/init.d/S98haldaemon + $(INSTALL) -m 0755 -D package/hal/S98haldaemon $(TARGET_DIR)/etc/init.d rm -rf $(TARGET_DIR)/etc/rc.d for file in hald-addon-acpi* hald-addon-cpufreq \ hald-addon-keyboard hald-addon-pmu \ diff --git a/package/ltt/init-tracer b/package/ltt/S27tracer similarity index 100% rename from package/ltt/init-tracer rename to package/ltt/S27tracer diff --git a/package/ltt/ltt.mk b/package/ltt/ltt.mk index f4a2d0962f..3626c232d1 100644 --- a/package/ltt/ltt.mk +++ b/package/ltt/ltt.mk @@ -98,7 +98,7 @@ $(TARGET_DIR)/usr/bin/tracedaemon: $(LTT_DIR2)/$(LTT_TARGET_BINARY) $(MAKE) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR) \ -C $(LTT_DIR2)/Daemon install $(STRIP) $(TARGET_DIR)/usr/bin/tracedaemon > /dev/null 2>&1 - $(INSTALL) -D -m 0755 package/ltt/init-tracer $(TARGET_DIR)/etc/init.d/S27tracer + $(INSTALL) -D -m 0755 package/ltt/S27tracer $(TARGET_DIR)/etc/init.d ltt-tracedaemon: uclibc $(TARGET_DIR)/usr/bin/tracedaemon diff --git a/package/netplug/init-netplug b/package/netplug/S29netplug similarity index 100% rename from package/netplug/init-netplug rename to package/netplug/S29netplug diff --git a/package/netplug/netplug.mk b/package/netplug/netplug.mk index 018b03b636..bf9b92cf3f 100644 --- a/package/netplug/netplug.mk +++ b/package/netplug/netplug.mk @@ -28,7 +28,7 @@ $(NETPLUG_DIR)/$(NETPLUG_BINARY): $(NETPLUG_DIR)/.unpacked $(TARGET_DIR)/$(NETPLUG_TARGET_BINARY): $(NETPLUG_DIR)/$(NETPLUG_BINARY) $(INSTALL) -m 644 -D $(NETPLUG_DIR)/etc/netplugd.conf $(TARGET_DIR)/etc/netplug/netplugd.conf $(INSTALL) -m 755 -D package/netplug/netplug-script $(TARGET_DIR)/etc/netplug.d/netplug - $(INSTALL) -m 755 -D package/netplug/init-netplug $(TARGET_DIR)/etc/init.d/S29netplug + $(INSTALL) -m 755 -D package/netplug/S29netplug $(TARGET_DIR)/etc/init.d $(INSTALL) -m 755 -D $(NETPLUG_DIR)/$(NETPLUG_BINARY) $(TARGET_DIR)/$(NETPLUG_TARGET_BINARY) touch -c $(TARGET_DIR)/$(NETPLUG_TARGET_BINARY) diff --git a/package/nfs-utils/init-nfs b/package/nfs-utils/S60nfs similarity index 100% rename from package/nfs-utils/init-nfs rename to package/nfs-utils/S60nfs diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index 36cc523470..b79a9e3d5f 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -64,7 +64,7 @@ $(STAGING_DIR)/.fakeroot.nfs-utils: $(NFS_UTILS_DIR)/$(NFS_UTILS_BINARY) echo "$(MAKE) prefix=$(TARGET_DIR)/usr statedir=$(TARGET_DIR)/var/lib/nfs CC=$(TARGET_CC) -C $(NFS_UTILS_DIR) install" > $@ echo "rm -f $(TARGET_DIR)/usr/bin/event_rpcgen.py $(TARGET_DIR)/usr/sbin/nhfs* $(TARGET_DIR)/usr/sbin/nfsstat $(TARGET_DIR)/usr/sbin/showmount" >> $@ echo "rm -rf $(TARGET_DIR)/usr/share/man" >> $@ - echo "$(INSTALL) -m 0755 -D package/nfs-utils/init-nfs $(TARGET_DIR)/etc/init.d/S60nfs" >> $@ + echo "$(INSTALL) -m 0755 -D package/nfs-utils/S60nfs $(TARGET_DIR)/etc/init.d" >> $@ echo -n "for file in $(NFS_UTILS_TARGETS_) ; do rm -f $(TARGET_DIR)/" >> $@ echo -n "\$$" >> $@ echo "file; done" >> $@ diff --git a/package/portmap/init-portmap b/package/portmap/S13portmap similarity index 100% rename from package/portmap/init-portmap rename to package/portmap/S13portmap diff --git a/package/portmap/portmap.mk b/package/portmap/portmap.mk index 29fdc2927c..6b0ba453a0 100644 --- a/package/portmap/portmap.mk +++ b/package/portmap/portmap.mk @@ -26,7 +26,7 @@ $(PORTMAP_DIR)/$(PORTMAP_BINARY): $(PORTMAP_DIR)/.unpacked $(TARGET_DIR)/$(PORTMAP_TARGET_BINARY): $(PORTMAP_DIR)/$(PORTMAP_BINARY) $(INSTALL) -D $(PORTMAP_DIR)/$(PORTMAP_BINARY) $(TARGET_DIR)/$(PORTMAP_TARGET_BINARY) - $(INSTALL) -m 0755 -D package/portmap/init-portmap $(TARGET_DIR)/etc/init.d/S13portmap + $(INSTALL) -m 0755 -D package/portmap/S13portmap $(TARGET_DIR)/etc/init.d portmap: uclibc $(TARGET_DIR)/$(PORTMAP_TARGET_BINARY) diff --git a/package/proftpd/init-proftpd b/package/proftpd/S50proftpd similarity index 100% rename from package/proftpd/init-proftpd rename to package/proftpd/S50proftpd diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk index d2e7fada7d..231f4535a2 100644 --- a/package/proftpd/proftpd.mk +++ b/package/proftpd/proftpd.mk @@ -56,7 +56,7 @@ $(TARGET_DIR)/$(PROFTPD_TARGET_BINARY): $(PROFTPD_DIR)/$(PROFTPD_BINARY) @if [ ! -f $(TARGET_DIR)/etc/proftpd.conf ] ; then \ $(INSTALL) -m 0644 -D $(PROFTPD_DIR)/sample-configurations/basic.conf $(TARGET_DIR)/etc/proftpd.conf; \ fi; - $(INSTALL) -m 0755 -D package/proftpd/init-proftpd $(TARGET_DIR)/etc/init.d/S50proftpd + $(INSTALL) -m 0755 -D package/proftpd/S50proftpd $(TARGET_DIR)/etc/init.d proftpd: uclibc $(TARGET_DIR)/$(PROFTPD_TARGET_BINARY) diff --git a/package/samba/init-samba b/package/samba/S91smb similarity index 100% rename from package/samba/init-samba rename to package/samba/S91smb diff --git a/package/samba/samba.mk b/package/samba/samba.mk index af8bfcd89e..dd177c063b 100644 --- a/package/samba/samba.mk +++ b/package/samba/samba.mk @@ -92,7 +92,7 @@ $(TARGET_DIR)/$(SAMBA_TARGET_BINARY): $(SAMBA_DIR)/$(SAMBA_BINARY) for file in $(SAMBA_TARGETS_) ; do \ rm -f $(TARGET_DIR)/$$file; \ done - $(INSTALL) -m 0755 -D package/samba/init-samba $(TARGET_DIR)/etc/init.d/S91smb + $(INSTALL) -m 0755 -D package/samba/S91smb $(TARGET_DIR)/etc/init.d @if [ ! -f $(TARGET_DIR)/etc/samba/smb.conf ] ; then \ $(INSTALL) -m 0755 -D package/samba/simple.conf $(TARGET_DIR)/etc/samba/smb.conf; \ fi; diff --git a/package/sysklogd/init-syslog b/package/sysklogd/S25syslog similarity index 100% rename from package/sysklogd/init-syslog rename to package/sysklogd/S25syslog diff --git a/package/sysklogd/sysklogd.mk b/package/sysklogd/sysklogd.mk index 84f966c655..1836fa0d4e 100644 --- a/package/sysklogd/sysklogd.mk +++ b/package/sysklogd/sysklogd.mk @@ -32,7 +32,7 @@ $(SYSKLOGD_DIR)/$(SYSKLOGD_BINARY): $(SYSKLOGD_DIR)/.unpacked $(TARGET_DIR)/$(SYSKLOGD_TARGET_BINARY): $(SYSKLOGD_DIR)/$(SYSKLOGD_BINARY) $(INSTALL) -m 0755 -D $(SYSKLOGD_DIR)/$(SYSKLOGD_SYSLOGD_BINARY) $(TARGET_DIR)/$(SYSKLOGD_SYSLOGD_TARGET_BINARY) $(INSTALL) -m 0755 -D $(SYSKLOGD_DIR)/$(SYSKLOGD_KLOGD_BINARY) $(TARGET_DIR)/$(SYSKLOGD_KLOGD_TARGET_BINARY) - $(INSTALL) -m 0755 -D package/sysklogd/init-syslog $(TARGET_DIR)/etc/init.d/S25syslog + $(INSTALL) -m 0755 -D package/sysklogd/S25syslog $(TARGET_DIR)/etc/init.d $(INSTALL) -m 0644 -D package/sysklogd/syslog.conf $(TARGET_DIR)/etc/syslog.conf sysklogd: uclibc $(TARGET_DIR)/$(SYSKLOGD_TARGET_BINARY) diff --git a/package/tftpd/init-tftpd b/package/tftpd/S80tftpd-hpa similarity index 100% rename from package/tftpd/init-tftpd rename to package/tftpd/S80tftpd-hpa diff --git a/package/tftpd/tftpd.mk b/package/tftpd/tftpd.mk index 69d15d910a..8a9b6c5900 100644 --- a/package/tftpd/tftpd.mk +++ b/package/tftpd/tftpd.mk @@ -59,7 +59,7 @@ $(TARGET_DIR)/$(TFTP_HPA_TARGET_BINARY): $(TFTP_HPA_DIR)/$(TFTP_HPA_BINARY) rm -f $(TARGET_DIR)/$(TFTP_HPA_TARGET_BINARY); \ cp -a $(TFTP_HPA_DIR)/$(TFTP_HPA_BINARY) $(TARGET_DIR)/$(TFTP_HPA_TARGET_BINARY); fi ; @if [ ! -f $(TARGET_DIR)/etc/init.d/S80tftpd-hpa ] ; then \ - $(INSTALL) -m 0755 -D package/tftpd/init-tftpd $(TARGET_DIR)/etc/init.d/S80tftpd-hpa; \ + $(INSTALL) -m 0755 -D package/tftpd/S80tftpd-hpa $(TARGET_DIR)/etc/init.d \ fi; tftpd: uclibc $(TARGET_DIR)/$(TFTP_HPA_TARGET_BINARY) diff --git a/package/udev/init-udev b/package/udev/S10udev similarity index 100% rename from package/udev/init-udev rename to package/udev/S10udev diff --git a/package/udev/udev.mk b/package/udev/udev.mk index d33d6b4018..52b99efeac 100644 --- a/package/udev/udev.mk +++ b/package/udev/udev.mk @@ -45,7 +45,7 @@ $(TARGET_DIR)/$(UDEV_TARGET_BINARY): $(UDEV_DIR)/$(UDEV_BINARY) LDFLAGS="-warn-common" \ USE_LOG=false USE_SELINUX=false \ udevdir=$(UDEV_ROOT) -C $(UDEV_DIR) install - $(INSTALL) -m 0755 -D package/udev/init-udev $(TARGET_DIR)/etc/init.d/S10udev + $(INSTALL) -m 0755 -D package/udev/S10udev $(TARGET_DIR)/etc/init.d rm -rf $(TARGET_DIR)/usr/share/man ifneq ($(strip $(BR2_PACKAGE_UDEV_UTILS)),y) rm -f $(TARGET_DIR)/usr/sbin/udevmonitor -- 2.30.2