Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use partitioned loop device instead of device-mapper to prepare volatile.img

Browse Source 
There was a lot problems with device-mapper, at least it asynchronous
creation, races with udev, problems with cleanup.
This commit is contained in:
Marek Marczykowski-Górecki 2015-04-03 11:24:37 +02:00
parent 1923e366cf
commit d76bd0ad1d
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
linux/aux-tools/prepare-volatile-img.sh
View File

@ -20,15 +20,6 @@ if [ -e "$FILENAME" ]; then
exit 1 exit 1
fi fi
# Cleanup lefovers from possible previous run
loopdev=`losetup -a | grep "$FILENAME" | cut -f 1 -d :`
if [ -n "$loopdev" ]; then
dmsetup remove `basename $loopdev`p1 2>/dev/null
dmsetup remove `basename $loopdev`p2 2>/dev/null
losetup -d $loopdev
udevadm settle
fi
TOTAL_SIZE=$[ $ROOT_SIZE + $SWAP_SIZE + 512 ] TOTAL_SIZE=$[ $ROOT_SIZE + $SWAP_SIZE + 512 ]
truncate -s ${TOTAL_SIZE}M "$FILENAME" truncate -s ${TOTAL_SIZE}M "$FILENAME"
sfdisk --no-reread -u M "$FILENAME" > /dev/null 2> /dev/null <<EOF sfdisk --no-reread -u M "$FILENAME" > /dev/null 2> /dev/null <<EOF
@ -36,11 +27,8 @@ sfdisk --no-reread -u M "$FILENAME" > /dev/null 2> /dev/null <<EOF
,${ROOT_SIZE},L ,${ROOT_SIZE},L
EOF EOF
kpartx -s -a "$FILENAME" loopdev=`losetup -f --show --partscan "$FILENAME"`
loopdev=`losetup -j "$FILENAME"|tail -n 1 |cut -d: -f1` mkswap -f ${loopdev}p1 > /dev/null
looppart=`echo $loopdev|sed 's:dev:dev/mapper:'`
mkswap -f ${looppart}p1 > /dev/null
udevadm settle udevadm settle
kpartx -s -d ${loopdev}
losetup -d ${loopdev} || : losetup -d ${loopdev} || :
chown --reference `dirname "$FILENAME"` "$FILENAME" chown --reference `dirname "$FILENAME"` "$FILENAME"