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

Merge branch 'hvm' of 10.141.1.101:/var/lib/qubes/git/marmarek/core into hvm

Browse Source
This commit is contained in:
Joanna Rutkowska 2012-03-01 12:45:21 +01:00
commit cfa12183f2
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2090,9 +2090,9 @@ class QubesHVm(QubesVm):
if self.drive: if self.drive:
stat_res = os.stat(self.drive) stat_res = os.stat(self.drive)
if stat.S_ISBLK(stat_res.st_mode): if stat.S_ISBLK(stat_res.st_mode):
params['otherdevs'] = "'phy:%s,hdc:cdrom,r'," % self.drive params['otherdevs'] = "'phy:%s,xvdc:cdrom,r'," % self.drive
else: else:
params['otherdevs'] = "'script:file:%s,hdc:cdrom,r'," % self.drive params['otherdevs'] = "'script:file:%s,xvdc:cdrom,r'," % self.drive
else: else:
params['otherdevs'] = '' params['otherdevs'] = ''
return params return params

1
rpm_spec/core-dom0.spec
View File

@ -40,6 +40,7 @@ BuildRequires: xen-devel
Requires: python, xen-runtime, pciutils, python-inotify, python-daemon, kernel-qubes-dom0 Requires: python, xen-runtime, pciutils, python-inotify, python-daemon, kernel-qubes-dom0
Conflicts: qubes-gui-dom0 < 1.1.13 Conflicts: qubes-gui-dom0 < 1.1.13
Requires: xen >= 4.1.0-2 Requires: xen >= 4.1.0-2
Requires: xen-hvm
Requires: createrepo Requires: createrepo
Requires: gnome-packagekit Requires: gnome-packagekit
Requires: cronie Requires: cronie