diff options
| -rw-r--r-- | package/Config.in | 1 | ||||
| -rw-r--r-- | package/busybox/busybox.mk | 7 | ||||
| -rw-r--r-- | package/busybox/inittab (renamed from system/skeleton/etc/inittab) | 0 | ||||
| -rw-r--r-- | package/initscripts/Config.in | 4 | ||||
| -rwxr-xr-x | package/initscripts/init.d/S20urandom (renamed from system/skeleton/etc/init.d/S20urandom) | 0 | ||||
| -rwxr-xr-x | package/initscripts/init.d/S40network (renamed from system/skeleton/etc/init.d/S40network) | 0 | ||||
| -rwxr-xr-x | package/initscripts/init.d/rcK (renamed from system/skeleton/etc/init.d/rcK) | 0 | ||||
| -rwxr-xr-x | package/initscripts/init.d/rcS (renamed from system/skeleton/etc/init.d/rcS) | 0 | ||||
| -rw-r--r-- | package/initscripts/initscripts.mk | 15 | ||||
| -rw-r--r-- | package/sysvinit/sysvinit.mk | 2 | ||||
| -rw-r--r-- | system/Config.in | 2 |
11 files changed, 29 insertions, 2 deletions
diff --git a/package/Config.in b/package/Config.in index 9dbb28477..0288cb076 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1414,6 +1414,7 @@ endif source "package/ftop/Config.in" source "package/getent/Config.in" source "package/htop/Config.in" + source "package/initscripts/Config.in" source "package/iotop/Config.in" source "package/iprutils/Config.in" source "package/irqbalance/Config.in" diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 9289e0a21..aab7f5d57 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -148,6 +148,12 @@ define BUSYBOX_INSTALL_LOGGING_SCRIPT else rm -f $(TARGET_DIR)/etc/init.d/S01logging; fi endef +ifeq ($(BR2_INIT_BUSYBOX),y) +define BUSYBOX_INSTALL_INITTAB + $(INSTALL) -D -m 0644 package/busybox/inittab $(TARGET_DIR)/etc/inittab +endef +endif + ifeq ($(BR2_PACKAGE_BUSYBOX_WATCHDOG),y) define BUSYBOX_SET_WATCHDOG $(call KCONFIG_ENABLE_OPT,CONFIG_WATCHDOG,$(BUSYBOX_BUILD_CONFIG)) @@ -205,6 +211,7 @@ endef define BUSYBOX_INSTALL_TARGET_CMDS $(BUSYBOX_MAKE_ENV) $(MAKE) $(BUSYBOX_MAKE_OPTS) -C $(@D) install + $(BUSYBOX_INSTALL_INITTAB) $(BUSYBOX_INSTALL_UDHCPC_SCRIPT) $(BUSYBOX_INSTALL_MDEV_CONF) endef diff --git a/system/skeleton/etc/inittab b/package/busybox/inittab index b1892c1cb..b1892c1cb 100644 --- a/system/skeleton/etc/inittab +++ b/package/busybox/inittab diff --git a/package/initscripts/Config.in b/package/initscripts/Config.in new file mode 100644 index 000000000..82cbd5c67 --- /dev/null +++ b/package/initscripts/Config.in @@ -0,0 +1,4 @@ +config BR2_PACKAGE_INITSCRIPTS + bool + help + The basics startup scripts for both SysV and Busybox diff --git a/system/skeleton/etc/init.d/S20urandom b/package/initscripts/init.d/S20urandom index 36277ba61..36277ba61 100755 --- a/system/skeleton/etc/init.d/S20urandom +++ b/package/initscripts/init.d/S20urandom diff --git a/system/skeleton/etc/init.d/S40network b/package/initscripts/init.d/S40network index bfdd491e9..bfdd491e9 100755 --- a/system/skeleton/etc/init.d/S40network +++ b/package/initscripts/init.d/S40network diff --git a/system/skeleton/etc/init.d/rcK b/package/initscripts/init.d/rcK index 59e9c54ff..59e9c54ff 100755 --- a/system/skeleton/etc/init.d/rcK +++ b/package/initscripts/init.d/rcK diff --git a/system/skeleton/etc/init.d/rcS b/package/initscripts/init.d/rcS index de411534d..de411534d 100755 --- a/system/skeleton/etc/init.d/rcS +++ b/package/initscripts/init.d/rcS diff --git a/package/initscripts/initscripts.mk b/package/initscripts/initscripts.mk new file mode 100644 index 000000000..a5d8db7e9 --- /dev/null +++ b/package/initscripts/initscripts.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# initscripts +# +################################################################################ + +# source included in buildroot +INITSCRIPTS_SOURCE = + +define INITSCRIPTS_INSTALL_TARGET_CMDS + mkdir -p $(TARGET_DIR)/etc/init.d + $(INSTALL) -D -m 0755 package/initscripts/init.d/* $(TARGET_DIR)/etc/init.d/ +endef + +$(eval $(generic-package)) diff --git a/package/sysvinit/sysvinit.mk b/package/sysvinit/sysvinit.mk index 53640a4d9..2460dd922 100644 --- a/package/sysvinit/sysvinit.mk +++ b/package/sysvinit/sysvinit.mk @@ -34,8 +34,6 @@ define SYSVINIT_INSTALL_TARGET_CMDS for x in halt init shutdown killall5; do \ $(INSTALL) -D -m 0755 $(@D)/src/$$x $(TARGET_DIR)/sbin/$$x || exit 1; \ done - # Override BusyBox's inittab with an inittab compatible with - # sysvinit $(INSTALL) -D -m 0644 package/sysvinit/inittab $(TARGET_DIR)/etc/inittab ln -sf /sbin/halt $(TARGET_DIR)/sbin/reboot ln -sf /sbin/halt $(TARGET_DIR)/sbin/poweroff diff --git a/system/Config.in b/system/Config.in index b72aa1781..fad829dad 100644 --- a/system/Config.in +++ b/system/Config.in @@ -70,10 +70,12 @@ choice config BR2_INIT_BUSYBOX bool "BusyBox" select BR2_PACKAGE_BUSYBOX + select BR2_PACKAGE_INITSCRIPTS config BR2_INIT_SYSV bool "systemV" select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # sysvinit + select BR2_PACKAGE_INITSCRIPTS select BR2_PACKAGE_SYSVINIT config BR2_INIT_SYSTEMD |