Attachment 1887 Details for Bug 11374 – mkinitrd-3.0.3-nfs.patch

[patch] mkinitrd-3.0.3-nfs.patch

mkinitrd-3.0.3-nfs.patch (text/plain), 1.14 KB, created by led on 2007-04-05 18:05:46 MSD

(hide)

Description:

Filename:

MIME Type:

Creator: led

Created: 2007-04-05 18:05:46 MSD

Size: 1.14 KB

patch

obsolete

>diff -urN mkinitrd-3.0.3.orig/mkinitrd mkinitrd-3.0.3/mkinitrd
>--- mkinitrd-3.0.3.orig/mkinitrd	2007-03-29 19:51:08 +0300
>+++ mkinitrd-3.0.3/mkinitrd	2007-04-02 22:19:07 +0300
>@@ -1244,6 +1244,7 @@
> 		Fatal "Failed to create directories."
> 
> 	if [ "$IMAGE_TYPE" = initramfs ]; then
>+		Mkdir "$MNTDIR/tmp"
> 		Cp -aL /lib/mkinitrd/initramfs-base/* "$MNTDIR/"
> 		Cp -aL /lib/mkinitrd/klibc/* "$MNTDIR/"
> 		Cp -aL /lib/mkinitrd/module-init-tools/* "$MNTDIR/"
>diff -urN mkinitrd-3.0.3.orig/scripts/nfs mkinitrd-3.0.3/scripts/nfs
>--- mkinitrd-3.0.3.orig/scripts/nfs	2007-03-29 19:51:08 +0300
>+++ mkinitrd-3.0.3/scripts/nfs	2007-04-02 22:17:03 +0300
>@@ -3,7 +3,7 @@
> # FIXME This needs error checking
> 
> retry_nr=0
>-
>+DEVICE=${DEVICE:-eth0}
> # parse nfs bootargs + launch ipconfig and nfsmount
> do_nfsmount()
> {
>@@ -41,7 +41,10 @@
> 
> 	# get nfs root from dhcp
> 	if [ "x${NFSROOT}" = "xauto" ]; then
>-		NFSROOT=${ROOTSERVER}:${ROOTPATH}
>+		NFSROOT=${ROOTPATH}
>+		if [ "${NFSROOT#*:}" = "$NFSROOT" ]; then
>+			NFSROOT=${ROOTSERVER}:${ROOTPATH}
>+		fi
> 	# nfsroot=[<server-ip>:]<root-dir>[,<nfs-options>]
> 	elif [ -n "${NFSROOT}" ]; then
> 		# nfs options are an optional arg

Actions: View | Diff

Attachments on bug 11374: 1887