Added modules for networking support in initramfs.

Removed udevadm settle (just consumes time).
Added NFS modules, too.

diff --git a/src/mkinitramfs/mkinitramfs b/src/mkinitramfs/mkinitramfs
index 6b14fab3c9f195ff5bea6fa2d253c596330b998b..f71d32de16df71e503c0ef13af7957d3a17ff662 100644 (file)
--- 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 5d187330c0b16e563aa6e932862623a41bf580a4..f0863fcbe9aba2f5f1c7d0954c487d06ab9cacb0 100644 (file)
--- 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 "."