From 8a5d7ecadf488e99fb462e01a34744441d621795 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Mon, 28 Nov 2016 16:12:51 +0000 Subject: [PATCH] Fix directories under /var after formatting - /var/lock test - add /var/cache subdirectories - move old boot2docker directories fix #801 fix #792 Signed-off-by: Justin Cormack --- alpine/packages/automount/etc/init.d/automount | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/alpine/packages/automount/etc/init.d/automount b/alpine/packages/automount/etc/init.d/automount index f152d4ce7..23075fba4 100755 --- a/alpine/packages/automount/etc/init.d/automount +++ b/alpine/packages/automount/etc/init.d/automount @@ -138,14 +138,18 @@ start() [ -z "$SWAP" ] && do_swapfile "$DRIVE" || swapon "$SWAP" # boot2docker compat, has /var and /tmp on partition - [ -d /var/var/lib/boot2docker/ ] && mount --bind /var/var /var + [ -d /var/var/lib/boot2docker/ ] && (mv /var/var/* /var && rm -rf /var/var) - # can remove when we run before bootmisc + # add in directories under /var that are lost in formatting [ -L /var/run ] || ln -s /run /var/run - [ -L /var/run ] || ln -s /run/lock /var/lock + [ -L /var/lock ] || ln -s /run/lock /var/lock [ -d /var/log ] || mkdir -m 755 /var/log [ -d /var/empty ] || mkdir -m 755 /var/empty [ -d /var/spool ] || mkdir -m 755 /var/spool + [ -d /var/cache ] || mkdir -m 755 /var/cache + [ -d /var/cache/apk ] || mkdir -m 755 /var/cache/apk + [ -d /var/cache/misc ] || mkdir -m 755 /var/cache/misc + [ -d /var/local ] || mkdir -m 755 /var/local [ -d /var/tmp ] || mkdir -m 1777 /var/tmp mount | grep -q ' on /var type '