From 94b8d8871c8dc93af735f9c58f01bf997587fe6c Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 25 May 2011 11:53:47 +0200 Subject: [PATCH] initramfs-tools: add hooks for klibc's resume and module-init-tools. --- .../initramfs-tools/files/hooks/klibc-resume | 23 ++++++++++++++++ .../files/hooks/module-init-tools | 26 +++++++++++++++++++ srcpkgs/initramfs-tools/files/mkinitramfs | 9 ------- srcpkgs/initramfs-tools/template | 2 +- 4 files changed, 50 insertions(+), 10 deletions(-) create mode 100755 srcpkgs/initramfs-tools/files/hooks/klibc-resume create mode 100755 srcpkgs/initramfs-tools/files/hooks/module-init-tools diff --git a/srcpkgs/initramfs-tools/files/hooks/klibc-resume b/srcpkgs/initramfs-tools/files/hooks/klibc-resume new file mode 100755 index 0000000000..7d253f2e1a --- /dev/null +++ b/srcpkgs/initramfs-tools/files/hooks/klibc-resume @@ -0,0 +1,23 @@ +#!/bin/sh + +PREREQ="" + +prereqs() +{ + echo "$PREREQ" +} + +case $1 in +# get pre-requisites +prereqs) + prereqs + exit 0 + ;; +esac + +. /usr/share/initramfs-tools/hook-functions + +# resume from klibc. +copy_exec /bin/resume /bin + +exit 0 diff --git a/srcpkgs/initramfs-tools/files/hooks/module-init-tools b/srcpkgs/initramfs-tools/files/hooks/module-init-tools new file mode 100755 index 0000000000..bb829970f5 --- /dev/null +++ b/srcpkgs/initramfs-tools/files/hooks/module-init-tools @@ -0,0 +1,26 @@ +#!/bin/sh + +PREREQ="" + +prereqs() +{ + echo "$PREREQ" +} + +case $1 in +# get pre-requisites +prereqs) + prereqs + exit 0 + ;; +esac + +. /usr/share/initramfs-tools/hook-functions + +# module-init-tools +copy_exec /sbin/modprobe /sbin +copy_exec /sbin/rmmod /sbin +mkdir -p "${DESTDIR}/etc/modprobe.d" +cp -a /etc/modprobe.d/* "${DESTDIR}/etc/modprobe.d/" + +exit 0 diff --git a/srcpkgs/initramfs-tools/files/mkinitramfs b/srcpkgs/initramfs-tools/files/mkinitramfs index 2d3da59a44..42c9e6d587 100755 --- a/srcpkgs/initramfs-tools/files/mkinitramfs +++ b/srcpkgs/initramfs-tools/files/mkinitramfs @@ -272,15 +272,6 @@ if ! command -v ldd >/dev/null 2>&1 ; then exit 1 fi -# module-init-tools -copy_exec /sbin/modprobe /sbin -copy_exec /sbin/rmmod /sbin -mkdir -p "${DESTDIR}/etc/modprobe.d" -cp -a /etc/modprobe.d/* "${DESTDIR}/etc/modprobe.d/" - -# Copy resume from klibc -copy_exec /bin/resume /bin - run_scripts /usr/share/initramfs-tools/hooks run_scripts "${CONFDIR}"/hooks diff --git a/srcpkgs/initramfs-tools/template b/srcpkgs/initramfs-tools/template index a84ec3fbf4..0b28ee8ce3 100644 --- a/srcpkgs/initramfs-tools/template +++ b/srcpkgs/initramfs-tools/template @@ -1,6 +1,6 @@ # Template file for 'initramfs-tools' pkgname=initramfs-tools -_localver=0.99.13 # This is the XBPS version +_localver=0.99.15 # This is the XBPS version _distver=0.98.8 # This should match debian version version=${_localver}.${_distver} build_style=custom-install