1 |
commit: 51dcb157423d660f652e44a795cfb9a51724ad1e |
2 |
Author: Sebastian Pipping <sebastian <AT> pipping <DOT> org> |
3 |
AuthorDate: Mon Jul 9 17:47:21 2012 +0000 |
4 |
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jul 9 17:50:26 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=51dcb157 |
7 |
|
8 |
Restore previous handling of real_root due to report of regressions (bug #419965) |
9 |
|
10 |
This reverts commit f95264added35c25fb557931116edd3cd0aec7ba. |
11 |
|
12 |
Conflicts: |
13 |
defaults/initrd.scripts |
14 |
|
15 |
--- |
16 |
ChangeLog | 4 ++++ |
17 |
defaults/initrd.scripts | 5 +---- |
18 |
2 files changed, 5 insertions(+), 4 deletions(-) |
19 |
|
20 |
diff --git a/ChangeLog b/ChangeLog |
21 |
index 42b6f7c..21e7fdb 100644 |
22 |
--- a/ChangeLog |
23 |
+++ b/ChangeLog |
24 |
@@ -5,6 +5,10 @@ |
25 |
# Distributed under the GPL v2 |
26 |
# $Id$ |
27 |
|
28 |
+ 09 Jul 2012; Sebastian Pipping <sping@g.o> defaults/initrd.scripts: |
29 |
+ Restore previous handling of real_root due to report of regressions (bug |
30 |
+ #419965) |
31 |
+ |
32 |
08 Jul 2012; Sebastian Pipping <sping@g.o> genkernel: |
33 |
Bump version to 3.4.37 |
34 |
|
35 |
|
36 |
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts |
37 |
index f05a746..258f2bd 100755 |
38 |
--- a/defaults/initrd.scripts |
39 |
+++ b/defaults/initrd.scripts |
40 |
@@ -751,19 +751,16 @@ openLUKS() { |
41 |
# please use 'tr' and this line, or remove it |
42 |
# eval local TYPE=`uppercase $1` |
43 |
|
44 |
- local LUKS_NAME="$1" |
45 |
- |
46 |
case $1 in |
47 |
root) |
48 |
local TYPE=ROOT |
49 |
- [ -n "${REAL_ROOT}" ] && local LUKS_NAME="`echo "${REAL_ROOT}" | sed -e 's|.*/||'`" |
50 |
;; |
51 |
swap) |
52 |
local TYPE=SWAP |
53 |
;; |
54 |
esac |
55 |
|
56 |
- eval local LUKS_DEVICE='"${CRYPT_'${TYPE}'}"' LUKS_NAME="$LUKS_NAME" LUKS_KEY='"${CRYPT_'${TYPE}'_KEY}"' LUKS_KEYDEV='"${CRYPT_'${TYPE}'_KEYDEV}"' LUKS_TRIM='"${CRYPT_'${TYPE}'_TRIM}"' |
57 |
+ eval local LUKS_DEVICE='"${CRYPT_'${TYPE}'}"' LUKS_NAME="$1" LUKS_KEY='"${CRYPT_'${TYPE}'_KEY}"' LUKS_KEYDEV='"${CRYPT_'${TYPE}'_KEYDEV}"' LUKS_TRIM='"${CRYPT_'${TYPE}'_TRIM}"' |
58 |
local DEV_ERROR=0 KEY_ERROR=0 KEYDEV_ERROR=0 |
59 |
local mntkey="/mnt/key/" cryptsetup_options='' |