summaryrefslogtreecommitdiffstats
path: root/abs/core/mkinitcpio/mkinitcpio.conf.patch
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2011-10-19 18:31:38 (GMT)
committerJames Meyer <james.meyer@operamail.com>2011-10-19 18:31:38 (GMT)
commitd9aad8b00a9f3fb60e456c0e528df90189acb5b3 (patch)
tree6b9126d2336c62d1e5533798e7348f6a5723f6ba /abs/core/mkinitcpio/mkinitcpio.conf.patch
parentd9a08ac22f9c6661cf3b478927be321274d10794 (diff)
parentc65b741914b31ac88086e363edc4415eb6aa1686 (diff)
downloadlinhes_pkgbuild-d9aad8b00a9f3fb60e456c0e528df90189acb5b3.zip
linhes_pkgbuild-d9aad8b00a9f3fb60e456c0e528df90189acb5b3.tar.gz
linhes_pkgbuild-d9aad8b00a9f3fb60e456c0e528df90189acb5b3.tar.bz2
Merge remote-tracking branch 'origin/testing' into testing
Conflicts: abs/core/LinHES-config/PKGBUILD
Diffstat (limited to 'abs/core/mkinitcpio/mkinitcpio.conf.patch')
-rw-r--r--abs/core/mkinitcpio/mkinitcpio.conf.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/abs/core/mkinitcpio/mkinitcpio.conf.patch b/abs/core/mkinitcpio/mkinitcpio.conf.patch
index 41d0ed9..800b347 100644
--- a/abs/core/mkinitcpio/mkinitcpio.conf.patch
+++ b/abs/core/mkinitcpio/mkinitcpio.conf.patch
@@ -14,7 +14,7 @@
## This setup loads an lvm2 volume group on a usb device.
# HOOKS="base udev usb lvm2 filesystems"
-HOOKS="base udev autodetect pata scsi sata filesystems usbinput"
-+HOOKS="base udev usb net autodetect pata scsi sata filesystems usbinput"
++HOOKS="base udev usb net autodetect pata scsi sata filesystems usbinput fbsplash"
# COMPRESSION
# Use this to compress the initramfs image. With kernels earlier than