Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Amadeusz Zolnowski (aidecoe)" <aidecoe@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-kernel/dracut/files: 024-0001-Fallback-to-external-blkid-and-path_id.patch 023-0003-Fallback-to-external-blkid-and-path_id.patch
Date: Thu, 01 Nov 2012 19:31:06
Message-Id: 20121101193047.7615521600@flycatcher.gentoo.org
1 aidecoe 12/11/01 19:30:47
2
3 Modified:
4 024-0001-Fallback-to-external-blkid-and-path_id.patch
5 023-0003-Fallback-to-external-blkid-and-path_id.patch
6 Log:
7 Added missing epatch and improved patches a bit btw.
8
9 (Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key E1DBFAB5)
10
11 Revision Changes Path
12 1.2 sys-kernel/dracut/files/024-0001-Fallback-to-external-blkid-and-path_id.patch
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/024-0001-Fallback-to-external-blkid-and-path_id.patch?rev=1.2&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/024-0001-Fallback-to-external-blkid-and-path_id.patch?rev=1.2&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/024-0001-Fallback-to-external-blkid-and-path_id.patch?r1=1.1&r2=1.2
17
18 Index: 024-0001-Fallback-to-external-blkid-and-path_id.patch
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/sys-kernel/dracut/files/024-0001-Fallback-to-external-blkid-and-path_id.patch,v
21 retrieving revision 1.1
22 retrieving revision 1.2
23 diff -u -r1.1 -r1.2
24 --- 024-0001-Fallback-to-external-blkid-and-path_id.patch 1 Nov 2012 09:54:08 -0000 1.1
25 +++ 024-0001-Fallback-to-external-blkid-and-path_id.patch 1 Nov 2012 19:30:47 -0000 1.2
26 @@ -1,4 +1,4 @@
27 -From 226fb690900d869c0f8542ea5983c1c4ec3ac9db Mon Sep 17 00:00:00 2001
28 +From 2a0b056b156c471a8cf5cbac918f9bfc30f86e06 Mon Sep 17 00:00:00 2001
29 From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@×××××××.name>
30 Date: Thu, 1 Nov 2012 09:31:01 +0100
31 Subject: [PATCH] Fallback to external blkid and path_id in udev rules for
32 @@ -15,10 +15,9 @@
33 modules.d/95udev-rules/59-persistent-storage.rules | 8 +++----
34 modules.d/95udev-rules/61-persistent-storage.rules | 2 +-
35 modules.d/95udev-rules/module-setup.sh | 2 ++
36 - modules.d/95udev-rules/udev-rules-prepare.sh | 25 ++++++++++++++++++++++
37 - modules.d/99base/init.sh | 2 +-
38 - 5 files changed, 33 insertions(+), 6 deletions(-)
39 - create mode 100644 modules.d/95udev-rules/udev-rules-prepare.sh
40 + modules.d/95udev-rules/udev-rules-prepare.sh | 27 ++++++++++++++++++++++
41 + 4 files changed, 34 insertions(+), 5 deletions(-)
42 + create mode 100755 modules.d/95udev-rules/udev-rules-prepare.sh
43
44 diff --git a/modules.d/95udev-rules/59-persistent-storage.rules b/modules.d/95udev-rules/59-persistent-storage.rules
45 index f2756ee..c221cda 100644
46 @@ -79,15 +78,17 @@
47 }
48
49 diff --git a/modules.d/95udev-rules/udev-rules-prepare.sh b/modules.d/95udev-rules/udev-rules-prepare.sh
50 -new file mode 100644
51 -index 0000000..08263ea
52 +new file mode 100755
53 +index 0000000..a340e38
54 --- /dev/null
55 +++ b/modules.d/95udev-rules/udev-rules-prepare.sh
56 -@@ -0,0 +1,25 @@
57 +@@ -0,0 +1,27 @@
58 +#!/bin/sh
59 +# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
60 +# ex: ts=8 sw=4 sts=4 et filetype=sh
61 +
62 ++[ -z "$UDEVVERSION" ] && UDEVVERSION=$(udevadm --version)
63 ++
64 +for f in /etc/udev/rules.d/*-persistent-storage.rules; do
65 + [ -e "$f" ] || continue
66 + while read line; do
67 @@ -109,19 +110,6 @@
68 + done < "${f}" > "${f}.new"
69 + mv "${f}.new" "$f"
70 +done
71 -diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh
72 -index 16c8958..0259053 100755
73 ---- a/modules.d/99base/init.sh
74 -+++ b/modules.d/99base/init.sh
75 -@@ -83,7 +83,7 @@ trap "emergency_shell Signal caught!" 0
76 -
77 - [ -d /run/initramfs ] || mkdir -p -m 0755 /run/initramfs
78 -
79 --UDEVVERSION=$(udevadm --version)
80 -+export UDEVVERSION=$(udevadm --version)
81 - if [ $UDEVVERSION -gt 166 ]; then
82 - # newer versions of udev use /run/udev/rules.d
83 - export UDEVRULESD=/run/udev/rules.d
84 --
85 1.7.12.4
86
87
88
89
90 1.2 sys-kernel/dracut/files/023-0003-Fallback-to-external-blkid-and-path_id.patch
91
92 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/023-0003-Fallback-to-external-blkid-and-path_id.patch?rev=1.2&view=markup
93 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/023-0003-Fallback-to-external-blkid-and-path_id.patch?rev=1.2&content-type=text/plain
94 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/023-0003-Fallback-to-external-blkid-and-path_id.patch?r1=1.1&r2=1.2
95
96 Index: 023-0003-Fallback-to-external-blkid-and-path_id.patch
97 ===================================================================
98 RCS file: /var/cvsroot/gentoo-x86/sys-kernel/dracut/files/023-0003-Fallback-to-external-blkid-and-path_id.patch,v
99 retrieving revision 1.1
100 retrieving revision 1.2
101 diff -u -r1.1 -r1.2
102 --- 023-0003-Fallback-to-external-blkid-and-path_id.patch 1 Nov 2012 09:54:08 -0000 1.1
103 +++ 023-0003-Fallback-to-external-blkid-and-path_id.patch 1 Nov 2012 19:30:47 -0000 1.2
104 @@ -1,4 +1,4 @@
105 -From e185a1b4fd7e931beb995b124fd3688031e50863 Mon Sep 17 00:00:00 2001
106 +From ee71a87472029c1838d0c834e9610ee578cb6d7f Mon Sep 17 00:00:00 2001
107 From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@×××××××.name>
108 Date: Thu, 1 Nov 2012 09:31:01 +0100
109 Subject: [PATCH 3/3] Fallback to external blkid and path_id in udev rules for
110 @@ -15,10 +15,9 @@
111 modules.d/95udev-rules/59-persistent-storage.rules | 8 +++----
112 modules.d/95udev-rules/61-persistent-storage.rules | 2 +-
113 modules.d/95udev-rules/module-setup.sh | 2 ++
114 - modules.d/95udev-rules/udev-rules-prepare.sh | 25 ++++++++++++++++++++++
115 - modules.d/99base/init.sh | 2 +-
116 - 5 files changed, 33 insertions(+), 6 deletions(-)
117 - create mode 100644 modules.d/95udev-rules/udev-rules-prepare.sh
118 + modules.d/95udev-rules/udev-rules-prepare.sh | 27 ++++++++++++++++++++++
119 + 4 files changed, 34 insertions(+), 5 deletions(-)
120 + create mode 100755 modules.d/95udev-rules/udev-rules-prepare.sh
121
122 diff --git a/modules.d/95udev-rules/59-persistent-storage.rules b/modules.d/95udev-rules/59-persistent-storage.rules
123 index f2756ee..c221cda 100644
124 @@ -79,15 +78,17 @@
125 }
126
127 diff --git a/modules.d/95udev-rules/udev-rules-prepare.sh b/modules.d/95udev-rules/udev-rules-prepare.sh
128 -new file mode 100644
129 -index 0000000..08263ea
130 +new file mode 100755
131 +index 0000000..a340e38
132 --- /dev/null
133 +++ b/modules.d/95udev-rules/udev-rules-prepare.sh
134 -@@ -0,0 +1,25 @@
135 +@@ -0,0 +1,27 @@
136 +#!/bin/sh
137 +# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
138 +# ex: ts=8 sw=4 sts=4 et filetype=sh
139 +
140 ++[ -z "$UDEVVERSION" ] && UDEVVERSION=$(udevadm --version)
141 ++
142 +for f in /etc/udev/rules.d/*-persistent-storage.rules; do
143 + [ -e "$f" ] || continue
144 + while read line; do
145 @@ -109,19 +110,6 @@
146 + done < "${f}" > "${f}.new"
147 + mv "${f}.new" "$f"
148 +done
149 -diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh
150 -index 16c8958..0259053 100755
151 ---- a/modules.d/99base/init.sh
152 -+++ b/modules.d/99base/init.sh
153 -@@ -83,7 +83,7 @@ trap "emergency_shell Signal caught!" 0
154 -
155 - [ -d /run/initramfs ] || mkdir -p -m 0755 /run/initramfs
156 -
157 --UDEVVERSION=$(udevadm --version)
158 -+export UDEVVERSION=$(udevadm --version)
159 - if [ $UDEVVERSION -gt 166 ]; then
160 - # newer versions of udev use /run/udev/rules.d
161 - export UDEVRULESD=/run/udev/rules.d
162 --
163 1.7.12.4
Report Message
Find on MARC Find on Google Groups