diff options
| author |   Chris Gianelloni <wolf31o2@gentoo.org> | 2006-06-09 13:43:17 +0000 |
|---|---|---|
| committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2006-06-09 13:43:17 +0000 |
| commit | acf66c992d65faa4b2333306f274f3bdc3275f56 (patch) | |
| tree | 220430f67012b1617ff271b25981e3f6787d7549 /generic | |
| parent | Added fix for bug #134843 from Thomas Raschbacher <lordvan@gentoo.org> for ev... (diff) | |
| download | genkernel-acf66c992d65faa4b2333306f274f3bdc3275f56.tar.gz genkernel-acf66c992d65faa4b2333306f274f3bdc3275f56.tar.bz2 genkernel-acf66c992d65faa4b2333306f274f3bdc3275f56.zip | |
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
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/linuxrc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/generic/linuxrc b/generic/linuxrc index 7e2975d..f83d1e0 100644 --- a/generic/linuxrc +++ b/generic/linuxrc @@ -63,6 +63,9 @@ do real_init\=*) REAL_INIT=`parse_opt "${x}"` ;; + init_opts\=*) + INIT_OPTS=`parse_opt "${x}"` + ;; # Livecd options cdroot) CDROOT=1 @@ -687,7 +690,7 @@ then exec chroot . /bin/sh <<- EOF umount /tmp/.initrd || echo "*: Failed to unmount the initrd!" /sbin/blockdev --flushbufs /dev/ram0 >/dev/null 2>&1 - exec /sbin/init ${REAL_INIT} + exec ${REAL_INIT:-/sbin/init} ${INIT_OPTS} EOF elif [ "$0" = '/init' ] then |