commit: 32c8ee223bbd86311611e65f4ff9487c40771b5d
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 21 14:30:11 2019 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Aug 21 14:30:11 2019 +0000
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=32c8ee22
initrd.scripts: preserve_log(): Stop determining mountpoint when reached "/"
In commit 271c330 we stopped determining mountpoint already when we were
testing for $CHROOT value. However, $CHROOT is the mountpoint we are looking
for when no additional volumes were mounted.
This sanity check should only get triggered when we reached "/" while looping
through path for logfile.
Fixes 271c330 ("initrd.scripts: preserve_log(): Add support for additional
mountpoints")
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
defaults/initrd.scripts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 2c57ff4..48a2d3d 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1087,7 +1087,7 @@ preserve_log() {
fi
logfile_mountpoint="$(dirname "${logfile_mountpoint}")"
- if [ "${logfile_mountpoint}" = "${CHROOT}" ]
+ if [ "${logfile_mountpoint}" = "/" ]
then
# Stop here
bad_msg "${fail_msg}: Failed to determine mountpoint
for '${logfile_target}'!"
