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

Merge branch 'master' into hvm

Browse Source
This commit is contained in:
Marek Marczykowski 2012-03-01 23:40:31 +01:00
commit 370c4952ce
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dom0/aux-tools/create_apps_for_appvm.sh
View File

@ -42,7 +42,6 @@ if [ "$SRCDIR" != "none" ]; then
else else
find $SRCDIR -name "*.desktop" $CHECK_WHITELISTED -exec /usr/lib/qubes/convert_apptemplate2vm.sh {} $APPSDIR $VMNAME $VMDIR \; find $SRCDIR -name "*.desktop" $CHECK_WHITELISTED -exec /usr/lib/qubes/convert_apptemplate2vm.sh {} $APPSDIR $VMNAME $VMDIR \;
fi fi
/usr/lib/qubes/convert_apptemplate2vm.sh /usr/share/qubes/qubes-appmenu-select.desktop $APPSDIR $VMNAME $VMDIR
if [ "$VMTYPE" = "vm-templates" ]; then if [ "$VMTYPE" = "vm-templates" ]; then
/usr/lib/qubes/convert_dirtemplate2vm.sh /usr/share/qubes/qubes-templatevm.directory.template $APPSDIR/$VMNAME-vm.directory $VMNAME $VMDIR /usr/lib/qubes/convert_dirtemplate2vm.sh /usr/share/qubes/qubes-templatevm.directory.template $APPSDIR/$VMNAME-vm.directory $VMNAME $VMDIR

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

@ -672,7 +672,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])
@ -684,10 +684,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")

2
dom0/qvm-core/qubesutils.py
View File

@ -989,7 +989,7 @@ def backup_restore_do(backup_dir, restore_info, host_collection = None, print_ca
backup_info = restore_info['dom0'] backup_info = restore_info['dom0']
local_user = grp.getgrnam('qubes').gr_mem[0] local_user = grp.getgrnam('qubes').gr_mem[0]
home_dir = pwd.getpwnam(local_user).pw_dir home_dir = pwd.getpwnam(local_user).pw_dir
backup_dom0_home_dir = backup_dir + '/dom0-home/' + restore_info['username'] backup_dom0_home_dir = backup_dir + '/dom0-home/' + backup_info['username']
restore_home_backupdir = "home-pre-restore-{0}".format (time.strftime("%Y-%m-%d-%H%M%S")) restore_home_backupdir = "home-pre-restore-{0}".format (time.strftime("%Y-%m-%d-%H%M%S"))
print_callback("-> Restoring home of user '{0}'...".format(local_user)) print_callback("-> Restoring home of user '{0}'...".format(local_user))

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

@ -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