View | Details | Raw Unified | Return to bug 11374
Collapse All | Expand All

(-)mkinitrd-3.0.3.orig/mkinitrd (+1 lines)
Lines 1244-1249 Link Here
1244
		Fatal "Failed to create directories."
1244
		Fatal "Failed to create directories."
1245
1245
1246
	if [ "$IMAGE_TYPE" = initramfs ]; then
1246
	if [ "$IMAGE_TYPE" = initramfs ]; then
1247
		Mkdir "$MNTDIR/tmp"
1247
		Cp -aL /lib/mkinitrd/initramfs-base/* "$MNTDIR/"
1248
		Cp -aL /lib/mkinitrd/initramfs-base/* "$MNTDIR/"
1248
		Cp -aL /lib/mkinitrd/klibc/* "$MNTDIR/"
1249
		Cp -aL /lib/mkinitrd/klibc/* "$MNTDIR/"
1249
		Cp -aL /lib/mkinitrd/module-init-tools/* "$MNTDIR/"
1250
		Cp -aL /lib/mkinitrd/module-init-tools/* "$MNTDIR/"
(-)mkinitrd-3.0.3.orig/scripts/nfs (-2 / +5 lines)
Lines 3-9 Link Here
3
# FIXME This needs error checking
3
# FIXME This needs error checking
4
4
5
retry_nr=0
5
retry_nr=0
6
6
DEVICE=${DEVICE:-eth0}
7
# parse nfs bootargs + launch ipconfig and nfsmount
7
# parse nfs bootargs + launch ipconfig and nfsmount
8
do_nfsmount()
8
do_nfsmount()
9
{
9
{
Lines 41-47 Link Here
41
41
42
	# get nfs root from dhcp
42
	# get nfs root from dhcp
43
	if [ "x${NFSROOT}" = "xauto" ]; then
43
	if [ "x${NFSROOT}" = "xauto" ]; then
44
		NFSROOT=${ROOTSERVER}:${ROOTPATH}
44
		NFSROOT=${ROOTPATH}
45
		if [ "${NFSROOT#*:}" = "$NFSROOT" ]; then
46
			NFSROOT=${ROOTSERVER}:${ROOTPATH}
47
		fi
45
	# nfsroot=[<server-ip>:]<root-dir>[,<nfs-options>]
48
	# nfsroot=[<server-ip>:]<root-dir>[,<nfs-options>]
46
	elif [ -n "${NFSROOT}" ]; then
49
	elif [ -n "${NFSROOT}" ]; then
47
		# nfs options are an optional arg
50
		# nfs options are an optional arg

Return to bug 11374