Marek Marczykowski
dd2cd0dc2b
Indent fix
2011-03-18 18:24:55 -04:00
Marek Marczykowski
1432376d7e
Merge git://git.qubes-os.org/joanna/core
2011-03-16 11:29:55 -04:00
Marek Marczykowski
93d1956aca
Version 1.4.1
2011-03-16 11:20:00 -04:00
Joanna Rutkowska
e99d833767
version 1.4.1
2011-03-16 15:57:54 +01:00
Marek Marczykowski
ac4d005160
Merge branch 'master' of ssh://git.qubes-os.org/var/lib/qubes/git/marmarek/core
2011-03-16 11:43:58 +01:00
Marek Marczykowski
f25afe989c
Move xenstore-watch for VM from AppVM to common. Add to core-common.spec
2011-03-16 11:41:18 +01:00
Marek Marczykowski
00ff62767a
Do not try to disable 'reboot' service
2011-03-16 11:41:18 +01:00
Marek Marczykowski
809e1db247
Drop forced fedora version from requires
2011-03-16 11:41:18 +01:00
Joanna Rutkowska
4ecaf86361
Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core
2011-03-15 22:57:27 +01:00
Marek Marczykowski
41367c5f39
Move xenstore-watch for VM from AppVM to common. Add to core-common.spec
2011-03-15 19:47:26 +01:00
Joanna Rutkowska
83791f2327
Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core
2011-03-15 18:16:33 +01:00
Joanna Rutkowska
20cc860e1c
Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/smoku/core
2011-03-14 22:44:04 +01:00
Joanna Rutkowska
19099ca5c3
Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core
2011-03-14 13:15:48 +01:00
Marek Marczykowski
94209336ae
Register VM services also on update
2011-03-11 23:42:49 +01:00
Marek Marczykowski
a0a6bdf7d8
Add qubes_netwatcher to proxyvm spec
2011-03-11 23:33:15 +01:00
Marek Marczykowski
01458104cb
Merge commit 'e2d52a27e810522c41720bb17b1f4f52f1fe2e6a'
...
Conflicts:
dom0/qvm-core/qubes.py
fwvm/init.d/qubes_firewall
2011-03-11 23:32:13 +01:00
Tomasz Sterna
bfb5ec483d
Use SIGKILL to stop qubes_firewall service
2011-03-11 19:40:23 +01:00
Tomasz Sterna
7914558ad8
FwVM network changes watcher script
2011-03-11 19:39:52 +01:00
Marek Marczykowski
4c0849890c
NetVM, AppVM, ProxyVM from single template - VM side (missing files...)
2011-03-11 01:42:42 +01:00
Marek Marczykowski
c87b15ba2a
NetVM, AppVM, ProxyVM from single template - VM side
...
Modify VM packages to:
- do not conflicts
- starts services if its VM type need it
Added core-proxyvm (firewall) and core-commonvm (common parts) packages.
2011-03-11 01:38:04 +01:00
Marek Marczykowski
f5e526f2c3
.gitignore
2011-03-10 16:23:45 +01:00
Marek Marczykowski
67b6217308
Add 30-qubes_external_ip to netvm.spec
2011-03-10 16:09:37 +01:00
Marek Marczykowski
382b90c543
Merge branch 'master' of ssh://git.qubes-os.org/var/lib/qubes/git/smoku/core
...
Conflicts:
dom0/qvm-core/qubes.py
2011-03-10 16:05:48 +01:00
Marek Marczykowski
07abd184ab
Merge tag 'smk_a8cef51b' of ssh://git.qubes-os.org/var/lib/qubes/git/smoku/core
...
Conflicts:
dom0/qvm-core/qubes.py
dom0/qvm-tools/qvm-ls
2011-03-10 14:14:48 +01:00
Tomasz Sterna
76bf222dd2
Added FirewallVM related VM scripts
2011-03-09 20:50:13 +01:00
Tomasz Sterna
e686391de1
Added AppVM version of xenstore-watch.
2011-03-09 17:51:05 +01:00
Marek Marczykowski
223f14e21c
Merge branch 'master' of ssh://git.qubes-os.org/var/lib/qubes/git/marmarek/core
...
Conflicts:
dom0/qvm-core/qubes.py
dom0/qvm-tools/qvm-prefs
dom0/qvm-tools/qvm-template-commit
2011-03-09 17:23:32 +01:00
Marek Marczykowski
45f70b4e02
gitignore files - add build products
2011-03-06 14:06:24 +01:00
Marek Marczykowski
dc5b65c23d
Add BR to core-appvm.spec
2011-03-06 14:06:24 +01:00
Marek Marczykowski
1b9aec1efd
Add backup files to gitignore
2011-03-06 14:06:24 +01:00
Marek Marczykowski
24ed4df11c
block-snapshot fixes
2011-03-06 14:06:23 +01:00
Marek Marczykowski
088adcc95f
gitignore files - add build products
2011-03-02 11:58:22 +01:00
Marek Marczykowski
ee5542ee43
Add BR to core-appvm.spec
2011-03-02 11:55:54 +01:00
Marek Marczykowski
8fa18c4658
Add backup files to gitignore
2011-03-02 11:51:57 +01:00
Marek Marczykowski
2aec587027
block-snapshot fixes
2011-03-02 11:51:43 +01:00
Marek Marczykowski
e0b50db2ee
Update TemplateVM with running AppVM: part 1
...
snapshot and origin device type for xen
2011-02-26 03:42:55 +01:00
Joanna Rutkowska
2729c6447b
version 1.3.13
2010-10-04 19:38:18 +02:00
Joanna Rutkowska
04885a8bd8
Fixed the logic for /home and /usr/local linking/copying for AppVMs
...
We assume that the template's root fs already has the following symlinks:
/home -> /rw/home
/usr/local -> /rw/usrlocal
2010-10-04 19:36:54 +02:00
Joanna Rutkowska
dc297fda77
version 1.3.8
2010-09-30 19:28:31 +02:00
Rafal Wojtczuk
07fe7804d7
Allow numbers in vmname in qubes_penctl.
2010-09-27 17:52:10 +02:00
Joanna Rutkowska
2f92d0156b
Merge branch 'qmemman' of git://qubes-os.org/rafal/core
...
Conflicts:
dom0/qvm-core/qubes.py
2010-09-23 12:31:25 +02:00
Joanna Rutkowska
b3fae338ed
version 1.3.4
2010-09-17 17:50:38 +02:00
Joanna Rutkowska
60b0eb28e8
Merge branch 'ticket4' of git://qubes-os.org/rafal/core
2010-09-17 17:30:36 +02:00
Rafal Wojtczuk
2c23edd1ee
Require NetworkManager >= 0.8.1-1
...
Unfortunately, config files layout changes with NM version; therefore
require >= 0.8.1-1.
This should also prevent NM from messing with VIF interfaces on suspend/resume.
2010-09-17 15:16:01 +02:00
Joanna Rutkowska
e7cb27de3e
version 1.3.3
2010-09-16 20:12:16 +02:00
Joanna Rutkowska
4f8ff21fb6
Merge branch 'qmemman' of git://qubes-os.org/rafal/core
2010-09-16 20:01:40 +02:00
Joanna Rutkowska
432d978d93
version 1.3.1
2010-09-16 17:01:15 +02:00
Joanna Rutkowska
c44f58f180
Merge branch 'comment1' of git://qubes-os.org/rafal/core
...
Conflicts:
dom0/restore/qubes_restore.c
2010-09-16 15:55:35 +02:00
Joanna Rutkowska
17481e715a
Make 'make clean' clean all the object files
2010-09-15 15:36:04 +02:00
Joanna Rutkowska
1328cce87e
core-appvm.spec: create 'user' user in %pre instead of in %post
...
... otherwsie rpm -i throws an error when trying to set permissions for
/home_volatile/user, as the user 'user' doesn't exist when the %files section
is being processed during rpm install (if this is a first install of the rpm).
2010-09-15 15:33:09 +02:00
