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-09-08 23:00:04 +02:00
commit dc132b4f93
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,7 +75,7 @@ default_firewall_conf_file = "firewall.xml"
default_memory = 400 default_memory = 400
default_servicevm_vcpus = 1 default_servicevm_vcpus = 1
default_kernelopts = "" default_kernelopts = ""
default_kernelopts_pcidevs = "iommu=soft swiotlb=2048 pci=nomsi" default_kernelopts_pcidevs = "iommu=soft swiotlb=2048"
qubes_whitelisted_appmenus = 'whitelisted-appmenus.list' qubes_whitelisted_appmenus = 'whitelisted-appmenus.list'

9
dom0/qvm-tools/qvm-dom0-upgrade
View File

@ -1,5 +1,6 @@
#!/bin/bash #!/bin/bash
UPDATEVM=`qvm-get-updatevm` UPDATEVM=`qvm-get-updatevm`
if [ -z "$UPDATEVM" ]; then if [ -z "$UPDATEVM" ]; then
echo "UpdateVM not set, exiting" echo "UpdateVM not set, exiting"
@ -19,6 +20,14 @@ qvm-run --pass_io $UPDATEVM "/usr/lib/qubes/qubes_download_dom0_updates.sh $*" |
# Wait for download completed # Wait for download completed
while pidof -x qubes-receive-updates >/dev/null; do sleep 0.5; done while pidof -x qubes-receive-updates >/dev/null; do sleep 0.5; done
if [ $# -gt 0 ]; then if [ $# -gt 0 ]; then
ID=$(id -ur)
if [ $ID != 0 ] ; then
echo "This script should be run as root, use sudo next time."
echo "Now you can manually run yum install (use sudo again)."
exit
fi
yum install $@ yum install $@
elif [ -f /var/lib/qubes/updates/repodata/repomd.xml ]; then elif [ -f /var/lib/qubes/updates/repodata/repomd.xml ]; then
yum check-update yum check-update

2
version_dom0
View File

@ -1 +1 @@
1.6.18 1.6.20

2
version_vm
View File

@ -1 +1 @@
1.6.19 1.6.20