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