Use the sinit conventions for init

This should make it easier to switch out `init` for other versions,
although the `getty` config still needs to be removed.

- use `/bin/rc.init` for start
- use `rc.shutdown` for stop
- make `rc.init` run other code.
- merge `containers` and `containerd` startup code

Signed-off-by: Justin Cormack <justin.cormack@docker.com>

pkg/init/etc/init.d/010-containerd

@@ -1,5 +1,19 @@
 #!/bin/sh
 
+# set global ulimits TODO move to /etc/limits.conf
+ulimit -n 1048576
+ulimit -p unlimited
+
+# bring up containerd
+printf "\nStarting containerd\n"
+/usr/bin/containerd &
+
+# wait for socket to be there
+while [ ! -S /run/containerd/containerd.sock ]
+do
+	sleep 0.1
+done
+
 # start onboot containers, run to completion
 
 if [ -d /containers/onboot ]

pkg/init/etc/init.d/containerd

@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# bring up containerd
-ulimit -n 1048576
-ulimit -p unlimited
-
-printf "\nStarting containerd\n"
-mkdir -p /var/log
-exec /usr/bin/containerd

pkg/init/etc/init.d/rcS

@@ -1,112 +0,0 @@
-#!/bin/sh
-
-# mount filesystems
-mount -n -t proc proc /proc -o nodev,nosuid,noexec,relatime
-
-mount -n -t tmpfs tmpfs /run -o nodev,nosuid,noexec,relatime,size=10%,mode=755
-mount -n -t tmpfs tmpfs /tmp -o nodev,nosuid,noexec,relatime,size=10%,mode=1777
-
-# mount devfs
-mount -n -t devtmpfs dev /dev -o nosuid,noexec,relatime,size=10m,nr_inodes=248418,mode=755
-# devices
-[ -c /dev/console ] || mknod -m 600 /dev/console c 5 1
-[ -c /dev/tty1 ] || mknod -m 620 /dev/tty1 c 4 1
-[ -c /dev/tty ] || mknod -m 666 /dev/tty c 5 0
-
-[ -c /dev/null ] || mknod -m 666 /dev/null c 1 3
-[ -c /dev/kmsg ] || mknod -m 660 /dev/kmsg c 1 11
-
-# extra symbolic links not provided by default
-[ -e /dev/fd ] || ln -snf /proc/self/fd /dev/fd
-[ -e /dev/stdin ] || ln -snf /proc/self/fd/0 /dev/stdin
-[ -e /dev/stdout ] || ln -snf /proc/self/fd/1 /dev/stdout
-[ -e /dev/stderr ] || ln -snf /proc/self/fd/2 /dev/stderr
-[ -e /proc/kcore ] && ln -snf /proc/kcore /dev/core
-
-# devfs filesystems
-mkdir -p -m 1777 /dev/mqueue
-mkdir -p -m 1777 /dev/shm
-mkdir -p -m 0755 /dev/pts
-mount -n -t mqueue -o noexec,nosuid,nodev mqueue /dev/mqueue
-mount -n -t tmpfs -o noexec,nosuid,nodev,mode=1777 shm /dev/shm
-mount -n -t devpts -o noexec,nosuid,gid=5,mode=0620 devpts /dev/pts
-
-# mount sysfs
-sysfs_opts=nodev,noexec,nosuid
-mount -n -t sysfs -o ${sysfs_opts} sysfs /sys
-[ -d /sys/kernel/security ] && mount -n -t securityfs -o ${sysfs_opts} securityfs /sys/kernel/security
-[ -d /sys/kernel/debug ] && mount -n -t debugfs -o ${sysfs_opts} debugfs /sys/kernel/debug
-[ -d /sys/kernel/config ] && mount -n -t configfs -o ${sysfs_opts} configfs /sys/kernel/config
-[ -d /sys/fs/fuse/connections ] && mount -n -t fusectl -o ${sysfs_opts} fusectl /sys/fs/fuse/connections
-[ -d /sys/fs/selinux ] && mount -n -t selinuxfs -o nosuid,noexec selinuxfs /sys/fs/selinux
-[ -d /sys/fs/pstore ] && mount -n -t pstore pstore -o ${sysfs_opts} /sys/fs/pstore
-[ -d /sys/firmware/efi/efivars ] && mount -n -t efivarfs -o ro,${sysfs_opts} efivarfs /sys/firmware/efi/efivars
-
-# misc /proc mounted fs
-[ -d /proc/sys/fs/binfmt_misc ] && mount -t binfmt_misc -o nodev,noexec,nosuid binfmt_misc /proc/sys/fs/binfmt_misc
-
-# mount cgroups
-mount -n -t tmpfs -o nodev,noexec,nosuid,mode=755,size=10m cgroup_root /sys/fs/cgroup
-
-while read name hier groups enabled rest
-do
-	case "${enabled}" in
-	1)	mkdir -p /sys/fs/cgroup/${name}
-		mount -n -t cgroup -o ${sysfs_opts},${name} ${name} /sys/fs/cgroup/${name}
-	;;
-	esac
-done < /proc/cgroups
-
-# use hierarchy for memory
-echo 1 > /sys/fs/cgroup/memory/memory.use_hierarchy
-
-# for compatibility
-mkdir -p /sys/fs/cgroup/systemd
-mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd
-
-# start mdev for hotplug
-echo "/sbin/mdev" > /proc/sys/kernel/hotplug
-
-# mdev -s will not create /dev/usb[1-9] devices with recent kernels
-# so we trigger hotplug events for usb for now
-for i in $(find /sys/devices -name 'usb[0-9]*'); do
-	[ -e $i/uevent ] && echo add > $i/uevent
-done
-
-mdev -s
-
-# set hostname
-if [ -s /etc/hostname ]
-then
-	hostname -F /etc/hostname
-fi
-
-if [ $(hostname) = "(none)" -a -f /sys/class/net/eth0/address ]
-then
-	mac=$(cat /sys/class/net/eth0/address)
-	hostname linuxkit-$(echo $mac | sed 's/://g')
-fi
-
-# set system clock from hwclock
-hwclock --hctosys --utc
-
-# bring up loopback interface
-ip addr add 127.0.0.1/8 dev lo brd + scope host
-ip route add 127.0.0.0/8 dev lo scope host
-ip link set lo up
-
-# for containerising dhcpcd and other containers that need writable etc
-mkdir /tmp/etc
-mv /etc/resolv.conf /tmp/etc/resolv.conf
-ln -snf /tmp/etc/resolv.conf /etc/resolv.conf
-
-# remount rootfs as readonly
-mount -o remount,ro /
-
-# make /var writeable and shared
-mount -o bind /var /var
-mount -o remount,rw,nodev,nosuid,noexec,relatime /var /var
-mount --make-rshared /var
-
-# make / rshared
-mount --make-rshared /

pkg/init/etc/inittab

@@ -1,15 +1,9 @@
 # /etc/inittab
 
-::sysinit:/etc/init.d/rcS
-::once:/etc/init.d/containerd
-::once:/etc/init.d/containers
+::sysinit:/bin/rc.init
 
 # Stuff to do for the 3-finger salute
-::ctrlaltdel:/sbin/reboot
+::ctrlaltdel:/bin/rc.shutdown reboot
 
-# Stuff to do before rebooting
-::shutdown:/usr/sbin/killall5 -15
-::shutdown:/bin/sleep 5
-::shutdown:/usr/sbin/killall5 -9
-::shutdown:/bin/echo "Unmounting filesystems"
-::shutdown:/bin/umount -a -r
+# Stuff to do on shutdown
+::shutdown:/bin/rc.shutdown poweroff