github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-24 19:28:09 +00:00
Code Issues Projects Releases Wiki Activity

reread partition table and be more careful if no partitions

Browse Source 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack 2016-05-04 14:56:17 +01:00
parent 63f5178cf8
commit 921aaa895e
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
alpine/packages/automount/etc/init.d/automount
View File

@ -19,11 +19,18 @@ start()
if fdisk -l ${DRIVE} | grep -q "doesn't contain a valid partition table" if fdisk -l ${DRIVE} | grep -q "doesn't contain a valid partition table"
then then
ERASE_DISKS="${DRIVE}" setup-disk -m data ${DRIVE} ERASE_DISKS="${DRIVE}" setup-disk -m data ${DRIVE}
blockdev --rereadpt ${DRIVE} 2> /dev/null
else else
SWAP=$(fdisk -l ${DRIVE} | grep 'Linux swap' | head -1 | awk '{print $1}') SWAP=$(fdisk -l ${DRIVE} | grep 'Linux swap' | head -1 | awk '{print $1}')
DATA=$(fdisk -l ${DRIVE} | grep 'Linux$' | head -1 | awk '{print $1}') DATA=$(fdisk -l ${DRIVE} | grep 'Linux$' | head -1 | awk '{print $1}')
mount ${DATA} /var && swapon ${SWAP} || ERASE_DISKS="${DRIVE}" setup-disk -m data ${DRIVE} if [ -z "$DATA" ]
resize2fs ${DATA} then
ERASE_DISKS="${DRIVE}" setup-disk -m data ${DRIVE}
blockdev --rereadpt ${DRIVE} 2> /dev/null
else
mount ${DATA} /var && swapon ${SWAP} || ( ERASE_DISKS="${DRIVE}" setup-disk -m data ${DRIVE}; blockdev --rereadpt ${DRIVE} 2> /dev/null )
resize2fs ${DATA} 2> /dev/null
fi
# boot2docker compat, has /var and /tmp on partition # boot2docker compat, has /var and /tmp on partition
[ -d /var/var/lib/boot2docker/ ] && mount --bind /var/var /var [ -d /var/var/lib/boot2docker/ ] && mount --bind /var/var /var
fi fi