Merge lp:~ivoks/casper/casper-virtio into lp:ubuntu/oneiric/casper

Proposed by Ante Karamatić on 2011-10-06
Status: Merged
Merged at revision: 961
Proposed branch: lp:~ivoks/casper/casper-virtio
Merge into: lp:ubuntu/oneiric/casper
Diff against target: 27 lines (+8/-1)
2 files modified
debian/changelog (+7/-0)
scripts/casper (+1/-1)
To merge this branch: bzr merge lp:~ivoks/casper/casper-virtio
Reviewer Review Type Date Requested Status
Colin Watson 2011-10-06 Approve on 2011-10-06
Review via email: mp+78414@code.launchpad.net

This proposal supersedes a proposal from 2011-10-06.

Description of the change

At the moment, casper doesn't work with live system located on virtio device. This simple change makes that possible.

To post a comment you must log in.
Colin Watson (cjwatson) wrote : Posted in a previous version of this proposal

Could you please re-propose this for merging into lp:ubuntu/casper
rather than lp:casper, so that we get a useful merge diff? Thanks.

Ante Karamatić (ivoks) wrote : Posted in a previous version of this proposal

Ups. Sorry about that.

Colin Watson (cjwatson) :
review: Approve

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 2011-09-14 06:20:10 +0000
3+++ debian/changelog 2011-10-06 14:04:42 +0000
4@@ -1,3 +1,10 @@
5+casper (1.285) UNRELEASED; urgency=low
6+
7+ * scripts/casper:
8+ - enable use of virtio devices in is_nice_device()
9+
10+ -- Ante Karamatic <ivoks@ubuntu.com> Thu, 06 Oct 2011 05:29:13 -0400
11+
12 casper (1.284) oneiric; urgency=low
13
14 * bin/casper-a11y-enable:
15
16=== modified file 'scripts/casper'
17--- scripts/casper 2011-08-02 17:47:10 +0000
18+++ scripts/casper 2011-10-06 14:04:42 +0000
19@@ -133,7 +133,7 @@
20
21 is_nice_device() {
22 sysfs_path="${1#/sys}"
23- if /lib/udev/path_id "${sysfs_path}" | egrep -q "ID_PATH=(usb|pci-[^-]*-(ide|sas|scsi|usb)|platform-sata_mv|platform-orion-ehci|platform-mmc|platform-mxsdhci)"; then
24+ if /lib/udev/path_id "${sysfs_path}" | egrep -q "ID_PATH=(usb|pci-[^-]*-(ide|sas|scsi|usb|virtio)|platform-sata_mv|platform-orion-ehci|platform-mmc|platform-mxsdhci)"; then
25 return 0
26 fi
27 if echo ${sysfs_path} | grep -q "^/block/dm-"; then

Subscribers

People subscribed via source and target branches