From bcfb3dc1bd231f91914f917149164d41a2f3ce0a Mon Sep 17 00:00:00 2001 From: James Meyer Date: Fri, 5 Aug 2011 20:13:44 -0500 Subject: mkinitcpio: add usb disk & nfs support. refs #758 refs #763 closes #763 --- abs/core/mkinitcpio/PKGBUILD | 11 +++++++---- abs/core/mkinitcpio/__changelog | 5 +++++ abs/core/mkinitcpio/mkinitcpio.conf.patch | 20 ++++++++++++++++++++ 3 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 abs/core/mkinitcpio/__changelog create mode 100644 abs/core/mkinitcpio/mkinitcpio.conf.patch diff --git a/abs/core/mkinitcpio/PKGBUILD b/abs/core/mkinitcpio/PKGBUILD index c5b823d..01645d0 100644 --- a/abs/core/mkinitcpio/PKGBUILD +++ b/abs/core/mkinitcpio/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 131019 2011-07-09 14:04:52Z thomas $ # Maintainer: Thomas Bächler + pkgname=mkinitcpio pkgver=0.7.2 -pkgrel=1 +pkgrel=5 pkgdesc="Modular initramfs image creation utility" arch=(any) url="http://www.archlinux.org/" @@ -17,11 +17,14 @@ optdepends=('xz: Use lzma or xz compression for the initramfs image' 'mkinitcpio-nfs-utils: Support for root filesystem on NFS') replaces=('mkinitrd' 'mkinitramfs' 'klibc' 'klibc-extras' 'klibc-kbd' 'klibc-module-init-tools' 'klibc-udev') -source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz) +source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz mkinitcpio.conf.patch) backup=(etc/mkinitcpio.conf) -sha256sums=('b7282c78ef3144f5547a4012f334b0beb575b7108a5f6a006289a1e78aa9823d') package() { cd $srcdir/${pkgname}-${pkgver} + patch -p0 < $srcdir/mkinitcpio.conf.patch make DESTDIR="${pkgdir}" install } + +md5sums=('e11670a7d4802b2ef20cab4b3815168a' + 'b697144048288424b2380d044103ec34') diff --git a/abs/core/mkinitcpio/__changelog b/abs/core/mkinitcpio/__changelog new file mode 100644 index 0000000..89a1a22 --- /dev/null +++ b/abs/core/mkinitcpio/__changelog @@ -0,0 +1,5 @@ +added "usb" and net to the modules line in mkinitcpio.conf ++HOOKS="base udev usb net autodetect pata scsi sata filesystems usbinput" + +MODULES="nfs" + diff --git a/abs/core/mkinitcpio/mkinitcpio.conf.patch b/abs/core/mkinitcpio/mkinitcpio.conf.patch new file mode 100644 index 0000000..68ab648 --- /dev/null +++ b/abs/core/mkinitcpio/mkinitcpio.conf.patch @@ -0,0 +1,20 @@ +--- mkinitcpio.conf.orig 2011-08-06 00:04:15.991131194 +0000 ++++ mkinitcpio.conf 2011-08-06 00:04:02.791130644 +0000 +@@ -4,7 +4,7 @@ + # run. Advanced users may wish to specify all system modules + # in this array. For instance: + # MODULES="piix ide_disk reiserfs" +-MODULES="" ++MODULES="nfs" + + # BINARIES + # This setting includes any additional binaries a given user may +@@ -54,7 +54,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 " + + # COMPRESSION + # Use this to compress the initramfs image. With kernels earlier than -- cgit v0.12