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

« back to all changes in this revision

Viewing changes to register-module

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson, Colin Watson, Evan Dandrea, Loic Minier
  • Date: 2009-04-29 00:46:18 UTC
  • mfrom: (1.1.3 sid)
  • Revision ID: james.westby@ubuntu.com-20090429004618-nsrbei1a48pqbvmu
Tags: 1.67ubuntu1
[ Colin Watson ]
* Resynchronise with Debian. Remaining changes:
  - user-params: Don't propagate vga=* or break=* 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 "usb-partition" type for detecting partitions on USB
    drives.

[ Evan Dandrea ]
* Don't include the battery subsystem on calls to udevadm trigger
  (LP: #331883).

[ Loic Minier ]
* Add support for listing MMC partitions in list-devices; note that many MMC
  devices in e.g. netbooks or screens are actually connected over USB
  though; LP: #364604.

Show diffs side-by-side

added added

removed removed

Lines of Context:
37
37
PARAMFILE=$QUEUE/$MODULE.params
38
38
 
39
39
if [ -d /etc/modprobe.d ] && [ ! -e /etc/modprobe.conf ]; then
40
 
        MODPROBE_OPT=/etc/modprobe.d/local
41
 
        MODPROBE_BL=/etc/modprobe.d/blacklist.local
 
40
        MODPROBE_OPT=/etc/modprobe.d/local.conf
 
41
        MODPROBE_BL=/etc/modprobe.d/blacklist.local.conf
42
42
else
43
43
        MODPROBE_OPT=/etc/modprobe.conf
44
44
        MODPROBE_BL=/etc/modprobe.conf