~ubuntu-branches/ubuntu/maverick/debian-installer-utils/maverick

« back to all changes in this revision

Viewing changes to list-devices

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2010-08-20 01:54:38 UTC
  • mfrom: (1.2.6 sid)
  • Revision ID: james.westby@ubuntu.com-20100820015438-lhrz96qs9ddneh9p
Tags: 1.77ubuntu1
* Resynchronise with Debian.  Remaining changes:
  - user-params: Don't propagate vga=*, break=*, *-ubiquity, or
    noninteractive to installed system.
  - Use /proc/self/fd/4 rather than /dev/fd/4 in fetch-url-methods/http;
    the latter doesn't seem to exist in d-i.
  - list-devices: new "mmc-partition" type for detecting partitions on MMC
    devices.
  - Don't include the battery subsystem on calls to udevadm trigger.

Show diffs side-by-side

added added

removed removed

Lines of Context:
136
136
        fi
137
137
        if ! $match && [ "$TYPE" = disk ]; then
138
138
                case $devpath in
139
 
                    /block/cciss\!*|/block/ida\!*|/block/rd\!*|/block/mmcblk*|/block/vd[a-z]*)
 
139
                    /block/cciss\!*|/block/ida\!*|/block/rd\!*|/block/mmcblk*|/block/vd[a-z]*|/block/xvd[a-z]*)
140
140
                        match=:
141
141
                        ;;
142
142
                    /block/dm-*)