sysvinit: install new cmds and fix inittab
authorRyan Barnett <rjbarnet@rockwellcollins.com>
Wed, 30 Oct 2013 22:55:32 +0000 (17:55 -0500)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Fri, 1 Nov 2013 14:42:37 +0000 (15:42 +0100)
Adding support for sysvinit to install reboot, poweroff, and pidof
commands available in /sbin.

Fixes bug #6620

Removed uninstall commands since they aren't used.

There is an error with sysvinit that will prevent the system from booting
if "dshm::sysinit:/bin/mkdir -p /dev/shm" is not present in the inittab.

Signed-off-by: Ryan Barnett <rjbarnet@rockwellcollins.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
package/sysvinit/inittab
package/sysvinit/sysvinit.mk

index afa0dc35c97983ff1495c94b3bc0f258aa4aed9d..c85e75a045ce559aa5eb0dd489019375cb992a02 100644 (file)
@@ -7,6 +7,7 @@ id:1:initdefault:
 proc::sysinit:/bin/mount -t proc proc /proc
 rwmo::sysinit:/bin/mount -o remount,rw / # REMOUNT_ROOTFS_RW
 dpts::sysinit:/bin/mkdir -p /dev/pts
+dshm::sysinit:/bin/mkdir -p /dev/shm
 moun::sysinit:/bin/mount -a
 host::sysinit:/bin/hostname -F /etc/hostname
 init::sysinit:/etc/init.d/rcS
index 131c63fa3a2b8f2120bbc4f318dd212f358e41fd..07bfc6fddf2918b49c458fbbbd49ae6b13aaf7ee 100644 (file)
@@ -31,18 +31,15 @@ define SYSVINIT_BUILD_CMDS
 endef
 
 define SYSVINIT_INSTALL_TARGET_CMDS
-       for x in halt init shutdown; do \
+       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
-endef
-
-define SYSVINIT_UNINSTALL_TARGET_CMDS
-       for x in halt init shutdown; do \
-               rm -f $(TARGET_DIR)/sbin/$$x || exit 1; \
-       done
+       ln -sf /sbin/halt $(TARGET_DIR)/sbin/reboot
+       ln -sf /sbin/halt $(TARGET_DIR)/sbin/poweroff
+       ln -sf killall5 $(TARGET_DIR)/sbin/pidof
 endef
 
 define SYSVINIT_CLEAN_CMDS