Changed real_init to init_opts to be more accurate, and added a proper real_init option to allow the selection of the init executable to run. This is for bug #113426.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@403 67a159dc-881f-0410-a524-ba9dfbe2cb84
cleanup-cruft
Chris Gianelloni 19 years ago
parent c1b29a86b5
commit acf66c992d

@ -63,6 +63,9 @@ do
real_init\=*) real_init\=*)
REAL_INIT=`parse_opt "${x}"` REAL_INIT=`parse_opt "${x}"`
;; ;;
init_opts\=*)
INIT_OPTS=`parse_opt "${x}"`
;;
# Livecd options # Livecd options
cdroot) cdroot)
CDROOT=1 CDROOT=1
@ -687,7 +690,7 @@ then
exec chroot . /bin/sh <<- EOF exec chroot . /bin/sh <<- EOF
umount /tmp/.initrd || echo "*: Failed to unmount the initrd!" umount /tmp/.initrd || echo "*: Failed to unmount the initrd!"
/sbin/blockdev --flushbufs /dev/ram0 >/dev/null 2>&1 /sbin/blockdev --flushbufs /dev/ram0 >/dev/null 2>&1
exec /sbin/init ${REAL_INIT} exec ${REAL_INIT:-/sbin/init} ${INIT_OPTS}
EOF EOF
elif [ "$0" = '/init' ] elif [ "$0" = '/init' ]
then then

Loading…
Cancel
Save