From 0ffc54bfaa4d8dd613703f1d6ae1f9948fdbeeb4 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Fri, 10 Jun 2016 10:52:13 +0100 Subject: [PATCH] Revert "Revert "Merge pull request #184 from justincormack/repositories" (#195)" This reverts commit 34d44e20d4a49b7354ce267d6d69317069ae00d4. --- alpine/Dockerfile | 2 -- alpine/Makefile | 2 +- alpine/inittab.armhf | 5 +++-- alpine/inittab.x86_64 | 5 +++-- alpine/repositories | 1 - 5 files changed, 7 insertions(+), 8 deletions(-) delete mode 100644 alpine/repositories diff --git a/alpine/Dockerfile b/alpine/Dockerfile index cb369a87b..5e10de49f 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 && \ 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