Merge pull request #197 from justincormack/clockfix

revert 3.3 downgrade, clean up some startup scripts

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 && \
@@ -82,6 +80,7 @@ RUN \
   rc-update add urandom boot && \
   rc-update add hostname boot && \
   rc-update add syslog boot && \
+  rc-update add hwclock boot && \
   rc-update add networking boot && \
   rc-update add acpid default && \
   rc-update add chronyd default && \

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

alpine/inittab.armhf

@@ -1,7 +1,8 @@
 # /etc/inittab
 
-::sysinit:/sbin/rc sysinit
+::sysinit:/sbin/openrc sysinit
-::wait:/sbin/rc default
+::sysinit:/sbin/openrc boot
+::wait:/sbin/openrc default
 
 # Put a getty on the serial port
 ttyAMA0::respawn:/sbin/getty -L ttyAMA0 115200 vt100

alpine/inittab.x86_64

@@ -1,7 +1,8 @@
 # /etc/inittab
 
-::sysinit:/sbin/rc sysinit
+::sysinit:/sbin/openrc sysinit
-::wait:/sbin/rc default
+::sysinit:/sbin/openrc boot
+::wait:/sbin/openrc default
 
 # Put a getty on the serial port
 ttyS0::respawn:/sbin/getty -L ttyS0 115200 vt100

alpine/packages/docker/etc/init.d/docker

@@ -49,6 +49,14 @@ start()
 		[ -d /Mac/$d ] && [ ! -d $d ] && mkdir -p /$d && mount --bind /Mac/$d /$d
 	done
 
+	# shift logs onto host before docker starts
+	# busybox reopens its log files every second
+	if cat /proc/cmdline | grep -q 'com.docker.driverDir'
+	then
+		DRIVERDIR="/Mac$(cat /proc/cmdline | sed -e 's/.*com.docker.driverDir="//' -e 's/".*//')"
+		grep -q "osxfs on /var/log" || mount --bind "${DRIVERDIR}/log" /var/log
+	fi
+
 	# same default ulimit as boot2docker; if you want more can set at docker run time
 	DOCKER_ULIMITS=1048576
 	ulimit -n $DOCKER_ULIMITS

alpine/packages/hostsettings/etc/init.d/hostsettings

@@ -3,7 +3,6 @@
 description="Configuring settings from database."
 
 depend() {
-	need transfused
 	before sysctl net
 }
 
@@ -12,14 +11,6 @@ start() {
 
 	mobyconfig exists etc/sysctl.conf && mobyconfig get etc/sysctl.conf > /etc/sysctl.conf
 
-	# shift logs onto host before docker starts
-	# busybox reopens its log files every second
-	if cat /proc/cmdline | grep -q 'com.docker.driverDir'
-	then
-		DRIVERDIR="/Mac$(cat /proc/cmdline | sed -e 's/.*com.docker.driverDir="//' -e 's/".*//')"
-		mount --bind "${DRIVERDIR}/log" /var/log
-	fi
-
 	mobyconfig exists etc/resolv.conf && mobyconfig get etc/resolv.conf > /etc/resolv.conf
 
 	# handle static network config if configured

alpine/repositories

@@ -1 +0,0 @@
-http://dl-cdn.alpinelinux.org/alpine/v3.3/main