1 |
aidecoe 12/02/29 18:13:20 |
2 |
|
3 |
Added: dracut-017-usrmount-newroot-etc-check.patch |
4 |
dracut-017-crypt-simplify-rd.luks.uuid-testing.patch |
5 |
dracut-017-convertfs-fix-check-for-usr-bin.patch |
6 |
dracut-017-multipath-udev-rules.patch |
7 |
dracut-017-usrmount-fstab-comments.patch |
8 |
Log: |
9 |
sys-kernel/dracut: Version bump to 017. Rels bug #406023 and bug #405921. |
10 |
|
11 |
Backported patches: |
12 |
- fixes for usrmount (bug #406023) |
13 |
- workaround for broken dm-setup not detecting /dev/dm-* (bug #405921) |
14 |
- fix for convertfs |
15 |
|
16 |
NEWS |
17 |
~~~~ |
18 |
- a _lot_ faster than dracut-016 in image creation |
19 |
- systemd service dracut-shutdown.service |
20 |
- livenet fixes |
21 |
- ssh-client module install fix |
22 |
- root=iscsi:... fixed |
23 |
- lots of restructuring and optimizing in dracut-functions.sh |
24 |
- usrmount: honor fs_passno in /etc/fstab |
25 |
- renamed all shell scripts to .sh |
26 |
- new option "--omit-drivers" and config option "omit_drivers" |
27 |
- hostonly mode fixups |
28 |
|
29 |
(Portage version: 2.1.10.48/cvs/Linux x86_64) |
30 |
|
31 |
Revision Changes Path |
32 |
1.1 sys-kernel/dracut/files/dracut-017-usrmount-newroot-etc-check.patch |
33 |
|
34 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/dracut-017-usrmount-newroot-etc-check.patch?rev=1.1&view=markup |
35 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/dracut-017-usrmount-newroot-etc-check.patch?rev=1.1&content-type=text/plain |
36 |
|
37 |
Index: dracut-017-usrmount-newroot-etc-check.patch |
38 |
=================================================================== |
39 |
From fdcfa200db3d2482ef1f63a4c6d024a556d17337 Mon Sep 17 00:00:00 2001 |
40 |
From: Harald Hoyer <harald@××××××.com> |
41 |
Date: Tue, 28 Feb 2012 16:35:08 +0100 |
42 |
Subject: [PATCH 2/4] 98usrmount/mount-usr.sh: check, if we have |
43 |
$NEWROOT/etc/fstab |
44 |
|
45 |
--- |
46 |
modules.d/98usrmount/mount-usr.sh | 4 +++- |
47 |
1 files changed, 3 insertions(+), 1 deletions(-) |
48 |
|
49 |
diff --git a/modules.d/98usrmount/mount-usr.sh b/modules.d/98usrmount/mount-usr.sh |
50 |
index f9d049e..39f75b9 100755 |
51 |
--- a/modules.d/98usrmount/mount-usr.sh |
52 |
+++ b/modules.d/98usrmount/mount-usr.sh |
53 |
@@ -73,4 +73,6 @@ mount_usr() |
54 |
fi |
55 |
} |
56 |
|
57 |
-mount_usr |
58 |
+if [ -f "$NEWROOT/etc/fstab" ]; then |
59 |
+ mount_usr |
60 |
+fi |
61 |
-- |
62 |
1.7.8.4 |
63 |
|
64 |
|
65 |
|
66 |
|
67 |
1.1 sys-kernel/dracut/files/dracut-017-crypt-simplify-rd.luks.uuid-testing.patch |
68 |
|
69 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/dracut-017-crypt-simplify-rd.luks.uuid-testing.patch?rev=1.1&view=markup |
70 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/dracut-017-crypt-simplify-rd.luks.uuid-testing.patch?rev=1.1&content-type=text/plain |
71 |
|
72 |
Index: dracut-017-crypt-simplify-rd.luks.uuid-testing.patch |
73 |
=================================================================== |
74 |
From a654b70ec172be6de1662011b723ca2ba8afbd64 Mon Sep 17 00:00:00 2001 |
75 |
From: Harald Hoyer <harald@××××××.com> |
76 |
Date: Wed, 29 Feb 2012 16:20:02 +0100 |
77 |
Subject: [PATCH 4/4] 90crypt/parse-crypt.sh: simplify rd.luks.uuid testing |
78 |
|
79 |
--- |
80 |
modules.d/90crypt/parse-crypt.sh | 15 ++------------- |
81 |
1 files changed, 2 insertions(+), 13 deletions(-) |
82 |
|
83 |
diff --git a/modules.d/90crypt/parse-crypt.sh b/modules.d/90crypt/parse-crypt.sh |
84 |
index 2ab3a9f..f96b59a 100755 |
85 |
--- a/modules.d/90crypt/parse-crypt.sh |
86 |
+++ b/modules.d/90crypt/parse-crypt.sh |
87 |
@@ -24,21 +24,10 @@ else |
88 |
printf -- '$env{DEVNAME} luks-$env{ID_FS_UUID} %s"\n' $tout |
89 |
} >> /etc/udev/rules.d/70-luks.rules.new |
90 |
|
91 |
- |
92 |
- [ -e $hookdir/initqueue/finished/90-crypt.sh ] || \ |
93 |
- { |
94 |
- printf -- 'UUIDS=:\n' |
95 |
- printf -- 'for dm in /dev/dm-*; do\n' |
96 |
- printf -- '[ -e "$dm" ] || exit 1\n' |
97 |
- printf -- 'dmid=`/sbin/dmsetup info -c -o uuid --noheadings "$dm"`\n' |
98 |
- printf -- 'uuid=${dmid#CRYPT-LUKS*-}\n' |
99 |
- printf -- '[ "x$uuid" = "x$dmid" ] && continue\n' |
100 |
- printf -- 'UUIDS="${UUIDS}${uuid%%%%-*}:"\n' |
101 |
- printf -- 'done\n' |
102 |
- } > $hookdir/initqueue/finished/90-crypt.sh |
103 |
uuid=$luksid |
104 |
while [ "$uuid" != "${uuid#*-}" ]; do uuid=${uuid%%-*}${uuid#*-}; done |
105 |
- printf -- '[ "x${UUIDS#*:%s*:}" != "x$UUIDS" ] || exit 1\n' $uuid >> $hookdir/initqueue/finished/90-crypt.sh |
106 |
+ printf -- '[ -e /dev/disk/by-id/dm-uuid-CRYPT-LUKS?-*%s*-* ] || exit 1\n' $uuid \ |
107 |
+ >> $hookdir/initqueue/finished/90-crypt.sh |
108 |
|
109 |
{ |
110 |
printf -- '[ -e /dev/disk/by-uuid/*%s* ] || ' $luksid |
111 |
-- |
112 |
1.7.8.4 |
113 |
|
114 |
|
115 |
|
116 |
|
117 |
1.1 sys-kernel/dracut/files/dracut-017-convertfs-fix-check-for-usr-bin.patch |
118 |
|
119 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/dracut-017-convertfs-fix-check-for-usr-bin.patch?rev=1.1&view=markup |
120 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/dracut-017-convertfs-fix-check-for-usr-bin.patch?rev=1.1&content-type=text/plain |
121 |
|
122 |
Index: dracut-017-convertfs-fix-check-for-usr-bin.patch |
123 |
=================================================================== |
124 |
From b6aaac5020cd2e4ee8aaff300ed1a2dbf7bcd6b4 Mon Sep 17 00:00:00 2001 |
125 |
From: Harald Hoyer <harald@××××××.com> |
126 |
Date: Wed, 29 Feb 2012 13:21:51 +0100 |
127 |
Subject: [PATCH 3/4] 30convertfs/convertfs.sh: correct check for /usr/bin |
128 |
|
129 |
--- |
130 |
modules.d/30convertfs/convertfs.sh | 17 ++++++++++------- |
131 |
1 files changed, 10 insertions(+), 7 deletions(-) |
132 |
|
133 |
diff --git a/modules.d/30convertfs/convertfs.sh b/modules.d/30convertfs/convertfs.sh |
134 |
index 69c3b3e..aa2c8b1 100755 |
135 |
--- a/modules.d/30convertfs/convertfs.sh |
136 |
+++ b/modules.d/30convertfs/convertfs.sh |
137 |
@@ -21,13 +21,13 @@ while [[ "$ROOT" != "${ROOT%/}" ]]; do |
138 |
ROOT=${ROOT%/} |
139 |
done |
140 |
|
141 |
-if [ ! -L $ROOT/var/run ]; then |
142 |
+if [ ! -L $ROOT/var/run -a -e $ROOT/var/run ]; then |
143 |
echo "Converting /var/run to symlink" |
144 |
mv -f $ROOT/var/run $ROOT/var/run.runmove~ |
145 |
ln -sfn ../run $ROOT/var/run |
146 |
fi |
147 |
|
148 |
-if [ ! -L $ROOT/var/lock ]; then |
149 |
+if [ ! -L $ROOT/var/lock -a -e $ROOT/var/lock ]; then |
150 |
echo "Converting /var/lock to symlink" |
151 |
mv -f $ROOT/var/lock $ROOT/var/lock.lockmove~ |
152 |
ln -sfn ../run/lock $ROOT/var/lock |
153 |
@@ -42,16 +42,19 @@ needconvert() { |
154 |
return 1 |
155 |
} |
156 |
|
157 |
+if ! [ -e "$ROOT/usr/bin" ]; then |
158 |
+ echo "$ROOT/usr/bin does not exist!" |
159 |
+ echo "Make sure, the kernel command line has enough information" |
160 |
+ echo "to mount /usr (man dracut.cmdline)" |
161 |
+ exit 1 |
162 |
+fi |
163 |
+ |
164 |
+ |
165 |
if ! needconvert; then |
166 |
echo "Your system is already converted." |
167 |
exit 0 |
168 |
fi |
169 |
|
170 |
-if [ -e "$ROOT/usr/bin" ]; then |
171 |
- echo "$ROOT/usr/bin does not exist" |
172 |
- exit 1 |
173 |
-fi |
174 |
- |
175 |
testfile="$ROOT/.usrmovecheck$$" |
176 |
rm -f "$testfile" |
177 |
> "$testfile" |
178 |
-- |
179 |
1.7.8.4 |
180 |
|
181 |
|
182 |
|
183 |
|
184 |
1.1 sys-kernel/dracut/files/dracut-017-multipath-udev-rules.patch |
185 |
|
186 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/dracut-017-multipath-udev-rules.patch?rev=1.1&view=markup |
187 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/dracut-017-multipath-udev-rules.patch?rev=1.1&content-type=text/plain |
188 |
|
189 |
Index: dracut-017-multipath-udev-rules.patch |
190 |
=================================================================== |
191 |
From 7f3e0c13f1c10e93c3823b6367f9ac83865f3d90 Mon Sep 17 00:00:00 2001 |
192 |
From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@×××××××.name> |
193 |
Date: Fri, 25 Feb 2011 01:44:25 +0100 |
194 |
Subject: [PATCH] 90multipath: added kpartx.rules; multipath.rules - different prefix |
195 |
|
196 |
--- |
197 |
modules.d/90multipath/module-setup.sh | 2 +- |
198 |
1 files changed, 1 insertions(+), 1 deletions(-) |
199 |
|
200 |
diff --git a/modules.d/90multipath/module-setup.sh b/modules.d/90multipath/module-setup.sh |
201 |
index f78517c..3f4f612 100755 |
202 |
--- a/modules.d/90multipath/module-setup.sh |
203 |
+++ b/modules.d/90multipath/module-setup.sh |
204 |
@@ -58,6 +58,6 @@ install() { |
205 |
|
206 |
inst_hook pre-trigger 02 "$moddir/multipathd.sh" |
207 |
inst_hook pre-pivot 02 "$moddir/multipathd-stop.sh" |
208 |
- inst_rules 40-multipath.rules |
209 |
+ inst_rules 40-multipath.rules 65-multipath.rules 66-kpartx.rules |
210 |
} |
211 |
|
212 |
-- |
213 |
1.7.4.1 |
214 |
|
215 |
|
216 |
|
217 |
|
218 |
1.1 sys-kernel/dracut/files/dracut-017-usrmount-fstab-comments.patch |
219 |
|
220 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/dracut-017-usrmount-fstab-comments.patch?rev=1.1&view=markup |
221 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/dracut-017-usrmount-fstab-comments.patch?rev=1.1&content-type=text/plain |
222 |
|
223 |
Index: dracut-017-usrmount-fstab-comments.patch |
224 |
=================================================================== |
225 |
From cc74a06f4cf602f198092284d196fc4507bd806c Mon Sep 17 00:00:00 2001 |
226 |
From: Harald Hoyer <harald@××××××.com> |
227 |
Date: Tue, 28 Feb 2012 12:54:01 +0100 |
228 |
Subject: [PATCH 1/4] 98usrmount/mount-usr.sh: ignore comments in fstab |
229 |
|
230 |
--- |
231 |
modules.d/98usrmount/mount-usr.sh | 1 + |
232 |
1 files changed, 1 insertions(+), 0 deletions(-) |
233 |
|
234 |
diff --git a/modules.d/98usrmount/mount-usr.sh b/modules.d/98usrmount/mount-usr.sh |
235 |
index 3e23b15..f9d049e 100755 |
236 |
--- a/modules.d/98usrmount/mount-usr.sh |
237 |
+++ b/modules.d/98usrmount/mount-usr.sh |
238 |
@@ -39,6 +39,7 @@ mount_usr() |
239 |
local _dev _mp _fs _opts _rest _usr_found _ret _freq _passno |
240 |
# check, if we have to mount the /usr filesystem |
241 |
while read _dev _mp _fs _opts _freq _passno; do |
242 |
+ [ "${_dev%%#*}" != "$_dev" ] && continue |
243 |
if [ "$_mp" = "/usr" ]; then |
244 |
case "$_dev" in |
245 |
LABEL=*) |
246 |
-- |
247 |
1.7.8.4 |