dom0: fix qvm-grow-private (#459)
This commit is contained in:
parent
ef6b1ded3e
commit
dd88e7d72a
@ -664,7 +664,7 @@ class QubesVm(object):
|
|||||||
retcode = 0
|
retcode = 0
|
||||||
if self.is_running():
|
if self.is_running():
|
||||||
# find loop device
|
# find loop device
|
||||||
p = subprocess.Popen (["losetup", "--associated", vm.private_img],
|
p = subprocess.Popen (["sudo", "losetup", "--associated", self.private_img],
|
||||||
stdout=subprocess.PIPE)
|
stdout=subprocess.PIPE)
|
||||||
result = p.communicate()
|
result = p.communicate()
|
||||||
m = re.match(r"^(/dev/loop\d+):\s", result[0])
|
m = re.match(r"^(/dev/loop\d+):\s", result[0])
|
||||||
@ -676,10 +676,10 @@ class QubesVm(object):
|
|||||||
# resize loop device
|
# resize loop device
|
||||||
subprocess.check_call(["sudo", "losetup", "--set-capacity", loop_dev])
|
subprocess.check_call(["sudo", "losetup", "--set-capacity", loop_dev])
|
||||||
|
|
||||||
retcode = self.run("root:while [ \"`blockdev --getsize64 /dev/xvdb`\" -lt {0} ]; do " +
|
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".format(size_bytes), wait=True)
|
"head /dev/xvdb > /dev/null; sleep 0.2; done; resize2fs /dev/xvdb", wait=True)
|
||||||
else:
|
else:
|
||||||
retcode = subprocess.check_call(["sudo", "resize2fs", "-f", vm.private_img])
|
retcode = subprocess.check_call(["sudo", "resize2fs", "-f", self.private_img])
|
||||||
if retcode != 0:
|
if retcode != 0:
|
||||||
raise QubesException("resize2fs failed")
|
raise QubesException("resize2fs failed")
|
||||||
|
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
|
|
||||||
from qubes.qubes import QubesVmCollection
|
from qubes.qubes import QubesVmCollection
|
||||||
from qubes.qubes import QubesException
|
from qubes.qubes import QubesException
|
||||||
from qubesutils import parse_size
|
from qubes.qubesutils import parse_size
|
||||||
from optparse import OptionParser
|
from optparse import OptionParser
|
||||||
import subprocess
|
import subprocess
|
||||||
import os
|
import os
|
||||||
|
Loading…
Reference in New Issue
Block a user