diff options
| author |   Dustin Frisch <dustin.frisch@gmail.com> | 2012-10-03 18:20:16 +0200 |
|---|---|---|
| committer |   Sebastian Pipping <sebastian@pipping.org> | 2012-10-03 18:21:09 +0200 |
| commit | d89f3d59e8e0ee31b228d28888b302031838a672 (patch) | |
| tree | 56309490928f6f7e6990af20f2ef731a8d3d71ff | |
| parent | Make e2fsprogs optional (and off by default) (diff) | |
| download | genkernel-d89f3d59e8e0ee31b228d28888b302031838a672.tar.gz genkernel-d89f3d59e8e0ee31b228d28888b302031838a672.tar.bz2 genkernel-d89f3d59e8e0ee31b228d28888b302031838a672.zip | |
Check for file from real_init=FILE rather than /sbin/init (bug #437080)
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | defaults/linuxrc | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -5,6 +5,10 @@ # Distributed under the GPL v2 # $Id$ + 03 Oct 2012; Dustin Frisch <dustin.frisch@gmail.com> defaults/linuxrc: + With boot parameter real_init=/foo look for ${NEW_ROOT}/foo, not + ${NEW_ROOT}/sbin/init (bug #437080) + 23 Sep 2012; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh: Append e2fsck and mke2fs to initramfs. Original patch by Rick Farina diff --git a/defaults/linuxrc b/defaults/linuxrc index 4a12c21..d6766b8 100755 --- a/defaults/linuxrc +++ b/defaults/linuxrc @@ -623,7 +623,7 @@ do # else not a good root and start over. if [ "$?" = '0' ] then - if [ -d ${NEW_ROOT}/dev -a -x ${NEW_ROOT}/sbin/init ] || [ "${REAL_ROOT}" = "/dev/nfs" ] + if [ -d ${NEW_ROOT}/dev -a -x "${NEW_ROOT}${REAL_INIT:-/sbin/init}" ] || [ "${REAL_ROOT}" = "/dev/nfs" ] then break else |