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

dom0: fix qvm-grow-private (#459)

Browse Source
This commit is contained in:
Marek Marczykowski 2012-02-29 23:11:29 +01:00
parent ef6b1ded3e
commit dd88e7d72a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dom0/qvm-core/qubes.py
View File

@ -664,7 +664,7 @@ class QubesVm(object):
retcode = 0
if self.is_running():
# find loop device
p = subprocess.Popen (["losetup", "--associated", vm.private_img],
p = subprocess.Popen (["sudo", "losetup", "--associated", self.private_img],
stdout=subprocess.PIPE)
result = p.communicate()
m = re.match(r"^(/dev/loop\d+):\s", result[0])
@ -676,10 +676,10 @@ class QubesVm(object):
# resize loop device
subprocess.check_call(["sudo", "losetup", "--set-capacity", loop_dev])
retcode = self.run("root:while [ \"`blockdev --getsize64 /dev/xvdb`\" -lt {0} ]; do " +
"head /dev/xvdb > /dev/null; sleep 0.2; done; resize2fs /dev/xvdb".format(size_bytes), wait=True)
retcode = self.run("root:while [ \"`blockdev --getsize64 /dev/xvdb`\" -lt {0} ]; do ".format(size) +
"head /dev/xvdb > /dev/null; sleep 0.2; done; resize2fs /dev/xvdb", wait=True)
else:
retcode = subprocess.check_call(["sudo", "resize2fs", "-f", vm.private_img])
retcode = subprocess.check_call(["sudo", "resize2fs", "-f", self.private_img])
if retcode != 0:
raise QubesException("resize2fs failed")

2
dom0/qvm-tools/qvm-grow-private
View File

@ -22,7 +22,7 @@
from qubes.qubes import QubesVmCollection
from qubes.qubes import QubesException
from qubesutils import parse_size
from qubes.qubesutils import parse_size
from optparse import OptionParser
import subprocess
import os