Attachment #4653 for bug #24526

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

Lines 11-17 handler() { Link Here

(-)a/data/lib/handlers/050-rootdev (-2 / +2 lines)
11	fi	11	fi
12		12
13	message "Mount '$INIT_ROOT' as $rootmnt"	13	message "Mount '$INIT_ROOT' as $rootmnt"
14	ln -s "$INIT_ROOT" /dev/root	14	ln -s "$INIT_ROOT" /dev/initrd-root
15	}	15	}
16		16
17	roflag=-w	17	roflag=-w
Lines 19-25 roflag=-w Link Here
19		19
20	rc=0	20	rc=0
21	for e in "$eventdir"/rootdev/*; do	21	for e in "$eventdir"/rootdev/*; do
22	[ -f "$e" ] && [ ! -e /dev/root ] \|\|	22	[ -f "$e" ] && [ ! -e /dev/initrd-root ] \|\|
23	break	23	break
24		24
25	( . "$e"; handler; ) \|\|	25	( . "$e"; handler; ) \|\|




	nfsmount -o nolock $roflag $NFSOPTS "$NFSROOT" "$rootmnt" ||
		return 0
	message "Mount '$NFSROOT' as $rootmnt"
	ln -s /dev/nfs /dev/initrd-root
}

rc=0
for e in "$eventdir"/nfsroot/*; do
	[ -f "$e" ] && [ ! -e /dev/initrd-root ] ||
		break

	( . "$e"; handler; ) ||
- 

Return to bug 24526

Lines 25-36 handler() { Link Here

(-)a/features/nfsroot/data/lib/handlers/070-nfsroot (-3 / +2 lines)
25	nfsmount -o nolock $roflag $NFSOPTS "$NFSROOT" "$rootmnt" \|\|	25	nfsmount -o nolock $roflag $NFSOPTS "$NFSROOT" "$rootmnt" \|\|
26	return 0	26	return 0
27	message "Mount '$NFSROOT' as $rootmnt"	27	message "Mount '$NFSROOT' as $rootmnt"
28	ln -s /dev/nfs /dev/root	28	ln -s /dev/nfs /dev/initrd-root
29	}	29	}
30		30
31	rc=0	31	rc=0
32	for e in "$eventdir"/nfsroot/*; do	32	for e in "$eventdir"/nfsroot/*; do
33	[ -f "$e" ] && [ ! -e /dev/root ] \|\|	33	[ -f "$e" ] && [ ! -e /dev/initrd-root ] \|\|
34	break	34	break
35		35
36	( . "$e"; handler; ) \|\|	36	( . "$e"; handler; ) \|\|
37	-