Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,275 Commits 1 Branch 0 Tags 20 MiB
db7f375635
Commit Graph

1195 Commits

Author SHA1 Message Date
Alexandre Bezroutchko
9fe165ebb4 dom0/qvm-usb: Automatically create XS directory for USB devices 2012-10-21 14:59:40 +02:00
Alexandre Bezroutchko
743d93d8f0 dom0/qvm-usb: bugfix 2012-10-21 14:59:39 +02:00
Alexandre Bezroutchko
9d77b3dd3c dom0/qvm-usb: detach operation appears to work 2012-10-21 14:59:39 +02:00
Alexandre Bezroutchko
89b78d9426 dom0/qvm-usb: changed output format for qvm-usb -l 2012-10-21 14:59:39 +02:00
Alexandre Bezroutchko
b72db5cad8 dvp/qvm-usb: not going to implement explicit specification of USB frontend device/port 2012-10-21 14:59:39 +02:00
Alexandre Bezroutchko
4bb1182228 dom0/qvm-usb: implemented automatic frontend/backend initialization on attach 2012-10-21 14:59:39 +02:00
Alexandre Bezroutchko
a85d34a8b3 dom0/qvm-usb: partly implement usb_find_unused_frontend() 2012-10-21 14:59:39 +02:00
Alexandre Bezroutchko
d613d6a04d dom0/qvm-usb: attach works again for dom0 backend 2012-10-21 14:59:38 +02:00
Alexandre Bezroutchko
db4d49b19c dom0+vm/qvm-usb: intermediate 2012-10-21 14:59:38 +02:00
Alexandre Bezroutchko
72fba0ac1b dom0/qvm-usb: added usb_setup() 2012-10-21 14:59:37 +02:00
Alexandre Bezroutchko
17263c96b8 dom0/qvm-usb: fixed missing input validation 2012-10-21 14:59:37 +02:00
Alexandre Bezroutchko
b9b2077062 dom0/qvm-usb: display proper name of vm a device is attached to 2012-10-21 14:59:37 +02:00
Alexandre Bezroutchko
c8cb9d00ce dom0/qvm-usb: use xs transaction 2012-10-21 14:59:36 +02:00
Alexandre Bezroutchko
0ef88be16d dom0/qvm-usb: added description to usb_list() and usb_check_attached() methods 2012-10-21 14:59:36 +02:00
Alexandre Bezroutchko
caf27cb936 dom0+vm/qvm-usb: use transaction in usb_check_attached() 2012-10-21 14:59:36 +02:00
Alexandre Bezroutchko
81ca750403 dom0+vm/qvm-usb: cosmetic: removed debugging code, adjusted fixmes 2012-10-21 14:59:36 +02:00
Alexandre Bezroutchko
b962debfad dom0/qvm-usb: implemented usb_check_attached method, now "qvm-usb -l" indicate attachments 2012-10-21 14:59:36 +02:00
Alexandre Bezroutchko
988d37fcb2 dom0/qvm-usb: qvm-usb is hopefully complete, stubs for all remaining usb_* methods implemented 2012-10-21 14:59:36 +02:00
Alexandre Bezroutchko
95b93a5082 dom0/qvm-usb: enabled -f option to qvm-usb (and cosmetic changes) 2012-10-21 14:59:35 +02:00
Alexandre Bezroutchko
fc74c6a85b dom0/qvm-usb: first implementation of qvm-usb 2012-10-21 14:59:35 +02:00
Bruce A Downs
a504600c20 dom0/core: Added the pretty print of qubes.xml 
* Replaced xml.etree.ElementTree with lxml.etree
* Added argument to tree.write(file, encoding="UTF-8", pretty_print=True)
 2012-10-19 02:21:41 +02:00
Bruce A Downs
28b4f82b0a dom0/core: Added call to lock.remove_pidfile() on successful exit 
* Adding remove_pidfile on exit
* prevents the incorrect 'crash' message on startup
* Added proper call to main
 2012-10-19 02:21:41 +02:00
Alexandre Bezroutchko
d6432a16c4 dom0/qvm-tools: clean resolv.conf when networking goes down 2012-10-19 02:21:03 +02:00
Marek Marczykowski
3a875edf58 dom0/core: fix qubes-dom0-network-via-netvm (#660) 
IP 10.137.0.1 was already used by netvm, so change dom0 IP to 10.137.0.2.
 2012-10-19 02:07:35 +02:00
Marek Marczykowski
3e90174910 Merge branch 'hvm-for-master' 
Conflicts:
	dom0/qvm-core/qubes.py
	dom0/qvm-tools/qvm-sync-clock
	version_dom0
	vm-systemd/qubes-sysinit.sh
 2012-10-17 21:41:03 +02:00
Marek Marczykowski
d010906eb1 Merge remote-tracking branch 'abb/qvm_block-bugfix' 2012-10-16 00:59:36 +02:00
Alexandre Bezroutchko
ca4367821e Improve handling of command line parameters, don't silently ignore unexpected arguments. 
This is to avoid following behavior:

    [abb@dom0 qubes-core]$ qvm-block -l
    netvm:sda       STORAGE_DEVICE () 0 B
    dom0:sdb1       Cruzer () 3 GiB
    dom0:sdb        Cruzer () 3 GiB

    [abb@dom0 qubes-core]$ qvm-block -l
    netvm:sda       STORAGE_DEVICE () 0 B
    dom0:sdb1       Cruzer () 3 GiB
    dom0:sdb        Cruzer () 3 GiB

    [abb@dom0 qubes-core]$ qvm-block -a qdvp dom0:sdb

    [abb@dom0 qubes-core]$ qvm-block -l
    netvm:sda       STORAGE_DEVICE () 0 B
    dom0:sdb1       Cruzer () 3 GiB
    dom0:sdb        Cruzer () 3 GiB (attached to 'qdvp' as 'xvdi')

    [abb@dom0 qubes-core]$ qvm-block -d qdvp BLAHBLAH
                                          ^^^^^^^^^^^^^
    >>> The last parameter is silently ignored and all devices get detached

    [abb@dom0 qubes-core]$ qvm-block -l
    netvm:sda       STORAGE_DEVICE () 0 B
    dom0:sdb1       Cruzer () 3 GiB
    dom0:sdb        Cruzer () 3 GiB
 2012-10-15 11:40:08 +02:00
Marek Marczykowski
02601049ca dom0/qmemman: do not fail when domain name not available 
This can be the case when domain just dissapeared (destroy), but qmemman didn't
processed xenstore watch trigger.
 2012-10-15 01:58:07 +02:00
Bruce A Downs
6304155990 dom0/core: minor spell check fixes 
* happend
* avilable
* skiping
 2012-10-09 01:23:54 +02:00
Bruce A Downs
05f7bfc9c1 dom0/core: Code cleanup of qubesutils.py 
* Took out unreferenced restore_vm_file function
* removed unused imports
* renamed interpreter from python2 to python
 2012-10-09 01:23:45 +02:00
Marek Marczykowski
081cfab559 dom0/core: do not leak xs transaction and use it in all xs calls 2012-10-08 01:26:07 +02:00
Alexandre Bezroutchko
f4ef1adcdd dom0/qvm-core: start XS transaction before getting the list of domains 2012-10-08 01:23:52 +02:00
Alexandre Bezroutchko
3c53f049a3 dom0/qvm-block: cosmetic 2012-10-08 01:23:42 +02:00
Alexandre Bezroutchko
abfe99756f start XS transaction before getting the list of domains 2012-10-08 00:48:20 +02:00
Alexandre Bezroutchko
caf3ed1ae4 cosmetic 2012-10-08 00:46:30 +02:00
Marek Marczykowski
d03bab3db2 Merge branch 'master-for-hvm' into hvm 
Conflicts:
	dom0/qvm-core/qubes.py
	dom0/qvm-tools/qvm-sync-clock
 2012-10-04 05:45:41 +02:00
Marek Marczykowski
5e696298cf dom0/core: fix icon handling on VM clone 2012-10-04 05:44:20 +02:00
Marek Marczykowski
d5c74f69ee dom0/core: recreate appmenus after rename for any VM, not only AppVM (#659) 2012-10-04 05:44:20 +02:00
Marek Marczykowski
9a2f1dfebe dom0/core: include net/proxy VM default appmenus list in cloned template 2012-10-04 05:44:19 +02:00
Olivier Médoc
69354475bf dom0/qvm-sync-clock: use timestamp in RFC2822 format to avoid locale issues 2012-10-04 05:44:19 +02:00
Marek Marczykowski
397f2912f0 dom0/core: allow '_' in VM name 2012-10-04 05:44:18 +02:00
Marek Marczykowski
92747285c7 dom0/qvm-block: rework device name parsing to better support c0p1 name style 2012-10-04 05:44:18 +02:00
Marek Marczykowski
19a60eff55 dom0/core: fix icon handling on VM clone 2012-10-03 22:28:49 +02:00
Marek Marczykowski
1b25d77504 dom0/core: recreate appmenus after rename for any VM, not only AppVM (#659) 2012-10-03 21:36:52 +02:00
Marek Marczykowski
45639096fa dom0/core: include net/proxy VM default appmenus list in cloned template 2012-10-03 21:12:18 +02:00
Olivier Médoc
9a90f499bc dom0/qvm-sync-clock: use timestamp in RFC2822 format to avoid locale issues 2012-10-03 14:55:05 +02:00
Marek Marczykowski
c1214bfef9 dom0/core: VM property for qrexec startup timeout (#27 pro) 2012-09-25 03:26:44 +02:00
Marek Marczykowski
96199058d1 dom0/core: wait for user session on HVM start (#31 pro) 2012-09-25 00:23:35 +02:00
Marek Marczykowski
f271ad8463 dom0/core: fix return value of QubesHVM.run() 2012-09-25 00:23:20 +02:00
Marek Marczykowski
9db9d8b6c2 dom0/core: allow passing stdin to QubesVM.run() 2012-09-25 00:22:31 +02:00
Marek Marczykowski
3ecc031603 dom0/core: allow '_' in VM name 2012-09-14 12:58:00 +02:00
Marek Marczykowski
2444603ef5 dom0/core: allow '_' in VM name 2012-09-14 12:57:25 +02:00
Marek Marczykowski
900a21db72 dom0/init.d: hide some missleading error 2012-09-04 19:24:01 +02:00
Marek Marczykowski
b7eaf9a30d dom0/core: do not use hardcoded "user" in qvm-sync-clock 2012-08-31 00:53:50 +02:00
Marek Marczykowski
46fd664ba3 dom0/qrexec: implement default user handling in qrexec_daemon 
This will simplify using qrexec from utilities which doen't load qubes.xml
normally (like qrexec_policy, gui daemon).
 2012-08-30 17:44:52 +02:00
Marek Marczykowski
3b320878ac dom0/qvm-block: rework device name parsing to better support c0p1 name style 2012-08-26 14:42:32 +02:00
Marek Marczykowski
6305e6cbe1 dom0/qvm-block: rework device name parsing to better support c0p1 name style 2012-08-26 14:41:35 +02:00
Marek Marczykowski
fefb6d9cff vm+dom0/filecopy-unpacker: send errors to qfile-agent istead of local message (#239) 
Because unpacker no longer require GUI access, there is no need for separate
process for error reporting. Which greatly simplify the code.
 2012-08-25 02:09:45 +02:00
Marek Marczykowski
c0455ac641 Merge branch 'master' into hvm 
Conflicts:
	dom0/qvm-tools/qvm-create
	version_dom0
 2012-08-23 11:11:59 +02:00
Marek Marczykowski
1cd3ef3456 dom0/qvm-tools: catch exceptions while settting VM name (#656) 2012-08-23 04:02:50 +02:00
Marek Marczykowski
536eb00b9c dom0/core: verify VM name for not-allowed characters (#656) 2012-08-23 04:01:55 +02:00
Marek Marczykowski
b7f5c6ac0b dom0/qvm-tools: catch exceptions while settting VM name (#656) 2012-08-23 03:48:03 +02:00
Marek Marczykowski
85565af560 dom0/core: verify VM name for not-allowed characters (#656) 2012-08-23 03:45:06 +02:00
Marek Marczykowski
cc23d3cb3d dom0/qubes_rpc: mark untrusted variables (#654) 2012-08-16 16:56:55 +02:00
Marek Marczykowski
26fca20d45 dom0/qmemman: fix reporting to qubes-manager 
When VM is shutting down, xenstore entries (especially 'name') can be deleted
before qmemman remove VM from its list. So check if name is defined before
reporting to qubes-manager.
 2012-08-16 16:56:55 +02:00
Marek Marczykowski
9b3a77bc1d dom0: move RPC services to separate directory (#654) 
This makes more clear which code have contact with untrusted data from VM.
 2012-08-16 16:56:16 +02:00
Marek Marczykowski
a67bf1f1c0 Merge branch 'master' into hvm 2012-08-06 15:00:02 +02:00
Marek Marczykowski
4f56cf420a dom0/core: add missing "cleanup_dispvms" file (#648) 2012-08-06 14:57:30 +02:00
Marek Marczykowski
e1404a2d4f dom0/qvm-run: do not break --all when run in one VM failed 2012-08-04 04:15:33 +02:00
Marek Marczykowski
fa17c541af dom0: cleanup dead DispVMs at system startup (#648) 2012-08-04 00:57:34 +02:00
Marek Marczykowski
7677854fd2 dom0/core: make verbose parameter of create_appmenus optional 2012-08-04 00:37:14 +02:00
Marek Marczykowski
847fe81dcd dom0/qvm-run: do not break --all when run in one VM failed 2012-08-01 01:01:37 +02:00
Marek Marczykowski
e6c8bf81fd Merge branch 'master' into hvm 
Conflicts:
	version_dom0
 2012-08-01 00:55:05 +02:00
Marek Marczykowski
a680976f1e dom0/updates: show errors from qubes-receive-updates 
Especially when signature verification failed, show message about it, not
enigmatic "Could not open/read
file:///var/lib/qubes/updates/repodata/repomd.xml"
 2012-07-30 23:16:05 +02:00
Marek Marczykowski
4ffe3e0391 dom0/qvm-block: fix error handler 2012-07-30 23:16:05 +02:00
Marek Marczykowski
c2d4b0de62 dom0/updates: typo fix in qubes-manager statfile handling 2012-07-30 23:16:05 +02:00
Marek Marczykowski
be389bddb9 dom0/core: allow custom kernel for non-updateable VMs 2012-07-28 01:40:24 +02:00
Marek Marczykowski
500baf3a60 dom0/core: allow custom kernel for non-updateable VMs 2012-07-28 01:39:59 +02:00
Marek Marczykowski
18c9af90c7 dom0/core: fix qubes-session wait code 2012-07-28 00:55:12 +02:00
Marek Marczykowski
4b9cc1e405 dom0/core: fix qubes-session wait code 2012-07-28 00:51:19 +02:00
Marek Marczykowski
d1b827e1bd Merge branch 'master' into hvm 
Conflicts:
	dom0/init.d/qubes_core
	rpm_spec/core-dom0.spec
	version_dom0
 2012-07-25 02:52:00 +02:00
Marek Marczykowski
ad7da49e74 dom0/core: remove ugly hack in network-reconnect code (#637) 2012-07-22 01:33:08 +02:00
Marek Marczykowski
6da61af323 dom0/backup-restore: fix netvm field in summary 2012-07-21 00:12:18 +02:00
Marek Marczykowski
a97458ad08 dom0/core: do not reset firewall on clone_attrs 2012-07-20 22:55:28 +02:00
Marek Marczykowski
dc95349145 dom0/backup-restore: fix verification of VMs in backup 2012-07-20 22:55:28 +02:00
Marek Marczykowski
e7477cfaf2 dom0/core: minor comments improvements 2012-07-20 22:55:28 +02:00
Marek Marczykowski
dbbb168b66 dom0/core: improve diagnostics of qmemman errors 2012-07-20 22:55:17 +02:00
Marek Marczykowski
130873071f dom0/core: do not reset firewall on clone_attrs 2012-07-20 22:54:53 +02:00
Marek Marczykowski
7f9d77b27e dom0/backup-restore: fix verification of VMs in backup 2012-07-20 22:54:12 +02:00
Marek Marczykowski
ea02bee444 dom0/core: minor comments improvements 2012-07-20 22:53:14 +02:00
Marek Marczykowski
abefe78197 dom0/core: improve diagnostics of qmemman errors 2012-07-20 16:49:19 +02:00
Marek Marczykowski
5ea32bd11b dom0/meminfo-writer: fork into background after first info sent to qmemman (#635) 2012-07-20 16:42:12 +02:00
Marek Marczykowski
148e5e55f7 dom0/qmemman: fork into background after daemon initialization (#635) 
Parse config and setup socket before fork.
 2012-07-20 16:42:11 +02:00
Marek Marczykowski
59a1fb96db dom0/meminfo-writer: fork into background after first info sent to qmemman (#635) 2012-07-20 16:41:26 +02:00
Marek Marczykowski
c2d20e59d0 dom0/qmemman: fork into background after daemon initialization (#635) 
Parse config and setup socket before fork.
 2012-07-20 16:32:17 +02:00
Marek Marczykowski
ba568ed3e9 dom0/core: use generic run() to wait for qubes-session 
Especially use 'ignore_stderr' feature.
 2012-07-20 13:17:37 +02:00
Marek Marczykowski
273032bfae dom0: add missing file 2012-07-20 13:09:20 +02:00
Marek Marczykowski
d5dbbd41cb dom0/qvm-tools: add missing imports 2012-07-20 13:09:07 +02:00
Marek Marczykowski
f98bf1d570 dom0: fix dirs permissions after xen upgrade 2012-07-20 13:08:18 +02:00
Marek Marczykowski
7071bf62bc dom0/core: use generic run() to wait for qubes-session 
Especially use 'ignore_stderr' feature.
 2012-07-20 13:06:26 +02:00
Marek Marczykowski
2ddd48f8e4 dom0/core: disable dynamic memory when VM have PCI devices assigned 2012-07-19 14:44:09 +02:00
Marek Marczykowski
406d233b6b dom0/core: disable dynamic memory when VM have PCI devices assigned 2012-07-19 14:43:24 +02:00
Marek Marczykowski
cfd95575dd dom0: add missing file 2012-07-18 22:22:52 +02:00
Marek Marczykowski
b321d16336 dom0/qvm-tools: add missing imports 2012-07-18 18:10:08 +02:00
Marek Marczykowski
38e8b85b06 dom0: fix dirs permissions after xen upgrade 2012-07-18 12:46:36 +02:00
Marek Marczykowski
4b92f6390a dom0/qvm-core: ignore stderr from VM commands when not needed for sure (#626) 
pam_systemd.so has a bug, which cause spurious '...killed' output on stderr.
 2012-07-16 13:36:08 +02:00
Marek Marczykowski
5637793fae dom0/qvm-core: ignore stderr from VM commands when not needed for sure (#626) 
pam_systemd.so has a bug, which cause spurious '...killed' output on stderr.
 2012-07-16 13:31:43 +02:00
Marek Marczykowski
712d122894 dom0: fix block-cleaner daemon 2012-07-15 19:48:36 +02:00
Marek Marczykowski
d9291ab2b4 dom0/appmenus: Rename dir entry for ServiceVMs (#627) 2012-07-15 02:41:23 +02:00
Marek Marczykowski
6c74db3aac dom0/qvm-sync-appmenus: use qubes.GetAppmenus service 2012-07-15 02:41:23 +02:00
Marek Marczykowski
1083fad626 dom0/core: remove duplicated remove_from_disk definition 2012-07-15 02:41:23 +02:00
Marek Marczykowski
c0ffdd6fa5 dom0/dom0-updates: remove updates-pending flag after update installation 2012-07-15 02:41:23 +02:00
Marek Marczykowski
0218ab0b2a dom0/core: remove appmenus when removing NetVM (#627) 2012-07-15 02:41:23 +02:00
Marek Marczykowski
b6b50b6fea dom0/appmenus: Rename dir entry for ServiceVMs (#627) 2012-07-15 02:26:17 +02:00
Marek Marczykowski
1009b1a46d dom0/qvm-sync-appmenus: use qubes.GetAppmenus service 2012-07-15 02:26:17 +02:00
Marek Marczykowski
08888fcf7a dom0/core: remove duplicated remove_from_disk definition 2012-07-14 16:07:35 +02:00
Marek Marczykowski
d156a815d2 dom0/dom0-updates: remove updates-pending flag after update installation 2012-07-14 15:55:46 +02:00
Marek Marczykowski
7fbeacc81b dom0/core: remove appmenus when removing NetVM (#627) 2012-07-14 15:12:41 +02:00
Marek Marczykowski
2c1201b4a9 dom0: call qrexec service while preparing NetVM for sleep (#617) 
Instead of hardcoded commands.
 2012-07-13 14:44:11 +02:00
Marek Marczykowski
32fbd5aefd dom0: call qrexec service while preparing NetVM for sleep (#617) 
Instead of hardcoded commands.
 2012-07-13 14:42:54 +02:00
Marek Marczykowski
8d8ce2de31 dom0/dispvm: by default use prerun script from inside of VM (#620) 2012-07-12 14:22:44 +02:00
Marek Marczykowski
4aab477f38 dom0/dispvm: by default use prerun script from inside of VM (#620) 2012-07-12 14:21:59 +02:00
Marek Marczykowski
b42e09e4ba dom0/qvm-tools: Warn the user when running qvm-tool as root is not recommended (#612) 2012-07-12 03:57:22 +02:00
Marek Marczykowski
342a190302 dom0/dispvm: notify when starting new DispVM (#616) 2012-07-12 03:56:09 +02:00
Marek Marczykowski
2c0d0dff8b dom0/qvm-sync-clock: string '\n' from date output 2012-07-12 03:56:09 +02:00
Marek Marczykowski
64a942eee8 dom0/dispvm: notify when starting new DispVM (#616) 2012-07-12 03:44:41 +02:00
Marek Marczykowski
ac76b7203f dom0/qvm-sync-clock: string '\n' from date output 2012-07-12 03:43:57 +02:00
Marek Marczykowski
ba81866b2f dom0/qvm-tools: Warn the user when running qvm-tool as root is not recommended (#612) 2012-07-11 23:53:23 +02:00
Marek Marczykowski
ee3cf6b583 dom0/qvm-block: fix error handling (#614) 2012-07-05 01:49:41 +02:00
Marek Marczykowski
64369bf02a dom0/qvm-run: Notify qubes-manager about failed VM start (#615) 2012-07-05 01:43:32 +02:00
Marek Marczykowski
e70b690150 dom0/qmemman: notify qubes-manager about misbehaving VMs (#615) 2012-07-05 01:43:32 +02:00
Marek Marczykowski
b4070a99a3 dom0/qmemman: check if donors have returned memory before distributing it to other VMs (#563) 
When some VM did't returned memory to Xen, mark this VM as suspicious and abort
balance to always have some xen free_memory margin.
VMs marked as suspicius will be evaluated before next balance and still didn't
returned memory, will be skipped in balance process.
 2012-07-05 01:43:32 +02:00
Marek Marczykowski
892a6bbc13 dom0/guihelpers: interface to notifying qubes-manager (#615) 2012-07-05 01:43:32 +02:00
Marek Marczykowski
421b13b6c4 dom0/qmemman: minor fix in mem_set() 
Set target/maxmem in more logical order (balloon driver can fail to balloon the
first time, but will retry anyway). Force sizes to be integers.
 2012-07-05 01:43:32 +02:00
Marek Marczykowski
897f981c8c dom0/qvm-run: Notify qubes-manager about failed VM start (#615) 2012-07-05 01:30:00 +02:00
Marek Marczykowski
27b6aa4378 dom0/qmemman: notify qubes-manager about misbehaving VMs (#615) 2012-07-05 01:29:45 +02:00
Marek Marczykowski
3ce68def8c dom0/qmemman: check if donors have returned memory before distributing it to other VMs (#563) 
When some VM did't returned memory to Xen, mark this VM as suspicious and abort
balance to always have some xen free_memory margin.
VMs marked as suspicius will be evaluated before next balance and still didn't
returned memory, will be skipped in balance process.
 2012-07-05 01:29:45 +02:00
Marek Marczykowski
eb3da24aa4 dom0/guihelpers: interface to notifying qubes-manager (#615) 2012-07-05 01:29:45 +02:00
Marek Marczykowski
30ff420b52 dom0/qmemman: minor fix in mem_set() 
Set target/maxmem in more logical order (balloon driver can fail to balloon the
first time, but will retry anyway). Force sizes to be integers.
 2012-07-05 01:29:45 +02:00
Marek Marczykowski
2b452c9970 dom0/qmemman: remove trainling spaces 2012-07-05 01:29:45 +02:00
Marek Marczykowski
11ab37b9ff dom0/qvm-block: fix error handling (#614) 2012-06-30 00:58:06 +02:00
Marek Marczykowski
2854f08bca dom0/core: fix the last merge... 
Remove duplicated lines by faulty conflict resolution.
 2012-06-28 12:28:14 +02:00
Marek Marczykowski
41efe076b2 dom0/core: typo fix in clone_disk_files (#608) 2012-06-28 11:37:18 +02:00
Marek Marczykowski
50dc086682 dom0/core: typo fix in clone_disk_files (#608) 2012-06-26 11:05:03 +02:00
Marek Marczykowski
44767bea7f Merge branch 'master' into hvm 
Conflicts:
	dom0/init.d/qubes_core
	dom0/qvm-core/qubes.py
	dom0/qvm-tools/qvm-prefs
	version_dom0
	version_vm
 2012-06-26 03:49:10 +02:00
Marek Marczykowski
bf9b63e06f dom0/qmemman: allow balance when xen have low free memory (#563) 2012-06-26 03:43:36 +02:00
Marek Marczykowski
2e7d5cc178 dom0: appmenu to start Firefox in new DispVM (#594) 2012-06-26 03:43:36 +02:00
Marek Marczykowski
29e3593a02 dom0/qmemman: allow balance when xen have low free memory (#563) 2012-06-26 00:26:53 +02:00
Marek Marczykowski
0008e71784 dom0: appmenu to start Firefox in new DispVM (#594) 2012-06-24 14:09:43 +02:00
Marek Marczykowski
ad7d6957b1 dom0/updates: clean yum cache as root (#540) 
Actually looks like this solve problem, don't know why (cleaning as user
didn't returned any error).
 2012-06-23 00:37:47 +02:00