diff --git a/alpine/Dockerfile b/alpine/Dockerfile index c7d1d3f1e..838380b96 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -1,7 +1,5 @@ FROM alpine:3.4 -COPY repositories /etc/apk/ - RUN \ addgroup -g 50 docker && \ adduser -G docker -u 1001 -s /bin/sh -D -g "Docker" docker && \ @@ -86,7 +84,7 @@ RUN \ rc-update add networking boot && \ rc-update add acpid default && \ rc-update add chronyd default && \ - rc-update add cron default && \ + rc-update add crond default && \ rc-update add savecache shutdown && \ rc-update add killprocs shutdown && \ rc-update add mount-ro shutdown && \ diff --git a/alpine/Makefile b/alpine/Makefile index 4ece35e12..67b9f9060 100644 --- a/alpine/Makefile +++ b/alpine/Makefile @@ -3,7 +3,7 @@ all: initrd.img.gz mobylinux-efi.iso ETCFILES=etc/issue etc/motd etc/network/interfaces ETCFILES+=etc/securetty -initrd.img: Dockerfile mkinitrd.sh repositories $(ETCFILES) +initrd.img: Dockerfile mkinitrd.sh $(ETCFILES) rm -f initrd.img $(MAKE) -C packages $(MAKE) -C kernel diff --git a/alpine/inittab.armhf b/alpine/inittab.armhf index 85c1256ca..d641de0ab 100644 --- a/alpine/inittab.armhf +++ b/alpine/inittab.armhf @@ -1,7 +1,8 @@ # /etc/inittab -::sysinit:/sbin/rc sysinit -::wait:/sbin/rc default +::sysinit:/sbin/openrc sysinit +::sysinit:/sbin/openrc boot +::wait:/sbin/openrc default # Put a getty on the serial port ttyAMA0::respawn:/sbin/getty -L ttyAMA0 115200 vt100 diff --git a/alpine/inittab.x86_64 b/alpine/inittab.x86_64 index a9fa9dfe2..7b447a309 100644 --- a/alpine/inittab.x86_64 +++ b/alpine/inittab.x86_64 @@ -1,7 +1,8 @@ # /etc/inittab -::sysinit:/sbin/rc sysinit -::wait:/sbin/rc default +::sysinit:/sbin/openrc sysinit +::sysinit:/sbin/openrc boot +::wait:/sbin/openrc default # Put a getty on the serial port ttyS0::respawn:/sbin/getty -L ttyS0 115200 vt100 diff --git a/alpine/repositories b/alpine/repositories deleted file mode 100644 index f5a6bfbb4..000000000 --- a/alpine/repositories +++ /dev/null @@ -1 +0,0 @@ -http://dl-cdn.alpinelinux.org/alpine/v3.3/main