diff options
Diffstat (limited to 'source/a/mkinitrd/mkinitrd')
| -rw-r--r-- | source/a/mkinitrd/mkinitrd | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/source/a/mkinitrd/mkinitrd b/source/a/mkinitrd/mkinitrd index fdc269348..96e0e388d 100644 --- a/source/a/mkinitrd/mkinitrd +++ b/source/a/mkinitrd/mkinitrd @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2004 Slackware Linux, Inc., Concord, CA, USA # Copyright 2004 Patrick J. Volkerding, Concord, CA, USA -# Copyright 2007, 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2007, 2008, 2009, 2010, 2011, 2015, 2016 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -50,9 +50,12 @@ MKINITRD_VERSION=1.4.8 # Don't include these things from /lib/udev/ in the initrd image LIBUDEV_BLACKLIST="\ ipod-set-info \ + iphone-set-info \ check-mtp-device \ check-ptp-camera \ - udev-configure-printer" + udev-configure-printer \ + rules.d/60-openobex.rules \ + " print_usage() { cat << EOF @@ -292,7 +295,7 @@ fi # default no-option actions # Parse for the use config file option first or else the other command # line options can not override /etc/mkinitrd.conf. for opt in "$@"; do - if [ $opt = "-F" ]; then + if [ "$opt" = "-F" ]; then if [ -e /etc/mkinitrd.conf ]; then . /etc/mkinitrd.conf || badconf_file else @@ -466,7 +469,7 @@ if [ ! -z "$LUKSKEY" ]; then # Several extra modules are needed to support a vfat formatted USB stick... # assuming here we are using a western codepage. # This possibly adds doublures, but we clean up the MODULE_LIST further down! - MODULE_LIST="${MODULE_LIST}:ehci-hcd:uhci-hcd:usb-storage:hid:usbhid:fat:nls_cp437:nls_iso8859-1:msdos:vfat" + MODULE_LIST="${MODULE_LIST}:xhci-pci:ohci-pci:ehci-pci:xhci-hcd:ohci-hcd:ehci-hcd:uhci-hcd:usb-storage:hid:usbhid:fat:nls_cp437:nls_iso8859-1:msdos:vfat" # Finally, write the lukskey to the initrd-tree: echo $LUKSKEY > $SOURCE_TREE/lukskey |