From 9bbf27cb66078d54f3c3981f8c55645d6fa7ade0 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 13 Jul 2016 18:46:03 +0200 Subject: [PATCH] merge inittab.x86_64 and inittab.armhf with the login tty generated from boot cmdline the inittab will be equal on all archs and platforms so we can merge and move to etc/ Signed-off-by: Natanael Copa --- alpine/Makefile | 5 ++--- alpine/{inittab.armhf => etc/inittab} | 0 alpine/inittab.x86_64 | 12 ------------ 3 files changed, 2 insertions(+), 15 deletions(-) rename alpine/{inittab.armhf => etc/inittab} (100%) delete mode 100644 alpine/inittab.x86_64 diff --git a/alpine/Makefile b/alpine/Makefile index 63132f7f2..0346bbcb9 100644 --- a/alpine/Makefile +++ b/alpine/Makefile @@ -1,13 +1,12 @@ all: initrd.img.gz mobylinux-efi.iso ETCFILES=etc/issue etc/motd etc/network/interfaces -ETCFILES+=etc/securetty +ETCFILES+=etc/securetty etc/inittab -initrd.img: Dockerfile mkinitrd.sh inittab.x86_64 init $(ETCFILES) +initrd.img: Dockerfile mkinitrd.sh init $(ETCFILES) rm -f initrd.img $(MAKE) -C packages $(MAKE) -C kernel - cp inittab.x86_64 etc/inittab docker-compose build moby docker-compose run --rm -T moby /bin/mkinitrd.sh diff --git a/alpine/inittab.armhf b/alpine/etc/inittab similarity index 100% rename from alpine/inittab.armhf rename to alpine/etc/inittab diff --git a/alpine/inittab.x86_64 b/alpine/inittab.x86_64 deleted file mode 100644 index 33ae471da..000000000 --- a/alpine/inittab.x86_64 +++ /dev/null @@ -1,12 +0,0 @@ -# /etc/inittab - -::sysinit:/sbin/openrc sysinit -::sysinit:/sbin/openrc boot -::wait:/sbin/openrc default - -# Stuff to do for the 3-finger salute -::ctrlaltdel:/sbin/reboot - -# Stuff to do before rebooting -::shutdown:/sbin/rc shutdown -