From 51aeb44deb330033ad26ffcb1494136a4d0fd159 Mon Sep 17 00:00:00 2001 From: maximilian attems Date: Sat, 14 Jan 2006 17:40:23 +0100 Subject: fix MODULES=dep due to modprobe --show-depends printing not only insmod commands but also the install ones. --- debian/changelog | 8 ++++++-- hook-functions | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 79b7c9e..6b63420 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,13 @@ initramfs-tools (0.50) unstable; urgency=low - * EVMS takes care of it's own hooks, rm: hooks/evms, scripts/local-top/evms. + * hook-functions: Fix MODULES=dep as `modprobe --show-depends' prints not + only the insmod commands, but also the install ones. Thanks for the patch + to Jean Charles Delepine . (Closes: #342616) + + * hooks/evms, scripts/local-top/evms: EVMS takes care of it's own hooks, rm. Thanks Steinar H. Gunderson . (Closes: 340258) - -- maximilian attems Sat, 14 Jan 2006 17:26:24 +0100 + -- maximilian attems Sat, 14 Jan 2006 17:38:08 +0100 initramfs-tools (0.49) unstable; urgency=low diff --git a/hook-functions b/hook-functions index 9d0bc29..d3fe0a3 100644 --- a/hook-functions +++ b/hook-functions @@ -40,7 +40,7 @@ add_modules_from_file() manual_add_modules() { - for mam_x in $(modprobe --set-version="${version}" --show-depends "${1}" 2>/dev/null | awk '{ print $2 }'); do + for mam_x in $(modprobe --set-version="${version}" --show-depends "${1}" 2>/dev/null | awk '/^insmod/ { print $2 }'); do # Prune duplicates if [ -e "${DESTDIR}/${mam_x}" ]; then continue -- cgit v1.2.3