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

Do not fail if disk is partitioned but has no swap

Browse Source 
Fix #543

Also clean up quoting and unused parts a little.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack 2016-09-22 16:30:28 +01:00
parent 7c84387b80
commit cac5f969a1
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,24 +12,24 @@ start()
DEV="$(find /dev -maxdepth 1 -type b ! -name 'loop*' | grep -v '[0-9]$' | sed 's@.*/dev/@@' | head -1 )" DEV="$(find /dev -maxdepth 1 -type b ! -name 'loop*' | grep -v '[0-9]$' | sed 's@.*/dev/@@' | head -1 )"
[ -z ${DEV} ] && exit 1 [ -z "${DEV}" ] && exit 1
DRIVE="/dev/${DEV}" DRIVE="/dev/${DEV}"
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 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}')
if [ -z "$DATA" ] if [ -z "$DATA" ]
then then
ERASE_DISKS="${DRIVE}" setup-disk -m data ${DRIVE} ERASE_DISKS="${DRIVE}" setup-disk -m data ${DRIVE}
blockdev --rereadpt ${DRIVE} 2> /dev/null blockdev --rereadpt "${DRIVE}" 2> /dev/null
else else
mount ${DATA} /var && swapon ${SWAP} || ( ERASE_DISKS="${DRIVE}" setup-disk -m data ${DRIVE}; blockdev --rereadpt ${DRIVE} 2> /dev/null ) ( mount "${DATA}" /var && ([ -z "${SWAP}" ] || swapon "${SWAP}") ) || \
resize2fs ${DATA} 2> /dev/null ( ERASE_DISKS="${DRIVE}" setup-disk -m data ${DRIVE}; blockdev --rereadpt ${DRIVE} 2> /dev/null )
fi 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