Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 396467 | Differences between
and this patch

Collapse All | Expand All

(-)a/defaults/initrd.defaults (+5 lines)
Lines 70-75 CDROOT_PATH='/mnt/cdrom' Link Here
70
CDROOT_MARKER='/livecd'
70
CDROOT_MARKER='/livecd'
71
VERIFY=0
71
VERIFY=0
72
72
73
# Flag for if ok when using CDROOT
74
got_good_root='0'
75
# if LOOP found on root before mount, trigger Unpacking additional packages
76
got_loop_wo_mount='0'
77
73
# AUFS variables
78
# AUFS variables
74
aufs=0
79
aufs=0
75
aufs_union_file=/livecd.aufs
80
aufs_union_file=/livecd.aufs
(-)a/defaults/linuxrc (-7 / +15 lines)
Lines 431-436 then Link Here
431
	startiscsi
431
	startiscsi
432
fi
432
fi
433
433
434
# Loop file already exists on fs, assume no mount needed,
435
# This allows for squashfs in initrd, which can be used for (i)PXE booting
436
if [ -e "${LOOP}" ]
437
then
438
	got_good_root=1
439
	got_loop_wo_mount=1
440
	CDROOT_PATH=$(dirname "${LOOP}")
441
fi
442
434
# Apply scan delay if specified
443
# Apply scan delay if specified
435
sdelay
444
sdelay
436
445
Lines 497-512 then Link Here
497
	if [ 1 = "$aufs" ]; then
506
	if [ 1 = "$aufs" ]; then
498
                setup_aufs
507
                setup_aufs
499
		CHROOT=$aufs_union
508
		CHROOT=$aufs_union
500
        elif [ 1 = "$overlayfs" ]; then
509
        elif [ 1 = "$overlayfs" ] && [ "${got_good_root}" != '1' ]; then
501
                bootstrapCD
510
                bootstrapCD
502
		CHROOT=${NEW_ROOT}
511
		CHROOT=${NEW_ROOT}
503
	fi
512
	fi
504
513
505
	if [ /dev/nfs != "$REAL_ROOT" ] && [ sgimips != "$LOOPTYPE" ] && [ 1 != "$aufs" ] && [ 1 != "$overlayfs" ]; then
514
	if [ "${got_good_root}" != '1' ] && [ /dev/nfs != "$REAL_ROOT" ] && [ sgimips != "$LOOPTYPE" ] && [ 1 != "$aufs" ] && [ 1 != "$overlayfs" ]; then
506
		bootstrapCD
515
		bootstrapCD
507
	fi
516
	fi
508
517
509
	if [ "${REAL_ROOT}" = '' ]
518
	if [ "${REAL_ROOT}" = '' ] && [ "${got_good_root}" != '1' ]
510
	then
519
	then
511
		warn_msg "No bootable medium found. Waiting for new devices..."
520
		warn_msg "No bootable medium found. Waiting for new devices..."
512
		COUNTER=0
521
		COUNTER=0
Lines 518-524 then Link Here
518
		bootstrapCD
527
		bootstrapCD
519
	fi
528
	fi
520
529
521
	if [ "${REAL_ROOT}" = '' ]
530
	if [ "${REAL_ROOT}" = '' ] && [ "${got_good_root}" != '1' ]
522
	then
531
	then
523
		# Undo stuff
532
		# Undo stuff
524
		umount  "${NEW_ROOT}/dev" 2>/dev/null
533
		umount  "${NEW_ROOT}/dev" 2>/dev/null
Lines 865-874 FSTAB Link Here
865
                fi
874
                fi
866
	fi
875
	fi
867
876
868
	# Unpacking additional packages from NFS mount
877
	# Unpacking additional packages from NFS mount, or root (if squashfs was found there)
869
	# This is useful for adding kernel modules to /lib
878
	# This is useful for adding kernel modules to /lib
870
	# We do this now, so that additional packages can add whereever they want.
879
	# We do this now, so that additional packages can add whereever they want.
871
	if [ "${REAL_ROOT}" = '/dev/nfs' ]
880
	if [ "${REAL_ROOT}" = '/dev/nfs' ] || [ "${got_loop_wo_mount}" == '1' ]
872
	then
881
	then
873
		if [ -e "${CDROOT_PATH}/add" ]
882
		if [ -e "${CDROOT_PATH}/add" ]
874
		then
883
		then
875
- 

Return to bug 396467