From 9a95224681a91b1ddae662ce6a481f5c974822ed Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Tue, 8 Nov 2016 15:20:46 +0000 Subject: [PATCH] Format filesystems earlier, before syslog So that we can write to /var early, move filesystem formatting as early as possible. Adds a dummy fsck service, as we already do fsck in format script. Replaces #535 Signed-off-by: Justin Cormack --- alpine/Dockerfile | 3 +-- alpine/etc/init.d/fsck | 12 ++++++++++++ alpine/packages/automount/etc/init.d/automount | 3 +-- 3 files changed, 14 insertions(+), 4 deletions(-) create mode 100755 alpine/etc/init.d/fsck diff --git a/alpine/Dockerfile b/alpine/Dockerfile index fb0feee4b..13ce578e8 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -35,14 +35,13 @@ RUN \ rc-update add sysfs && \ rc-update add sysfsconf && \ rc-update add fsck && \ - rc-update add root && \ rc-update add crond && \ rc-update add local && \ rc-update add localmount && \ rc-update add docker default && \ rc-update add proxy default && \ rc-update add transfused default && \ - rc-update add automount boot && \ + rc-update add automount sysinit && \ rc-update add diagnostics default && \ rc-update add binfmt_misc default && \ rc-update add hostsettings default && \ diff --git a/alpine/etc/init.d/fsck b/alpine/etc/init.d/fsck new file mode 100755 index 000000000..5a82b6aaa --- /dev/null +++ b/alpine/etc/init.d/fsck @@ -0,0 +1,12 @@ +#!/sbin/openrc-run +# do nothing as we do this in automount script + +start() +{ + return 0 +} + +stop() +{ + return 0 +} diff --git a/alpine/packages/automount/etc/init.d/automount b/alpine/packages/automount/etc/init.d/automount index 43f1f7cb6..07a037bce 100755 --- a/alpine/packages/automount/etc/init.d/automount +++ b/alpine/packages/automount/etc/init.d/automount @@ -2,8 +2,7 @@ depend() { - after dev - before docker + need dev } start()