github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-21 01:59:07 +00:00
Code Issues Projects Releases Wiki Activity

use the standard alpine tool to setup disk instead

Browse Source 
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
This commit is contained in:
Justin Cormack 2015-12-14 15:40:58 +00:00
parent deb0043f9d
commit db56b320a4
2 changed files with 6 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
alpine/Dockerfile
View File

@ -4,7 +4,9 @@ MAINTAINER Justin Cormack <justin.cormack@unikernel.com>
COPY repositories /etc/apk/ COPY repositories /etc/apk/
RUN apk update && apk upgrade && apk add e2fsprogs docker chrony hdparm RUN apk update && apk upgrade && apk add \
e2fsprogs docker chrony \
sfdisk lvm2 syslinux
COPY etc /etc/ COPY etc /etc/

49
alpine/etc/init.d/automount
View File

@ -8,57 +8,14 @@ depend()
start() start()
{ {
ebegin "Mounting host block device" ebegin "Configuring host block device"
# XXX this may change on other ports # XXX this may change on other ports
DEV="sda" DEV="sda"
MAJOR="8"
DRIVE="/dev/${DEV}" DRIVE="/dev/${DEV}"
DATA="${DRIVE}1"
SWAP="${DRIVE}2"
MOUNTPOINT="/mnt/${DEV}"
PARTPROBE="hdparm -z ${DRIVE}"
mkdir -p ${MOUNTPOINT} if fdisk -l ${DRIVE} | grep -q "doesn't contain a valid partition table"
umount ${DATA} || true
umount -f /var/lib/docker || true
rm -rf /var/lib/docker
if fdisk -l ${DRIVE} | grep -q ${DATA}
then then
# drive partitioned, try mounting ERASE_DISKS="${DRIVE}" setup-disk -m data ${DRIVE}
umount -f ${MOUNTPOINT} || true
mount ${DATA} ${MOUNTPOINT}
if [ $? -eq 0 ]
then
mkdir -p ${MOUNTPOINT}/var/lib/docker
ln -s ${MOUNTPOINT}/var/lib/docker /var/lib/docker
rm -f /tmp
mkdir -p ${MOUNTPOINT}/tmp
ln -s ${MOUNTPOINT}/tmp /tmp
swapon ${SWAP} || mkswap ${SWAP} && swapon ${SWAP}
exit 0
fi fi
fi
# ok that did not work out, let us (re)format
swapoff ${SWAP} || true
dd if=/dev/zero of=${DRIVE} bs=512 count=1
${PARTPROBE}
(echo n; echo p; echo 2; echo ; echo +1000M ; echo w) | fdisk ${DRIVE}
(echo t; echo 82; echo w) | fdisk ${DRIVE}
(echo n; echo p; echo 1; echo ; echo ; echo w) | fdisk ${DRIVE}
${PARTPROBE}
# XXX have to sleep as the device nodes disappear otherwise
sleep 1
mknod -m 600 ${DATA} b ${MAJOR} 1 || true
mknod -m 600 ${SWAP} b ${MAJOR} 2 || true
mkfs.ext4 -q -F ${DATA}
mount ${DATA} ${MOUNTPOINT}
mkdir -p ${MOUNTPOINT}/var/lib/docker
ln -s ${MOUNTPOINT}/var/lib/docker /var/lib/docker
rm -f /tmp
mkdir -p ${MOUNTPOINT}/tmp
ln -s ${MOUNTPOINT}/tmp /tmp
mkswap ${SWAP}
swapon ${SWAP}
} }