From 7f2683580dae5a2c41edf6f7613f2ee34657b0b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Sat, 11 Apr 2015 02:47:16 +0200
Subject: [PATCH] Fix resizing of /rw partition (private.img)

Offline resize requires to run fsck -f first. Because we support only
growing that image, we can simply use online resize instead.

This finally fixes qubesos/qubes-issues#772

(cherry picked from commit 65bc22fd1d1be613d45ed1b8cb635b419c662969)

Conflicts:
	vm-init.d/qubes-core
	vm-systemd/mount-home.sh
---
 vm-init.d/qubes-core    | 2 +-
 vm-systemd/misc-post.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/vm-init.d/qubes-core b/vm-init.d/qubes-core
index 1fc6a4b..5671ea8 100755
--- a/vm-init.d/qubes-core
+++ b/vm-init.d/qubes-core
@@ -55,8 +55,8 @@ start()
 	mkdir -p /var/run/qubes
 
 	if [ -e /dev/xvdb ] ; then
-		resize2fs /dev/xvdb 2> /dev/null || echo "'resize2fs /dev/xvdb' failed"
 		mount /rw
+		resize2fs /dev/xvdb 2> /dev/null || echo "'resize2fs /dev/xvdb' failed"
 
         if ! [ -d /rw/home ] ; then
             echo
diff --git a/vm-systemd/misc-post.sh b/vm-systemd/misc-post.sh
index d8a0cbb..3ca43ea 100755
--- a/vm-systemd/misc-post.sh
+++ b/vm-systemd/misc-post.sh
@@ -23,9 +23,9 @@ fi
 INTERFACE=eth0 /usr/lib/qubes/setup-ip
 
 if [ -e /dev/xvdb -a ! -e /etc/this-is-dvm ] ; then
-    resize2fs /dev/xvdb 2> /dev/null || echo "'resize2fs /dev/xvdb' failed"
     tune2fs -m 0 /dev/xvdb
     mount /rw
+    resize2fs /dev/xvdb 2> /dev/null || echo "'resize2fs /dev/xvdb' failed"
 
     if ! [ -d /rw/home ] ; then
         echo