[PATCH] Remove modules dependency

[PATCH] Remove modules dependency

[Daniel Drake]

This makes it possible to build a dracut initramfs without modules,
where all needed kernel drivers are built into the kernel image.
---
 dracut                 |    8 +++++---
 modules.d/99base/check |    4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/dracut b/dracut
index f10af83..6bd2374 100755
--- a/dracut
+++ b/dracut
@@ -135,9 +135,11 @@ echo $mods_to_load
 ## final stuff that has to happen
 
 # generate module dependencies for the initrd
-if ! /sbin/depmod -a -b "$initdir" $kernel; then
-    echo "\"/sbin/depmod -a $kernel\" failed."
-    exit 1
+if [ -d "$initdir/lib/modules/$kernel" ]; then
+    if ! /sbin/depmod -a -b "$initdir" $kernel; then
+        echo "\"/sbin/depmod -a $kernel\" failed."
+        exit 1
+    fi
 fi
 
 # make sure that library links are correct and up to date
diff --git a/modules.d/99base/check b/modules.d/99base/check
index 5c3bc51..1128497 100755
--- a/modules.d/99base/check
+++ b/modules.d/99base/check
@@ -1,3 +1,3 @@
 #!/bin/bash
-[[ $1 = -d ]] && echo udev-rules kernel-modules
-exit 0
\ No newline at end of file
+[[ $1 = -d ]] && echo udev-rules
+exit 0
-- 
1.6.2.5

--
To unsubscribe from this list: send the line "unsubscribe initramfs" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] Remove modules dependency

[Harald Hoyer]

[-- Attachment #1: Type: text/plain, Size: 1302 bytes --]

On 07/02/2009 11:06 AM, Daniel Drake wrote:
> This makes it possible to build a dracut initramfs without modules,
> where all needed kernel drivers are built into the kernel image.
> ---
>   dracut                 |    8 +++++---
>   modules.d/99base/check |    4 ++--
>   2 files changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/dracut b/dracut
> index f10af83..6bd2374 100755
> --- a/dracut
> +++ b/dracut
> @@ -135,9 +135,11 @@ echo $mods_to_load
>   ## final stuff that has to happen
>
>   # generate module dependencies for the initrd
> -if ! /sbin/depmod -a -b "$initdir" $kernel; then
> -    echo "\"/sbin/depmod -a $kernel\" failed."
> -    exit 1
> +if [ -d "$initdir/lib/modules/$kernel" ]; then
> +    if ! /sbin/depmod -a -b "$initdir" $kernel; then
> +        echo "\"/sbin/depmod -a $kernel\" failed."
> +        exit 1
> +    fi
>   fi
>
>   # make sure that library links are correct and up to date
> diff --git a/modules.d/99base/check b/modules.d/99base/check
> index 5c3bc51..1128497 100755
> --- a/modules.d/99base/check
> +++ b/modules.d/99base/check
> @@ -1,3 +1,3 @@
>   #!/bin/bash
> -[[ $1 = -d ]]&&  echo udev-rules kernel-modules
> -exit 0
> \ No newline at end of file
> +[[ $1 = -d ]]&&  echo udev-rules
> +exit 0

pushed


[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 3658 bytes --]

Re: [PATCH] Remove modules dependency

[Harald Hoyer]

On 07/02/2009 11:06 AM, Daniel Drake wrote:
> This makes it possible to build a dracut initramfs without modules,
> where all needed kernel drivers are built into the kernel image.
> ---
>   dracut                 |    8 +++++---
>   modules.d/99base/check |    4 ++--
>   2 files changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/dracut b/dracut
> index f10af83..6bd2374 100755
> --- a/dracut
> +++ b/dracut
> @@ -135,9 +135,11 @@ echo $mods_to_load
>   ## final stuff that has to happen
>
>   # generate module dependencies for the initrd
> -if ! /sbin/depmod -a -b "$initdir" $kernel; then
> -    echo "\"/sbin/depmod -a $kernel\" failed."
> -    exit 1
> +if [ -d "$initdir/lib/modules/$kernel" ]; then
> +    if ! /sbin/depmod -a -b "$initdir" $kernel; then
> +        echo "\"/sbin/depmod -a $kernel\" failed."
> +        exit 1
> +    fi
>   fi
>
>   # make sure that library links are correct and up to date
> diff --git a/modules.d/99base/check b/modules.d/99base/check
> index 5c3bc51..1128497 100755
> --- a/modules.d/99base/check
> +++ b/modules.d/99base/check
> @@ -1,3 +1,3 @@
>   #!/bin/bash
> -[[ $1 = -d ]]&&  echo udev-rules kernel-modules
> -exit 0
> \ No newline at end of file
> +[[ $1 = -d ]]&&  echo udev-rules
> +exit 0

pushed
--
To unsubscribe from this list: send the line "unsubscribe initramfs" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html