Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 88281
Collapse All | Expand All

(-)genkernel-3.1.6.orig/generic/linuxrc (-9 / +9 lines)
Lines 472-478 Link Here
472
472
473
if /tmp/.initrd/bin/[ "${USE_DEVFS_NORMAL}" -eq '1' -a "${CDROOT}" -eq '0' ]
473
if /tmp/.initrd/bin/[ "${USE_DEVFS_NORMAL}" -eq '1' -a "${CDROOT}" -eq '0' ]
474
then
474
then
475
	umount /tmp/.initrd/proc || echo '*: Failed to unmount the initrd /proc!'
475
	umount -n /tmp/.initrd/proc || echo '*: Failed to unmount the initrd /proc!'
476
	mount -n --move /tmp/.initrd/dev dev || echo '*: Failed to move over the /dev tree!'
476
	mount -n --move /tmp/.initrd/dev dev || echo '*: Failed to move over the /dev tree!'
477
	rm -rf /tmp/.initrd/dev || echo '*: Failed to remove the initrd /dev!'
477
	rm -rf /tmp/.initrd/dev || echo '*: Failed to remove the initrd /dev!'
478
elif /tmp/.initrd/bin/[ "${USE_UDEV_NORMAL}" -eq '1' ]
478
elif /tmp/.initrd/bin/[ "${USE_UDEV_NORMAL}" -eq '1' ]
Lines 482-499 Link Here
482
	/tmp/.initrd/bin/[ -e /tmp/.initrd/dev/stdout ] && rm /tmp/.initrd/dev/stdout
482
	/tmp/.initrd/bin/[ -e /tmp/.initrd/dev/stdout ] && rm /tmp/.initrd/dev/stdout
483
	/tmp/.initrd/bin/[ -e /tmp/.initrd/dev/stderr ] && rm /tmp/.initrd/dev/stderr
483
	/tmp/.initrd/bin/[ -e /tmp/.initrd/dev/stderr ] && rm /tmp/.initrd/dev/stderr
484
	/tmp/.initrd/bin/[ -e /tmp/.initrd/dev/core ] && rm /tmp/.initrd/dev/core 
484
	/tmp/.initrd/bin/[ -e /tmp/.initrd/dev/core ] && rm /tmp/.initrd/dev/core 
485
	umount /tmp/.initrd/dev || echo '*: Failed to unmount the initrd /dev!'
485
	umount -n /tmp/.initrd/dev || echo '*: Failed to unmount the initrd /dev!'
486
	umount /tmp/.initrd/proc || echo '*: Failed to unmount the initrd /proc!'
486
	umount -n /tmp/.initrd/proc || echo '*: Failed to unmount the initrd /proc!'
487
	umount /tmp/.initrd/sys || echo '*: Failed to unmount the initrd /sys!'
487
	umount -n /tmp/.initrd/sys || echo '*: Failed to unmount the initrd /sys!'
488
elif /tmp/.initrd/bin/[ "${CDROOT}" -eq '1' ]
488
elif /tmp/.initrd/bin/[ "${CDROOT}" -eq '1' ]
489
then
489
then
490
	umount /tmp/.initrd/proc || echo "*: Failed to unmount the initrd /proc!"
490
	umount -n /tmp/.initrd/proc || echo "*: Failed to unmount the initrd /proc!"
491
	umount /dev 2>/dev/null
491
	umount -n /dev 2>/dev/null
492
	mount -n --move /tmp/.initrd/dev dev 2>/dev/null
492
	mount -n --move /tmp/.initrd/dev dev 2>/dev/null
493
	rm -rf /tmp/.initrd/dev || echo '*: Failed to remove the initrd /dev!'
493
	rm -rf /tmp/.initrd/dev || echo '*: Failed to remove the initrd /dev!'
494
494
495
	umount /sys 2>/dev/null
495
	umount -n /sys 2>/dev/null
496
	umount /tmp/.initrd/sys 2>/dev/null
496
	umount -n /tmp/.initrd/sys 2>/dev/null
497
fi
497
fi
498
echo -n '.'
498
echo -n '.'
499
499
Lines 504-510 Link Here
504
exec <dev/console >dev/console 2>&1
504
exec <dev/console >dev/console 2>&1
505
echo '.'
505
echo '.'
506
exec chroot . /bin/sh <<- EOF
506
exec chroot . /bin/sh <<- EOF
507
	umount /tmp/.initrd || echo "*: Failed to unmount the initrd!"
507
	umount -n /tmp/.initrd || echo "*: Failed to unmount the initrd!"
508
	/sbin/blockdev --flushbufs /dev/ram0 >/dev/null 2>&1
508
	/sbin/blockdev --flushbufs /dev/ram0 >/dev/null 2>&1
509
	exec /sbin/init ${REAL_INIT}
509
	exec /sbin/init ${REAL_INIT}
510
EOF
510
EOF

Return to bug 88281