mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-07-23 02:51:55 +00:00
reread partition table and be more careful if no partitions
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
parent
63f5178cf8
commit
921aaa895e
@ -19,11 +19,18 @@ start()
|
||||
if fdisk -l ${DRIVE} | grep -q "doesn't contain a valid partition table"
|
||||
then
|
||||
ERASE_DISKS="${DRIVE}" setup-disk -m data ${DRIVE}
|
||||
blockdev --rereadpt ${DRIVE} 2> /dev/null
|
||||
else
|
||||
SWAP=$(fdisk -l ${DRIVE} | grep 'Linux swap' | 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}
|
||||
resize2fs ${DATA}
|
||||
if [ -z "$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
|
||||
[ -d /var/var/lib/boot2docker/ ] && mount --bind /var/var /var
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user