diff options
| author | James Meyer <james.meyer@operamail.com> | 2011-10-19 18:31:38 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2011-10-19 18:31:38 (GMT) |
| commit | d9aad8b00a9f3fb60e456c0e528df90189acb5b3 (patch) | |
| tree | 6b9126d2336c62d1e5533798e7348f6a5723f6ba /abs/core/mkinitcpio | |
| parent | d9a08ac22f9c6661cf3b478927be321274d10794 (diff) | |
| parent | c65b741914b31ac88086e363edc4415eb6aa1686 (diff) | |
| download | linhes_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')
| -rw-r--r-- | abs/core/mkinitcpio/PKGBUILD | 4 | ||||
| -rw-r--r-- | abs/core/mkinitcpio/mkinitcpio.conf.patch | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/abs/core/mkinitcpio/PKGBUILD b/abs/core/mkinitcpio/PKGBUILD index 6e4eb3f..0631650 100644 --- a/abs/core/mkinitcpio/PKGBUILD +++ b/abs/core/mkinitcpio/PKGBUILD @@ -3,7 +3,7 @@ pkgname=mkinitcpio pkgver=0.7.2 -pkgrel=10 +pkgrel=11 pkgdesc="Modular initramfs image creation utility" arch=(any) url="http://www.archlinux.org/" @@ -26,4 +26,4 @@ package() { make DESTDIR="${pkgdir}" install } md5sums=('e11670a7d4802b2ef20cab4b3815168a' - '30cbb2840012223f056386d8a3336a2e') + '36da3320c907bf3b41b74fc824cbd1d8') 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 |