From d2d9795026fc045753ca287f8c65d4c84b085a07 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sun, 15 Feb 2009 00:35:58 +0100 Subject: [PATCH] Added modules for networking support in initramfs. Removed udevadm settle (just consumes time). Added NFS modules, too. --- src/mkinitramfs/mkinitramfs | 3 --- src/mkinitramfs/mkliveramfs | 13 +++++++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/mkinitramfs/mkinitramfs b/src/mkinitramfs/mkinitramfs index 6b14fab3c..f71d32de1 100644 --- a/src/mkinitramfs/mkinitramfs +++ b/src/mkinitramfs/mkinitramfs @@ -76,9 +76,6 @@ udevd --daemon vecho "Creating devices..." udevadm trigger -vecho "Waiting for system to settle..." -udevadm settle --timeout=30 || : - vecho "Mounting root filesystem $rootdev..." mount $rootdev /sysroot $rootfs $rootopts diff --git a/src/mkinitramfs/mkliveramfs b/src/mkinitramfs/mkliveramfs index 5d187330c..f0863fcbe 100644 --- a/src/mkinitramfs/mkliveramfs +++ b/src/mkinitramfs/mkliveramfs @@ -24,11 +24,19 @@ # Modules needed by the live system MODULES="$MODULES aufs squashfs loop vfat ehci-hcd ohci-hcd uhci-hcd usb-storage" +# NFS +MODULES="$MODULES nfs" +for module in /lib/modules/$KERNEL/kernel/drivers/net/{,*/}*; do + MODULES="$MODULES $(basename ${module/.ko})" +done + # Add all storage modules for module in /lib/modules/$KERNEL/kernel/drivers/{ata,message/fusion,pcmcia,scsi{,/*}}/*; do MODULES="$MODULES $(basename ${module/.ko})" done +install dhclient + # Creating folders mkdir -p mnt/{source,tmpfs,overlayfs,squashfs} @@ -132,9 +140,6 @@ udevd --daemon vecho "Creating devices..." udevadm trigger -vecho "Waiting for system to settle..." -udevadm settle --timeout=30 || : - if [ "$SHELL" == "1" ] ; then echo "Shell requested on kernel commandline. Exit to continue booting." echo @@ -142,7 +147,7 @@ if [ "$SHELL" == "1" ] ; then fi # Wait 60 seconds for /dev/root to appear. -COUNTDOWN=60 +COUNTDOWN=90 while [ "x$COUNTDOWN" != "x0" ] ; do is_verbose && echo -n "." -- 2.39.2