Merge lp:~serge-hallyn/ubuntu/natty/qemu-kvm/dont-load-after-package-remove into lp:ubuntu/natty/qemu-kvm

Proposed by Serge Hallyn
Status: Merged
Merged at revision: 104
Proposed branch: lp:~serge-hallyn/ubuntu/natty/qemu-kvm/dont-load-after-package-remove
Merge into: lp:ubuntu/natty/qemu-kvm
Diff against target: 30 lines (+12/-0)
2 files modified
debian/changelog (+8/-0)
debian/qemu-kvm.upstart (+4/-0)
To merge this branch: bzr merge lp:~serge-hallyn/ubuntu/natty/qemu-kvm/dont-load-after-package-remove
Reviewer Review Type Date Requested Status
Dustin Kirkland  Pending
Review via email: mp+41650@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-11-22 16:34:15 +0000
3+++ debian/changelog 2010-11-23 20:13:58 +0000
4@@ -1,3 +1,11 @@
5+qemu-kvm (0.13.0+noroms-0ubuntu8) natty; urgency=low
6+
7+ * debian/qemu-kvm.upstart: don't load the kernel modules if the package
8+ has been removed but the upstart jobs still exists. (LP: #292588)
9+ (Originally by Felix Geyer <debfx-pkg@fobos.de>)
10+
11+ -- Serge Hallyn <serge.hallyn@ubuntu.com> Tue, 23 Nov 2010 14:07:24 -0600
12+
13 qemu-kvm (0.13.0+noroms-0ubuntu7) natty; urgency=low
14
15 [ Colin Watson ]
16
17=== modified file 'debian/qemu-kvm.upstart'
18--- debian/qemu-kvm.upstart 2010-10-20 15:31:32 +0000
19+++ debian/qemu-kvm.upstart 2010-11-23 20:13:58 +0000
20@@ -6,6 +6,10 @@
21 start on runlevel [2345]
22
23 pre-start script
24+ # Silently exit if the package isn't installed anymore
25+ if [ ! -e /usr/bin/kvm ]; then
26+ exit 0
27+ fi
28 # Load the appropriate module, respecting blacklists
29 if grep -qs "^flags.* vmx" /proc/cpuinfo; then
30 modprobe -b kvm_intel

Subscribers

People subscribed via source and target branches

to all changes: