From de275cc917771b3a5a417ffd85060c547e7a710d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
<marmarek@invisiblethingslab.com>
Date: Wed, 25 Nov 2015 01:24:00 +0100
Subject: [PATCH] core: leave volatile.img structure creation for the VM
This is already handled by a script in initramfs.
Fixes QubesOS/qubes-issues#1308
---
linux/aux-tools/prepare-volatile-img.sh | 25 -------------------------
1 file changed, 25 deletions(-)
diff --git a/linux/aux-tools/prepare-volatile-img.sh b/linux/aux-tools/prepare-volatile-img.sh
index 33dfc9b9..40e22f5d 100755
--- a/linux/aux-tools/prepare-volatile-img.sh
+++ b/linux/aux-tools/prepare-volatile-img.sh
@@ -26,28 +26,3 @@ fi
TOTAL_SIZE=$[ $ROOT_SIZE + $SWAP_SIZE + 512 ]
truncate -s ${TOTAL_SIZE}M "$FILENAME"
-sfdisk --no-reread -u M "$FILENAME" > /dev/null 2> /dev/null <<EOF
-0,${SWAP_SIZE},S
-,${ROOT_SIZE},L
-EOF
-
-(
- flock 200
- loopdev=`losetup -f --show --partscan "$FILENAME"`
- udevadm settle
- created=
- if [ ! -e ${loopdev}p1 ]; then
- # device wasn't created automatically, probably udev isn't running;
- # create devs manually
- for partdev in /sys/block/$(basename ${loopdev})/loop*p*; do
- mknod /dev/$(basename ${partdev}) b $(cat ${partdev}/dev | tr : ' ')
- done
- created=yes
- fi
- mkswap -f ${loopdev}p1 > /dev/null
- if [ "$created" = "yes" ]; then
- rm -f ${loopdev}p*
- fi
- losetup -d ${loopdev} || :
- chown --reference `dirname "$FILENAME"` "$FILENAME"
-) 200>"/var/run/qubes/prepare-volatile-img.lock"