github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-25 11:44:44 +00:00
Code Issues Projects Releases Wiki Activity

merge inittab.x86_64 and inittab.armhf

Browse Source 
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 <natanael.copa@docker.com>
This commit is contained in:
Natanael Copa 2016-07-13 18:46:03 +02:00
parent 34bd1e9322
commit 9bbf27cb66
3 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
alpine/Makefile
View File

@ -1,13 +1,12 @@
all: initrd.img.gz mobylinux-efi.iso all: initrd.img.gz mobylinux-efi.iso
ETCFILES=etc/issue etc/motd etc/network/interfaces 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 rm -f initrd.img
$(MAKE) -C packages $(MAKE) -C packages
$(MAKE) -C kernel $(MAKE) -C kernel
cp inittab.x86_64 etc/inittab
docker-compose build moby docker-compose build moby
docker-compose run --rm -T moby /bin/mkinitrd.sh docker-compose run --rm -T moby /bin/mkinitrd.sh

0
alpine/inittab.armhf → alpine/etc/inittab
View File

12
alpine/inittab.x86_64
View File

@ -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