Merge branch 'master' of ssh://git.qubes-os.org/var/lib/qubes/git/joanna/core
This commit is contained in:
commit
cd7024cad1
22
Makefile
22
Makefile
@ -29,24 +29,26 @@ rpms-vaio-fixes:
|
||||
update-repo-current:
|
||||
ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-$(VERSION_DOM0)*fc13*.rpm ../yum/current-release/current/dom0/rpm/
|
||||
ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-vaio-fixes-$(VERSION_VAIO_FIXES)*fc13*.rpm ../yum/current-release/current/dom0/rpm/
|
||||
ln -f $(RPMS_DIR)/x86_64/qubes-core-*vm-*$(VERSION_VM)*fc13*.rpm ../yum/current-release/current/vm/f13/rpm/
|
||||
ln -f $(RPMS_DIR)/x86_64/qubes-core-*vm-*$(VERSION_VM)*fc14*.rpm ../yum/current-release/current/vm/f14/rpm/
|
||||
cd ../yum && ./update_repo.sh
|
||||
for vmrepo in ../yum/current-release/current/vm/* ; do \
|
||||
dist=$$(basename $$vmrepo) ;\
|
||||
ln -f $(RPMS_DIR)/x86_64/qubes-core-*vm-*$(VERSION_VM)*$$dist*.rpm $$vmrepo/rpm/ ;\
|
||||
done
|
||||
|
||||
update-repo-current-testing:
|
||||
ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-$(VERSION_DOM0)*fc13*.rpm ../yum/current-release/current-testing/dom0/rpm/
|
||||
ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-vaio-fixes-$(VERSION_VAIO_FIXES)*fc13*.rpm ../yum/current-release/current-testing/dom0/rpm/
|
||||
ln -f $(RPMS_DIR)/x86_64/qubes-core-*vm-*$(VERSION_VM)*fc13*.rpm ../yum/current-release/current-testing/vm/f13/rpm/
|
||||
ln -f $(RPMS_DIR)/x86_64/qubes-core-*vm-*$(VERSION_VM)*fc14*.rpm ../yum/current-release/current-testing/vm/f14/rpm/
|
||||
cd ../yum && ./update_repo.sh
|
||||
|
||||
for vmrepo in ../yum/current-release/current-testing/vm/* ; do \
|
||||
dist=$$(basename $$vmrepo) ;\
|
||||
ln -f $(RPMS_DIR)/x86_64/qubes-core-*vm-*$(VERSION_VM)*$$dist*.rpm $$vmrepo/rpm/ ;\
|
||||
done
|
||||
|
||||
update-repo-unstable:
|
||||
ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-$(VERSION_DOM0)*fc13*.rpm ../yum/current-release/unstable/dom0/rpm/
|
||||
ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-vaio-fixes-$(VERSION_VAIO_FIXES)*fc13*.rpm ../yum/current-release/unstable/dom0/rpm/
|
||||
ln -f $(RPMS_DIR)/x86_64/qubes-core-*vm-*$(VERSION_VM)*fc13*.rpm ../yum/current-release/unstable/vm/f13/rpm/
|
||||
ln -f $(RPMS_DIR)/x86_64/qubes-core-*vm-*$(VERSION_VM)*fc14*.rpm ../yum/current-release/unstable/vm/f14/rpm/
|
||||
cd ../yum && ./update_repo.sh
|
||||
for vmrepo in ../yum/current-release/unstable/vm/* ; do \
|
||||
dist=$$(basename $$vmrepo) ;\
|
||||
ln -f $(RPMS_DIR)/x86_64/qubes-core-*vm-*$(VERSION_VM)*$$dist*.rpm $$vmrepo/rpm/ ;\
|
||||
done
|
||||
|
||||
update-repo-installer:
|
||||
ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-*$(VERSION_DOM0)*fc13*.rpm ../installer/yum/qubes-dom0/rpm/
|
||||
|
@ -1,19 +1,19 @@
|
||||
[qubes-vm-current]
|
||||
name = Qubes OS Repository for VM (updates)
|
||||
baseurl = http://yum.qubes-os.org/r1-beta1/current/vm/f13
|
||||
baseurl = http://yum.qubes-os.org/r1-beta2/current/vm/fc13
|
||||
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary
|
||||
gpgcheck = 1
|
||||
|
||||
[qubes-vm-current-testing]
|
||||
name = Qubes OS Repository for VM (updates-testing)
|
||||
baseurl = http://yum.qubes-os.org/r1-beta1/current-testing/vm/f13
|
||||
baseurl = http://yum.qubes-os.org/r1-beta2/current-testing/vm/fc13
|
||||
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary
|
||||
gpgcheck = 1
|
||||
enabled=0
|
||||
|
||||
[qubes-vm-unstable]
|
||||
name = Qubes OS Repository for VM (unstable)
|
||||
baseurl = http://yum.qubes-os.org/r1-beta1/unstable/vm/f13
|
||||
baseurl = http://yum.qubes-os.org/r1-beta2/unstable/vm/fc13
|
||||
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary
|
||||
gpgcheck = 1
|
||||
enabled=0
|
||||
|
@ -1,19 +1,19 @@
|
||||
[qubes-vm-current]
|
||||
name = Qubes OS Repository for VM (updates)
|
||||
baseurl = http://yum.qubes-os.org/r1-beta1/current/vm/f14
|
||||
baseurl = http://yum.qubes-os.org/r1-beta2/current/vm/fc14
|
||||
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary
|
||||
gpgcheck = 1
|
||||
|
||||
[qubes-vm-current-testing]
|
||||
name = Qubes OS Repository for VM (updates-testing)
|
||||
baseurl = http://yum.qubes-os.org/r1-beta1/current-testing/vm/f14
|
||||
baseurl = http://yum.qubes-os.org/r1-beta2/current-testing/vm/fc14
|
||||
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary
|
||||
gpgcheck = 1
|
||||
enabled=0
|
||||
|
||||
[qubes-vm-unstable]
|
||||
name = Qubes OS Repository for VM (unstable)
|
||||
baseurl = http://yum.qubes-os.org/r1-beta1/unstable/vm/f14
|
||||
baseurl = http://yum.qubes-os.org/r1-beta2/unstable/vm/fc14
|
||||
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary
|
||||
gpgcheck = 1
|
||||
enabled=0
|
||||
|
@ -15,10 +15,11 @@ start()
|
||||
exit 1
|
||||
fi
|
||||
|
||||
modprobe u2mfn
|
||||
modprobe evtchn
|
||||
modprobe u2mfn
|
||||
|
||||
# Set permissions to /proc/xen/xenbus, so normal user can use xenstore-read
|
||||
chmod 666 /proc/xen/xenbus
|
||||
# Set permissions to /proc/xen/xenbus, so normal user can use xenstore-read
|
||||
chmod 666 /proc/xen/xenbus
|
||||
|
||||
name=$(/usr/bin/xenstore-read name)
|
||||
if ! [ -f /etc/this_is_dvm ] ; then
|
||||
|
@ -53,12 +53,10 @@ def main():
|
||||
|
||||
if options.verbose:
|
||||
print "Loading Xen PCI Backend..."
|
||||
retcode = subprocess.call (["/sbin/modprobe", "xen-pciback"])
|
||||
retcode = subprocess.call (["/sbin/modprobe", "pciback"])
|
||||
if retcode != 0:
|
||||
retcode = subprocess.call (["/sbin/modprobe", "pciback"])
|
||||
if retcode != 0:
|
||||
print "ERROR: Cannot load xen-pciback module!"
|
||||
exit(1)
|
||||
print "ERROR: Cannot load the pciback module!"
|
||||
exit(1)
|
||||
|
||||
if options.verbose:
|
||||
print "Unbinding the following net devices:"
|
||||
|
@ -720,7 +720,7 @@ class QubesVm(object):
|
||||
format(template_root, self.root_img))
|
||||
|
||||
# Create volatile.img
|
||||
self.reset_volatile_storage(source_template = source_template)
|
||||
self.reset_volatile_storage(source_template = source_template, verbose=verbose)
|
||||
|
||||
def create_appmenus(self, verbose, source_template = None):
|
||||
if source_template is None:
|
||||
@ -770,7 +770,7 @@ class QubesVm(object):
|
||||
format(self.kernels_dir + '/modules.img'))
|
||||
return True
|
||||
|
||||
def reset_volatile_storage(self, source_template = None):
|
||||
def reset_volatile_storage(self, source_template = None, verbose = False):
|
||||
assert not self.is_running(), "Attempt to clean volatile image of running VM!"
|
||||
|
||||
if source_template is None:
|
||||
@ -780,7 +780,8 @@ class QubesVm(object):
|
||||
if source_template is None:
|
||||
return
|
||||
|
||||
print "--> Cleaning volatile image: {0}...".format (self.volatile_img)
|
||||
if verbose:
|
||||
print "--> Cleaning volatile image: {0}...".format (self.volatile_img)
|
||||
if dry_run:
|
||||
return
|
||||
if os.path.exists (self.volatile_img):
|
||||
@ -897,7 +898,7 @@ class QubesVm(object):
|
||||
print "--> Starting NetVM {0}...".format(self.netvm_vm.name)
|
||||
self.netvm_vm.start()
|
||||
|
||||
self.reset_volatile_storage()
|
||||
self.reset_volatile_storage(verbose=verbose)
|
||||
if verbose:
|
||||
print "--> Loading the VM (type = {0})...".format(self.type)
|
||||
|
||||
@ -1134,7 +1135,7 @@ class QubesTemplateVm(QubesVm):
|
||||
os.symlink (icon_path, self.icon_path)
|
||||
|
||||
# Create root-cow.img
|
||||
self.commit_changes()
|
||||
self.commit_changes(verbose=verbose)
|
||||
|
||||
# Create appmenus
|
||||
self.create_appmenus(verbose, source_template = src_template_vm)
|
||||
@ -1200,7 +1201,7 @@ class QubesTemplateVm(QubesVm):
|
||||
if dry_run:
|
||||
return
|
||||
|
||||
self.reset_volatile_storage()
|
||||
self.reset_volatile_storage(verbose=verbose)
|
||||
|
||||
if not self.is_updateable():
|
||||
raise QubesException ("Cannot start Template VM that is marked \"nonupdatable\"")
|
||||
@ -1209,10 +1210,11 @@ class QubesTemplateVm(QubesVm):
|
||||
|
||||
return super(QubesTemplateVm, self).start(debug_console=debug_console, verbose=verbose)
|
||||
|
||||
def reset_volatile_storage(self):
|
||||
def reset_volatile_storage(self, verbose = False):
|
||||
assert not self.is_running(), "Attempt to clean volatile image of running Template VM!"
|
||||
|
||||
print "--> Cleaning volatile image: {0}...".format (self.volatile_img)
|
||||
if verbose:
|
||||
print "--> Cleaning volatile image: {0}...".format (self.volatile_img)
|
||||
if dry_run:
|
||||
return
|
||||
if os.path.exists (self.volatile_img):
|
||||
@ -1223,11 +1225,12 @@ class QubesTemplateVm(QubesVm):
|
||||
raise IOError ("Error while unpacking {0} to {1}".\
|
||||
format(self.template_vm.clean_volatile_img, self.volatile_img))
|
||||
|
||||
def commit_changes (self):
|
||||
def commit_changes (self, verbose = False):
|
||||
|
||||
assert not self.is_running(), "Attempt to commit changes on running Template VM!"
|
||||
|
||||
print "--> Commiting template updates... COW: {0}...".format (self.rootcow_img)
|
||||
if verbose:
|
||||
print "--> Commiting template updates... COW: {0}...".format (self.rootcow_img)
|
||||
|
||||
if dry_run:
|
||||
return
|
||||
|
@ -1 +1 @@
|
||||
1.6.4
|
||||
1.6.6
|
||||
|
@ -1 +1 @@
|
||||
1.6.4
|
||||
1.6.6
|
||||
|
Loading…
Reference in New Issue
Block a user