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

Merge branch 'master' of ssh://git.qubes-os.org/var/lib/qubes/git/joanna/core

Browse Source
This commit is contained in:
Marek Marczykowski 2011-07-02 18:49:18 +02:00
commit cd7024cad1
8 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Makefile
View File

@ -29,24 +29,26 @@ rpms-vaio-fixes:
update-repo-current: 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-$(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-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/ for vmrepo in ../yum/current-release/current/vm/* ; do \
ln -f $(RPMS_DIR)/x86_64/qubes-core-*vm-*$(VERSION_VM)*fc14*.rpm ../yum/current-release/current/vm/f14/rpm/ dist=$$(basename $$vmrepo) ;\
cd ../yum && ./update_repo.sh ln -f $(RPMS_DIR)/x86_64/qubes-core-*vm-*$(VERSION_VM)*$$dist*.rpm $$vmrepo/rpm/ ;\
done
update-repo-current-testing: 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-$(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-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/ for vmrepo in ../yum/current-release/current-testing/vm/* ; do \
ln -f $(RPMS_DIR)/x86_64/qubes-core-*vm-*$(VERSION_VM)*fc14*.rpm ../yum/current-release/current-testing/vm/f14/rpm/ dist=$$(basename $$vmrepo) ;\
cd ../yum && ./update_repo.sh ln -f $(RPMS_DIR)/x86_64/qubes-core-*vm-*$(VERSION_VM)*$$dist*.rpm $$vmrepo/rpm/ ;\
done
update-repo-unstable: 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-$(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-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/ for vmrepo in ../yum/current-release/unstable/vm/* ; do \
ln -f $(RPMS_DIR)/x86_64/qubes-core-*vm-*$(VERSION_VM)*fc14*.rpm ../yum/current-release/unstable/vm/f14/rpm/ dist=$$(basename $$vmrepo) ;\
cd ../yum && ./update_repo.sh ln -f $(RPMS_DIR)/x86_64/qubes-core-*vm-*$(VERSION_VM)*$$dist*.rpm $$vmrepo/rpm/ ;\
done
update-repo-installer: update-repo-installer:
ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-*$(VERSION_DOM0)*fc13*.rpm ../installer/yum/qubes-dom0/rpm/ ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-*$(VERSION_DOM0)*fc13*.rpm ../installer/yum/qubes-dom0/rpm/

6
common/qubes.fc13.repo
View File

@ -1,19 +1,19 @@
[qubes-vm-current] [qubes-vm-current]
name = Qubes OS Repository for VM (updates) 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 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary
gpgcheck = 1 gpgcheck = 1
[qubes-vm-current-testing] [qubes-vm-current-testing]
name = Qubes OS Repository for VM (updates-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 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary
gpgcheck = 1 gpgcheck = 1
enabled=0 enabled=0
[qubes-vm-unstable] [qubes-vm-unstable]
name = Qubes OS Repository for 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 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary
gpgcheck = 1 gpgcheck = 1
enabled=0 enabled=0

6
common/qubes.fc14.repo
View File

@ -1,19 +1,19 @@
[qubes-vm-current] [qubes-vm-current]
name = Qubes OS Repository for VM (updates) 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 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary
gpgcheck = 1 gpgcheck = 1
[qubes-vm-current-testing] [qubes-vm-current-testing]
name = Qubes OS Repository for VM (updates-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 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary
gpgcheck = 1 gpgcheck = 1
enabled=0 enabled=0
[qubes-vm-unstable] [qubes-vm-unstable]
name = Qubes OS Repository for 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 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary
gpgcheck = 1 gpgcheck = 1
enabled=0 enabled=0

7
common/qubes_core
View File

@ -15,10 +15,11 @@ start()
exit 1 exit 1
fi fi
modprobe u2mfn modprobe evtchn
modprobe u2mfn
# Set permissions to /proc/xen/xenbus, so normal user can use xenstore-read # Set permissions to /proc/xen/xenbus, so normal user can use xenstore-read
chmod 666 /proc/xen/xenbus chmod 666 /proc/xen/xenbus
name=$(/usr/bin/xenstore-read name) name=$(/usr/bin/xenstore-read name)
if ! [ -f /etc/this_is_dvm ] ; then if ! [ -f /etc/this_is_dvm ] ; then

8
dom0/aux-tools/unbind_all_network_devices
View File

@ -53,12 +53,10 @@ def main():
if options.verbose: if options.verbose:
print "Loading Xen PCI Backend..." print "Loading Xen PCI Backend..."
retcode = subprocess.call (["/sbin/modprobe", "xen-pciback"]) retcode = subprocess.call (["/sbin/modprobe", "pciback"])
if retcode != 0: if retcode != 0:
retcode = subprocess.call (["/sbin/modprobe", "pciback"]) print "ERROR: Cannot load the pciback module!"
if retcode != 0: exit(1)
print "ERROR: Cannot load xen-pciback module!"
exit(1)
if options.verbose: if options.verbose:
print "Unbinding the following net devices:" print "Unbinding the following net devices:"

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

@ -720,7 +720,7 @@ class QubesVm(object):
format(template_root, self.root_img)) format(template_root, self.root_img))
# Create volatile.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): def create_appmenus(self, verbose, source_template = None):
if source_template is None: if source_template is None:
@ -770,7 +770,7 @@ class QubesVm(object):
format(self.kernels_dir + '/modules.img')) format(self.kernels_dir + '/modules.img'))
return True 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!" assert not self.is_running(), "Attempt to clean volatile image of running VM!"
if source_template is None: if source_template is None:
@ -780,7 +780,8 @@ class QubesVm(object):
if source_template is None: if source_template is None:
return return
print "--> Cleaning volatile image: {0}...".format (self.volatile_img) if verbose:
print "--> Cleaning volatile image: {0}...".format (self.volatile_img)
if dry_run: if dry_run:
return return
if os.path.exists (self.volatile_img): if os.path.exists (self.volatile_img):
@ -897,7 +898,7 @@ class QubesVm(object):
print "--> Starting NetVM {0}...".format(self.netvm_vm.name) print "--> Starting NetVM {0}...".format(self.netvm_vm.name)
self.netvm_vm.start() self.netvm_vm.start()
self.reset_volatile_storage() self.reset_volatile_storage(verbose=verbose)
if verbose: if verbose:
print "--> Loading the VM (type = {0})...".format(self.type) print "--> Loading the VM (type = {0})...".format(self.type)
@ -1134,7 +1135,7 @@ class QubesTemplateVm(QubesVm):
os.symlink (icon_path, self.icon_path) os.symlink (icon_path, self.icon_path)
# Create root-cow.img # Create root-cow.img
self.commit_changes() self.commit_changes(verbose=verbose)
# Create appmenus # Create appmenus
self.create_appmenus(verbose, source_template = src_template_vm) self.create_appmenus(verbose, source_template = src_template_vm)
@ -1200,7 +1201,7 @@ class QubesTemplateVm(QubesVm):
if dry_run: if dry_run:
return return
self.reset_volatile_storage() self.reset_volatile_storage(verbose=verbose)
if not self.is_updateable(): if not self.is_updateable():
raise QubesException ("Cannot start Template VM that is marked \"nonupdatable\"") 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) 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!" 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: if dry_run:
return return
if os.path.exists (self.volatile_img): if os.path.exists (self.volatile_img):
@ -1223,11 +1225,12 @@ class QubesTemplateVm(QubesVm):
raise IOError ("Error while unpacking {0} to {1}".\ raise IOError ("Error while unpacking {0} to {1}".\
format(self.template_vm.clean_volatile_img, self.volatile_img)) 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!" 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: if dry_run:
return return

2
version_dom0
View File

@ -1 +1 @@
1.6.4 1.6.6

2
version_vm
View File

@ -1 +1 @@
1.6.4 1.6.6