1 |
commit: 991b1645a9b9f46b55a3eaee3ef7abcbbca2533a |
2 |
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Feb 9 18:45:28 2017 +0000 |
4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 9 18:47:28 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=991b1645 |
7 |
|
8 |
sys-kernel/dracut: Remove old versions |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
|
12 |
sys-kernel/dracut/Manifest | 3 - |
13 |
sys-kernel/dracut/dracut-040-r3.ebuild | 254 ------------------- |
14 |
sys-kernel/dracut/dracut-041-r3.ebuild | 262 -------------------- |
15 |
sys-kernel/dracut/dracut-043-r2.ebuild | 261 ------------------- |
16 |
sys-kernel/dracut/dracut-044.ebuild | 253 ------------------- |
17 |
...01-dracut.sh-do-not-bail-out-if-kernel-mo.patch | 42 ---- |
18 |
...02-dracut-functions.sh-support-for-altern.patch | 41 --- |
19 |
...03-gentoo.conf-let-udevdir-be-handled-by-.patch | 30 --- |
20 |
...04-Use-the-same-paths-in-dracut.sh-as-tho.patch | 74 ------ |
21 |
...05-Install-dracut-install-into-libexec-di.patch | 81 ------ |
22 |
...006-resume-fix-swap-detection-in-hostonly.patch | 31 --- |
23 |
...07-dracut.sh-also-mkdir-run-lock-which-is.patch | 25 -- |
24 |
...08-dracut.sh-no-need-to-make-subdirs-in-r.patch | 25 -- |
25 |
...09-lvm-install-thin-utils-for-non-hostonl.patch | 41 --- |
26 |
.../files/034-0011-lvm-fix-thin-recognition.patch | 40 --- |
27 |
...012-lvm-always-install-thin-utils-for-lvm.patch | 79 ------ |
28 |
.../files/034-0013-usrmount-always-install.patch | 31 --- |
29 |
.../034-0014-udev-rules-add-eudev-rules.patch | 29 --- |
30 |
...01-dracut-functions.sh-support-for-altern.patch | 41 --- |
31 |
...02-gentoo.conf-let-udevdir-be-handled-by-.patch | 30 --- |
32 |
...03-Use-the-same-paths-in-dracut.sh-as-tho.patch | 74 ------ |
33 |
...04-Install-dracut-install-into-libexec-di.patch | 81 ------ |
34 |
.../dracut/files/040-0005-NEWS-add-040-entry.patch | 25 -- |
35 |
...06-Don-t-pass-rsyncable-option-to-gzip-Ge.patch | 26 -- |
36 |
...07-Take-into-account-lib64-dirs-when-dete.patch | 44 ---- |
37 |
...01-Use-the-same-paths-in-dracut.sh-as-tho.patch | 74 ------ |
38 |
...02-Install-dracut-install-and-skipcpio-in.patch | 125 ---------- |
39 |
...03-Take-into-account-lib64-dirs-when-dete.patch | 60 ----- |
40 |
.../dracut/files/041-0004-Portability-fixes.patch | 63 ----- |
41 |
...41-0005-base-dracut-lib.sh-remove-bashism.patch | 27 -- |
42 |
...01-Revert-lvm-Don-t-activate-LVs-with-act.patch | 33 --- |
43 |
...02-Replace-echo-n-with-printf-in-code-wit.patch | 275 --------------------- |
44 |
...03-syncheck-Look-for-echo-n-usage-in-modu.patch | 26 -- |
45 |
...04-dracut-initramfs-restore-make-mount-er.patch | 28 --- |
46 |
34 files changed, 2634 deletions(-) |
47 |
|
48 |
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest |
49 |
index 8d50caa9a0..6525882cc1 100644 |
50 |
--- a/sys-kernel/dracut/Manifest |
51 |
+++ b/sys-kernel/dracut/Manifest |
52 |
@@ -1,4 +1 @@ |
53 |
-DIST dracut-040.tar.xz 263944 SHA256 b6e743353804b46e350177b9ecb9a8511df7e8c4ff9e0b4f3b4f72bc509c98a3 SHA512 6bc6a714572cc18c4cf9f9c1af4bc787287554ead1e39fbec8a1b8986585cf8c7c7ef476f87fc361f565eb344fe2594d63185ffe02cc5fa7cc3eaa03bcb4b72b WHIRLPOOL d8dbdbf6cb7705a0b7793f82a0323c49b4ac0dc3d61cf0073e3061f34af0b5c92dd21a7dc080f2a8d24d3eef3abc99df91f113675721267352f934f1319c66ba |
54 |
-DIST dracut-041.tar.xz 268288 SHA256 8ece6c2240bf0e9283e5f717b65dfcd6830b3ef7f8d1c01b60014052f1063251 SHA512 358444588febfc482627eb5423b8a87b588ed3842ae814b9f88d8c5dfec28419f2aea92cd54c11c4949b9968d60d7e05ba9cfea78d26d2dc6f2a943a38b28dac WHIRLPOOL ab538fe1ffeb3d43185c6222a6e65af8c684b292be571e0571fdd69011f654c3093f3a2256f3003d5dbaf07d0a26f83d82055885bae1868738ad15dc74982e72 |
55 |
-DIST dracut-043.tar.xz 272744 SHA256 1484b558ed20330125aa04dcccab84da15c5689e19068285aa011f7177889cd1 SHA512 a36271e1ed4c1205a01bece7652095a8bfd722bcf7239a93baeb21e7e0a60fa86dd6657aa69b594241981056c87c6fe9d372f18ac045785122a9cafe8b0c31eb WHIRLPOOL d1efd59e2c41478e489d4707114b141e8bb0501c54209e364edc2060d3ffac7f2e1afd640b0812a452e7fbe7f9134e5e96436f0f1f2a54613d9468f9dca61a0c |
56 |
DIST dracut-044.tar.xz 280004 SHA256 84b97c9b0120e9fde06c3b9cf2ede1c4632cccd8e085e980b9ec9c788655af05 SHA512 bc788076e425b223d98cf0e0b15ff57d75d423991d7a67fb564a2857c38d5c3a21d846d2ca4523f9d4b0128bb981d09b5c26031435c5fc5e30f53080bca19b3d WHIRLPOOL 684591df596fa902447e671adfaeeb8cdc469c257f756616e42747835b71be7caaac9c72bd4b1a5ba5728ec4332baaba1d265cddb1c30cbfa65cf4dce0690bc0 |
57 |
|
58 |
diff --git a/sys-kernel/dracut/dracut-040-r3.ebuild b/sys-kernel/dracut/dracut-040-r3.ebuild |
59 |
deleted file mode 100644 |
60 |
index cc3554d189..0000000000 |
61 |
--- a/sys-kernel/dracut/dracut-040-r3.ebuild |
62 |
+++ /dev/null |
63 |
@@ -1,254 +0,0 @@ |
64 |
-# Copyright 1999-2015 Gentoo Foundation |
65 |
-# Distributed under the terms of the GNU General Public License v2 |
66 |
-# $Id$ |
67 |
- |
68 |
-EAPI=4 |
69 |
- |
70 |
-inherit bash-completion-r1 eutils linux-info multilib systemd |
71 |
- |
72 |
-DESCRIPTION="Generic initramfs generation tool" |
73 |
-HOMEPAGE="https://dracut.wiki.kernel.org" |
74 |
-SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.xz" |
75 |
-LICENSE="GPL-2" |
76 |
-SLOT="0" |
77 |
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
78 |
-IUSE="debug selinux systemd" |
79 |
- |
80 |
-RESTRICT="test" |
81 |
- |
82 |
-CDEPEND="virtual/udev |
83 |
- systemd? ( >=sys-apps/systemd-199 ) |
84 |
- " |
85 |
-RDEPEND="${CDEPEND} |
86 |
- app-arch/cpio |
87 |
- >=app-shells/bash-4.0 |
88 |
- >sys-apps/kmod-5[tools] |
89 |
- || ( >=sys-apps/sysvinit-2.87-r3 sys-apps/systemd[sysv-utils] sys-apps/systemd-sysv-utils ) |
90 |
- >=sys-apps/util-linux-2.21 |
91 |
- |
92 |
- debug? ( dev-util/strace ) |
93 |
- selinux? ( |
94 |
- sys-libs/libselinux |
95 |
- sys-libs/libsepol |
96 |
- sec-policy/selinux-dracut |
97 |
- ) |
98 |
- " |
99 |
-DEPEND="${CDEPEND} |
100 |
- app-text/asciidoc |
101 |
- >=dev-libs/libxslt-1.1.26 |
102 |
- app-text/docbook-xml-dtd:4.5 |
103 |
- >=app-text/docbook-xsl-stylesheets-1.75.2 |
104 |
- virtual/pkgconfig |
105 |
- " |
106 |
- |
107 |
-DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules |
108 |
- README.testsuite TODO ) |
109 |
-MY_LIBDIR=/usr/lib |
110 |
-PATCHES=( |
111 |
- "${FILESDIR}/${PV}-0001-dracut-functions.sh-support-for-altern.patch" |
112 |
- "${FILESDIR}/${PV}-0002-gentoo.conf-let-udevdir-be-handled-by-.patch" |
113 |
- "${FILESDIR}/${PV}-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch" |
114 |
- "${FILESDIR}/${PV}-0005-NEWS-add-040-entry.patch" |
115 |
- "${FILESDIR}/${PV}-0006-Don-t-pass-rsyncable-option-to-gzip-Ge.patch" |
116 |
- "${FILESDIR}/${PV}-0007-Take-into-account-lib64-dirs-when-dete.patch" |
117 |
- ) |
118 |
-QA_MULTILIB_PATHS=" |
119 |
- usr/lib/dracut/dracut-install |
120 |
- usr/lib/dracut/skipcpio |
121 |
- " |
122 |
- |
123 |
-# |
124 |
-# Helper functions |
125 |
-# |
126 |
- |
127 |
-# Removes module from modules.d. |
128 |
-# $1 = module name |
129 |
-# Module name can be specified without number prefix. |
130 |
-rm_module() { |
131 |
- local force m |
132 |
- [[ $1 = -f ]] && force=-f |
133 |
- |
134 |
- for m in $@; do |
135 |
- if [[ $m =~ ^[0-9][0-9][^\ ]*$ ]]; then |
136 |
- rm ${force} --interactive=never -r "${modules_dir}"/$m |
137 |
- else |
138 |
- rm ${force} --interactive=never -r "${modules_dir}"/[0-9][0-9]$m |
139 |
- fi |
140 |
- done |
141 |
-} |
142 |
- |
143 |
-src_prepare() { |
144 |
- epatch "${PATCHES[@]}" |
145 |
- |
146 |
- local libdirs="/$(get_libdir) /usr/$(get_libdir)" |
147 |
- if [[ ${SYMLINK_LIB} = yes ]]; then |
148 |
- # Preserve lib -> lib64 symlinks in initramfs |
149 |
- [[ $libdirs =~ /lib\ ]] || libdirs+=" /lib /usr/lib" |
150 |
- fi |
151 |
- einfo "Setting libdirs to \"${libdirs}\" ..." |
152 |
- sed -e "3alibdirs=\"${libdirs}\"" \ |
153 |
- -i "${S}/dracut.conf.d/gentoo.conf.example" || die |
154 |
- |
155 |
- local udevdir="$("$(tc-getPKG_CONFIG)" udev --variable=udevdir)" |
156 |
- einfo "Setting udevdir to ${udevdir}..." |
157 |
- sed -r -e "s|^(udevdir=).*$|\1${udevdir}|" \ |
158 |
- -i "${S}/dracut.conf.d/gentoo.conf.example" || die |
159 |
- |
160 |
- if use systemd; then |
161 |
- local systemdutildir="$(systemd_get_utildir)" |
162 |
- local systemdsystemunitdir="$(systemd_get_unitdir)" |
163 |
- local systemdsystemconfdir="$("$(tc-getPKG_CONFIG)" systemd \ |
164 |
- --variable=systemdsystemconfdir)" |
165 |
- [[ ${systemdsystemconfdir} ]] \ |
166 |
- || systemdsystemconfdir=/etc/systemd/system |
167 |
- einfo "Setting systemdutildir to ${systemdutildir} and ..." |
168 |
- sed -e "5asystemdutildir=\"${systemdutildir}\"" \ |
169 |
- -i "${S}/dracut.conf.d/gentoo.conf.example" || die |
170 |
- einfo "Setting systemdsystemunitdir to ${systemdsystemunitdir} and..." |
171 |
- sed -e "6asystemdsystemunitdir=\"${systemdsystemunitdir}\"" \ |
172 |
- -i "${S}/dracut.conf.d/gentoo.conf.example" || die |
173 |
- einfo "Setting systemdsystemconfdir to ${systemdsystemconfdir}..." |
174 |
- sed -e "7asystemdsystemconfdir=\"${systemdsystemconfdir}\"" \ |
175 |
- -i "${S}/dracut.conf.d/gentoo.conf.example" || die |
176 |
- else |
177 |
- local systemdutildir="/lib/systemd" |
178 |
- einfo "Setting systemdutildir for standalone udev to" \ |
179 |
- "${systemdutildir}..." |
180 |
- sed -e "5asystemdutildir=\"${systemdutildir}\"" \ |
181 |
- -i "${S}/dracut.conf.d/gentoo.conf.example" || die |
182 |
- fi |
183 |
- |
184 |
- epatch_user |
185 |
-} |
186 |
- |
187 |
-src_configure() { |
188 |
- local myconf="--libdir=${MY_LIBDIR}" |
189 |
- myconf+=" --bashcompletiondir=$(get_bashcompdir)" |
190 |
- |
191 |
- if use systemd; then |
192 |
- myconf+=" --systemdsystemunitdir='$(systemd_get_unitdir)'" |
193 |
- fi |
194 |
- |
195 |
- econf ${myconf} |
196 |
-} |
197 |
- |
198 |
-src_compile() { |
199 |
- tc-export CC |
200 |
- emake doc install/dracut-install skipcpio/skipcpio |
201 |
-} |
202 |
- |
203 |
-src_install() { |
204 |
- default |
205 |
- |
206 |
- local my_libdir="${MY_LIBDIR}" |
207 |
- local dracutlibdir="${my_libdir#/}/dracut" |
208 |
- |
209 |
- echo "DRACUT_VERSION=$PVR" > "${D%/}/${dracutlibdir}/dracut-version.sh" |
210 |
- |
211 |
- insinto "${dracutlibdir}/dracut.conf.d/" |
212 |
- newins dracut.conf.d/gentoo.conf.example gentoo.conf |
213 |
- |
214 |
- insinto /etc/logrotate.d |
215 |
- newins dracut.logrotate dracut |
216 |
- |
217 |
- dodir /var/lib/dracut/overlay |
218 |
- |
219 |
- dohtml dracut.html |
220 |
- |
221 |
- # |
222 |
- # Modules |
223 |
- # |
224 |
- local module |
225 |
- modules_dir="${D%/}/${dracutlibdir}/modules.d" |
226 |
- |
227 |
- use debug || rm_module 95debug |
228 |
- use selinux || rm_module 98selinux |
229 |
- |
230 |
- if use systemd; then |
231 |
- # With systemd following modules do not make sense |
232 |
- rm_module 96securityfs 97masterkey 98integrity |
233 |
- else |
234 |
- rm_module 98systemd |
235 |
- # Without systemd following modules do not make sense |
236 |
- rm_module 00systemd-bootchart |
237 |
- fi |
238 |
- |
239 |
- # Remove modules which won't work for sure |
240 |
- rm_module 95fcoe # no tools |
241 |
- # fips module depends on masked app-crypt/hmaccalc |
242 |
- rm_module 01fips 02fips-aesni |
243 |
-} |
244 |
- |
245 |
-pkg_postinst() { |
246 |
- if linux-info_get_any_version && linux_config_exists; then |
247 |
- ewarn "" |
248 |
- ewarn "If the following test report contains a missing kernel" |
249 |
- ewarn "configuration option, you should reconfigure and rebuild your" |
250 |
- ewarn "kernel before booting image generated with this Dracut version." |
251 |
- ewarn "" |
252 |
- |
253 |
- local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS" |
254 |
- |
255 |
- # Kernel configuration options descriptions: |
256 |
- local desc_DEVTMPFS="Maintain a devtmpfs filesystem to mount at /dev" |
257 |
- local desc_BLK_DEV_INITRD="Initial RAM filesystem and RAM disk "\ |
258 |
-"(initramfs/initrd) support" |
259 |
- |
260 |
- local opt desc |
261 |
- |
262 |
- # Generate ERROR_* variables for check_extra_config. |
263 |
- for opt in ${CONFIG_CHECK}; do |
264 |
- opt=${opt#\~} |
265 |
- desc=desc_${opt} |
266 |
- eval "local ERROR_${opt}='CONFIG_${opt}: \"${!desc}\"" \ |
267 |
- "is missing and REQUIRED'" |
268 |
- done |
269 |
- |
270 |
- check_extra_config |
271 |
- echo |
272 |
- else |
273 |
- ewarn "" |
274 |
- ewarn "Your kernel configuration couldn't be checked. Do you have" |
275 |
- ewarn "/usr/src/linux/.config file there? Please check manually if" |
276 |
- ewarn "following options are enabled:" |
277 |
- ewarn "" |
278 |
- ewarn " CONFIG_BLK_DEV_INITRD" |
279 |
- ewarn " CONFIG_DEVTMPFS" |
280 |
- ewarn "" |
281 |
- fi |
282 |
- |
283 |
- elog "To get additional features, a number of optional runtime" |
284 |
- elog "dependencies may be installed:" |
285 |
- elog "" |
286 |
- optfeature "Networking support" net-misc/curl "net-misc/dhcp[client]" \ |
287 |
- sys-apps/iproute2 |
288 |
- optfeature \ |
289 |
- "Measure performance of the boot process for later visualisation" \ |
290 |
- app-benchmarks/bootchart2 app-admin/killproc sys-process/acct |
291 |
- optfeature "Scan for Btrfs on block devices" sys-fs/btrfs-progs |
292 |
- optfeature "Load kernel modules and drop this privilege for real init" \ |
293 |
- sys-libs/libcap |
294 |
- optfeature "Support CIFS" net-fs/cifs-utils |
295 |
- optfeature "Decrypt devices encrypted with cryptsetup/LUKS" \ |
296 |
- "sys-fs/cryptsetup[-static-libs]" |
297 |
- optfeature "Support for GPG-encrypted keys for crypt module" \ |
298 |
- app-crypt/gnupg |
299 |
- optfeature \ |
300 |
- "Allows use of dash instead of default bash (on your own risk)" \ |
301 |
- app-shells/dash |
302 |
- optfeature "Framebuffer splash (media-gfx/splashutils)" \ |
303 |
- media-gfx/splashutils |
304 |
- optfeature "Support iSCSI" sys-block/open-iscsi |
305 |
- optfeature "Support Logical Volume Manager" sys-fs/lvm2 |
306 |
- optfeature "Support MD devices, also known as software RAID devices" \ |
307 |
- sys-fs/mdadm |
308 |
- optfeature "Support Device Mapper multipathing" sys-fs/multipath-tools |
309 |
- optfeature "Plymouth boot splash" '>=sys-boot/plymouth-0.8.5-r5' |
310 |
- optfeature "Support network block devices" sys-block/nbd |
311 |
- optfeature "Support NFS" net-fs/nfs-utils net-nds/rpcbind |
312 |
- optfeature \ |
313 |
- "Install ssh and scp along with config files and specified keys" \ |
314 |
- net-misc/openssh |
315 |
- optfeature "Enable logging with syslog-ng or rsyslog" app-admin/syslog-ng \ |
316 |
- app-admin/rsyslog |
317 |
-} |
318 |
|
319 |
diff --git a/sys-kernel/dracut/dracut-041-r3.ebuild b/sys-kernel/dracut/dracut-041-r3.ebuild |
320 |
deleted file mode 100644 |
321 |
index 9c8e7d6f94..0000000000 |
322 |
--- a/sys-kernel/dracut/dracut-041-r3.ebuild |
323 |
+++ /dev/null |
324 |
@@ -1,262 +0,0 @@ |
325 |
-# Copyright 1999-2015 Gentoo Foundation |
326 |
-# Distributed under the terms of the GNU General Public License v2 |
327 |
-# $Id$ |
328 |
- |
329 |
-EAPI=4 |
330 |
- |
331 |
-inherit bash-completion-r1 eutils linux-info multilib systemd |
332 |
- |
333 |
-DESCRIPTION="Generic initramfs generation tool" |
334 |
-HOMEPAGE="https://dracut.wiki.kernel.org" |
335 |
-SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.xz" |
336 |
-LICENSE="GPL-2" |
337 |
-SLOT="0" |
338 |
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
339 |
-IUSE="debug selinux systemd" |
340 |
- |
341 |
-RESTRICT="test" |
342 |
- |
343 |
-CDEPEND="virtual/udev |
344 |
- systemd? ( >=sys-apps/systemd-199 ) |
345 |
- " |
346 |
-RDEPEND="${CDEPEND} |
347 |
- app-arch/cpio |
348 |
- >=app-shells/bash-4.0 |
349 |
- >sys-apps/kmod-5[tools] |
350 |
- || ( |
351 |
- >=sys-apps/sysvinit-2.87-r3 |
352 |
- sys-apps/systemd[sysv-utils] |
353 |
- sys-apps/systemd-sysv-utils |
354 |
- ) |
355 |
- >=sys-apps/util-linux-2.21 |
356 |
- |
357 |
- debug? ( dev-util/strace ) |
358 |
- selinux? ( |
359 |
- sys-libs/libselinux |
360 |
- sys-libs/libsepol |
361 |
- sec-policy/selinux-dracut |
362 |
- ) |
363 |
- " |
364 |
-DEPEND="${CDEPEND} |
365 |
- app-text/asciidoc |
366 |
- >=dev-libs/libxslt-1.1.26 |
367 |
- app-text/docbook-xml-dtd:4.5 |
368 |
- >=app-text/docbook-xsl-stylesheets-1.75.2 |
369 |
- virtual/pkgconfig |
370 |
- " |
371 |
- |
372 |
-DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules |
373 |
- README.testsuite TODO ) |
374 |
-MY_LIBDIR=/usr/lib |
375 |
-PATCHES=( |
376 |
- "${FILESDIR}/${PV}-0001-Use-the-same-paths-in-dracut.sh-as-tho.patch" |
377 |
- "${FILESDIR}/${PV}-0002-Install-dracut-install-and-skipcpio-in.patch" |
378 |
- "${FILESDIR}/${PV}-0003-Take-into-account-lib64-dirs-when-dete.patch" |
379 |
- "${FILESDIR}/${PV}-0004-Portability-fixes.patch" |
380 |
- "${FILESDIR}/${PV}-0005-base-dracut-lib.sh-remove-bashism.patch" |
381 |
- ) |
382 |
-QA_MULTILIB_PATHS=" |
383 |
- usr/lib/dracut/dracut-install |
384 |
- usr/lib/dracut/skipcpio |
385 |
- " |
386 |
- |
387 |
-# |
388 |
-# Helper functions |
389 |
-# |
390 |
- |
391 |
-# Removes module from modules.d. |
392 |
-# $1 = module name |
393 |
-# Module name can be specified without number prefix. |
394 |
-rm_module() { |
395 |
- local force m |
396 |
- [[ $1 = -f ]] && force=-f |
397 |
- |
398 |
- for m in $@; do |
399 |
- if [[ $m =~ ^[0-9][0-9][^\ ]*$ ]]; then |
400 |
- rm ${force} --interactive=never -r "${modules_dir}"/$m |
401 |
- else |
402 |
- rm ${force} --interactive=never -r "${modules_dir}"/[0-9][0-9]$m |
403 |
- fi |
404 |
- done |
405 |
-} |
406 |
- |
407 |
-src_prepare() { |
408 |
- epatch "${PATCHES[@]}" |
409 |
- |
410 |
- local libdirs="/$(get_libdir) /usr/$(get_libdir)" |
411 |
- if [[ ${SYMLINK_LIB} = yes ]]; then |
412 |
- # Preserve lib -> lib64 symlinks in initramfs |
413 |
- [[ $libdirs =~ /lib\ ]] || libdirs+=" /lib /usr/lib" |
414 |
- fi |
415 |
- einfo "Setting libdirs to \"${libdirs}\" ..." |
416 |
- sed -e "3alibdirs=\"${libdirs}\"" \ |
417 |
- -i "${S}/dracut.conf.d/gentoo.conf.example" || die |
418 |
- |
419 |
- local udevdir="$("$(tc-getPKG_CONFIG)" udev --variable=udevdir)" |
420 |
- einfo "Setting udevdir to ${udevdir}..." |
421 |
- sed -r -e "s|^(udevdir=).*$|\1${udevdir}|" \ |
422 |
- -i "${S}/dracut.conf.d/gentoo.conf.example" || die |
423 |
- |
424 |
- if use systemd; then |
425 |
- local systemdutildir="$(systemd_get_utildir)" |
426 |
- local systemdsystemunitdir="$(systemd_get_unitdir)" |
427 |
- local systemdsystemconfdir="$("$(tc-getPKG_CONFIG)" systemd \ |
428 |
- --variable=systemdsystemconfdir)" |
429 |
- [[ ${systemdsystemconfdir} ]] \ |
430 |
- || systemdsystemconfdir=/etc/systemd/system |
431 |
- einfo "Setting systemdutildir to ${systemdutildir} and ..." |
432 |
- sed -e "5asystemdutildir=\"${systemdutildir}\"" \ |
433 |
- -i "${S}/dracut.conf.d/gentoo.conf.example" || die |
434 |
- einfo "Setting systemdsystemunitdir to ${systemdsystemunitdir} and..." |
435 |
- sed -e "6asystemdsystemunitdir=\"${systemdsystemunitdir}\"" \ |
436 |
- -i "${S}/dracut.conf.d/gentoo.conf.example" || die |
437 |
- einfo "Setting systemdsystemconfdir to ${systemdsystemconfdir}..." |
438 |
- sed -e "7asystemdsystemconfdir=\"${systemdsystemconfdir}\"" \ |
439 |
- -i "${S}/dracut.conf.d/gentoo.conf.example" || die |
440 |
- else |
441 |
- local systemdutildir="/lib/systemd" |
442 |
- einfo "Setting systemdutildir for standalone udev to" \ |
443 |
- "${systemdutildir}..." |
444 |
- sed -e "5asystemdutildir=\"${systemdutildir}\"" \ |
445 |
- -i "${S}/dracut.conf.d/gentoo.conf.example" || die |
446 |
- fi |
447 |
- |
448 |
- epatch_user |
449 |
-} |
450 |
- |
451 |
-src_configure() { |
452 |
- local myconf="--libdir=${MY_LIBDIR}" |
453 |
- myconf+=" --bashcompletiondir=$(get_bashcompdir)" |
454 |
- |
455 |
- if use systemd; then |
456 |
- myconf+=" --systemdsystemunitdir='$(systemd_get_unitdir)'" |
457 |
- fi |
458 |
- |
459 |
- econf ${myconf} |
460 |
-} |
461 |
- |
462 |
-src_compile() { |
463 |
- tc-export CC |
464 |
- emake doc install/dracut-install skipcpio/skipcpio |
465 |
-} |
466 |
- |
467 |
-src_install() { |
468 |
- default |
469 |
- |
470 |
- local my_libdir="${MY_LIBDIR}" |
471 |
- local dracutlibdir="${my_libdir#/}/dracut" |
472 |
- |
473 |
- echo "DRACUT_VERSION=$PVR" > "${D%/}/${dracutlibdir}/dracut-version.sh" |
474 |
- |
475 |
- insinto "${dracutlibdir}/dracut.conf.d/" |
476 |
- newins dracut.conf.d/gentoo.conf.example gentoo.conf |
477 |
- |
478 |
- insinto /etc/logrotate.d |
479 |
- newins dracut.logrotate dracut |
480 |
- |
481 |
- dodir /var/lib/dracut/overlay |
482 |
- |
483 |
- dohtml dracut.html |
484 |
- |
485 |
- if ! use systemd; then |
486 |
- # Scripts in kernel/install.d are systemd-specific |
487 |
- rm -r "${D%/}/${my_libdir}/kernel" || die |
488 |
- fi |
489 |
- |
490 |
- # |
491 |
- # Modules |
492 |
- # |
493 |
- local module |
494 |
- modules_dir="${D%/}/${dracutlibdir}/modules.d" |
495 |
- |
496 |
- use debug || rm_module 95debug |
497 |
- use selinux || rm_module 98selinux |
498 |
- |
499 |
- if use systemd; then |
500 |
- # With systemd following modules do not make sense |
501 |
- rm_module 96securityfs 97masterkey 98integrity |
502 |
- else |
503 |
- rm_module 98systemd |
504 |
- # Without systemd following modules do not make sense |
505 |
- rm_module 00systemd-bootchart |
506 |
- fi |
507 |
- |
508 |
- # Remove modules which won't work for sure |
509 |
- rm_module 95fcoe # no tools |
510 |
- # fips module depends on masked app-crypt/hmaccalc |
511 |
- rm_module 01fips 02fips-aesni |
512 |
-} |
513 |
- |
514 |
-pkg_postinst() { |
515 |
- if linux-info_get_any_version && linux_config_exists; then |
516 |
- ewarn "" |
517 |
- ewarn "If the following test report contains a missing kernel" |
518 |
- ewarn "configuration option, you should reconfigure and rebuild your" |
519 |
- ewarn "kernel before booting image generated with this Dracut version." |
520 |
- ewarn "" |
521 |
- |
522 |
- local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS" |
523 |
- |
524 |
- # Kernel configuration options descriptions: |
525 |
- local desc_DEVTMPFS="Maintain a devtmpfs filesystem to mount at /dev" |
526 |
- local desc_BLK_DEV_INITRD="Initial RAM filesystem and RAM disk "\ |
527 |
-"(initramfs/initrd) support" |
528 |
- |
529 |
- local opt desc |
530 |
- |
531 |
- # Generate ERROR_* variables for check_extra_config. |
532 |
- for opt in ${CONFIG_CHECK}; do |
533 |
- opt=${opt#\~} |
534 |
- desc=desc_${opt} |
535 |
- eval "local ERROR_${opt}='CONFIG_${opt}: \"${!desc}\"" \ |
536 |
- "is missing and REQUIRED'" |
537 |
- done |
538 |
- |
539 |
- check_extra_config |
540 |
- echo |
541 |
- else |
542 |
- ewarn "" |
543 |
- ewarn "Your kernel configuration couldn't be checked. Do you have" |
544 |
- ewarn "/usr/src/linux/.config file there? Please check manually if" |
545 |
- ewarn "following options are enabled:" |
546 |
- ewarn "" |
547 |
- ewarn " CONFIG_BLK_DEV_INITRD" |
548 |
- ewarn " CONFIG_DEVTMPFS" |
549 |
- ewarn "" |
550 |
- fi |
551 |
- |
552 |
- elog "To get additional features, a number of optional runtime" |
553 |
- elog "dependencies may be installed:" |
554 |
- elog "" |
555 |
- optfeature "Networking support" net-misc/curl "net-misc/dhcp[client]" \ |
556 |
- sys-apps/iproute2 |
557 |
- optfeature \ |
558 |
- "Measure performance of the boot process for later visualisation" \ |
559 |
- app-benchmarks/bootchart2 app-admin/killproc sys-process/acct |
560 |
- optfeature "Scan for Btrfs on block devices" sys-fs/btrfs-progs |
561 |
- optfeature "Load kernel modules and drop this privilege for real init" \ |
562 |
- sys-libs/libcap |
563 |
- optfeature "Support CIFS" net-fs/cifs-utils |
564 |
- optfeature "Decrypt devices encrypted with cryptsetup/LUKS" \ |
565 |
- "sys-fs/cryptsetup[-static-libs]" |
566 |
- optfeature "Support for GPG-encrypted keys for crypt module" \ |
567 |
- app-crypt/gnupg |
568 |
- optfeature \ |
569 |
- "Allows use of dash instead of default bash (on your own risk)" \ |
570 |
- app-shells/dash |
571 |
- optfeature "Framebuffer splash (media-gfx/splashutils)" \ |
572 |
- media-gfx/splashutils |
573 |
- optfeature "Support iSCSI" sys-block/open-iscsi |
574 |
- optfeature "Support Logical Volume Manager" sys-fs/lvm2 |
575 |
- optfeature "Support MD devices, also known as software RAID devices" \ |
576 |
- sys-fs/mdadm |
577 |
- optfeature "Support Device Mapper multipathing" sys-fs/multipath-tools |
578 |
- optfeature "Plymouth boot splash" '>=sys-boot/plymouth-0.8.5-r5' |
579 |
- optfeature "Support network block devices" sys-block/nbd |
580 |
- optfeature "Support NFS" net-fs/nfs-utils net-nds/rpcbind |
581 |
- optfeature \ |
582 |
- "Install ssh and scp along with config files and specified keys" \ |
583 |
- net-misc/openssh |
584 |
- optfeature "Enable logging with syslog-ng or rsyslog" app-admin/syslog-ng \ |
585 |
- app-admin/rsyslog |
586 |
-} |
587 |
|
588 |
diff --git a/sys-kernel/dracut/dracut-043-r2.ebuild b/sys-kernel/dracut/dracut-043-r2.ebuild |
589 |
deleted file mode 100644 |
590 |
index 2a65cf6abd..0000000000 |
591 |
--- a/sys-kernel/dracut/dracut-043-r2.ebuild |
592 |
+++ /dev/null |
593 |
@@ -1,261 +0,0 @@ |
594 |
-# Copyright 1999-2015 Gentoo Foundation |
595 |
-# Distributed under the terms of the GNU General Public License v2 |
596 |
-# $Id$ |
597 |
- |
598 |
-EAPI=4 |
599 |
- |
600 |
-inherit bash-completion-r1 eutils linux-info multilib systemd |
601 |
- |
602 |
-DESCRIPTION="Generic initramfs generation tool" |
603 |
-HOMEPAGE="https://dracut.wiki.kernel.org" |
604 |
-SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.xz" |
605 |
-LICENSE="GPL-2" |
606 |
-SLOT="0" |
607 |
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
608 |
-IUSE="debug selinux systemd" |
609 |
- |
610 |
-RESTRICT="test" |
611 |
- |
612 |
-CDEPEND="virtual/udev |
613 |
- systemd? ( >=sys-apps/systemd-199 ) |
614 |
- " |
615 |
-RDEPEND="${CDEPEND} |
616 |
- app-arch/cpio |
617 |
- >=app-shells/bash-4.0 |
618 |
- >sys-apps/kmod-5[tools] |
619 |
- || ( |
620 |
- >=sys-apps/sysvinit-2.87-r3 |
621 |
- sys-apps/systemd[sysv-utils] |
622 |
- sys-apps/systemd-sysv-utils |
623 |
- ) |
624 |
- >=sys-apps/util-linux-2.21 |
625 |
- |
626 |
- debug? ( dev-util/strace ) |
627 |
- selinux? ( |
628 |
- sys-libs/libselinux |
629 |
- sys-libs/libsepol |
630 |
- sec-policy/selinux-dracut |
631 |
- ) |
632 |
- " |
633 |
-DEPEND="${CDEPEND} |
634 |
- app-text/asciidoc |
635 |
- >=dev-libs/libxslt-1.1.26 |
636 |
- app-text/docbook-xml-dtd:4.5 |
637 |
- >=app-text/docbook-xsl-stylesheets-1.75.2 |
638 |
- virtual/pkgconfig |
639 |
- " |
640 |
- |
641 |
-DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules |
642 |
- README.testsuite TODO ) |
643 |
-MY_LIBDIR=/usr/lib |
644 |
-PATCHES=( |
645 |
- "${FILESDIR}/${PV}-0001-Revert-lvm-Don-t-activate-LVs-with-act.patch" |
646 |
- "${FILESDIR}/${PV}-0002-Replace-echo-n-with-printf-in-code-wit.patch" |
647 |
- "${FILESDIR}/${PV}-0003-syncheck-Look-for-echo-n-usage-in-modu.patch" |
648 |
- "${FILESDIR}/${PV}-0004-dracut-initramfs-restore-make-mount-er.patch" |
649 |
- ) |
650 |
-QA_MULTILIB_PATHS=" |
651 |
- usr/lib/dracut/dracut-install |
652 |
- usr/lib/dracut/skipcpio |
653 |
- " |
654 |
- |
655 |
-# |
656 |
-# Helper functions |
657 |
-# |
658 |
- |
659 |
-# Removes module from modules.d. |
660 |
-# $1 = module name |
661 |
-# Module name can be specified without number prefix. |
662 |
-rm_module() { |
663 |
- local force m |
664 |
- [[ $1 = -f ]] && force=-f |
665 |
- |
666 |
- for m in $@; do |
667 |
- if [[ $m =~ ^[0-9][0-9][^\ ]*$ ]]; then |
668 |
- rm ${force} --interactive=never -r "${modules_dir}"/$m |
669 |
- else |
670 |
- rm ${force} --interactive=never -r "${modules_dir}"/[0-9][0-9]$m |
671 |
- fi |
672 |
- done |
673 |
-} |
674 |
- |
675 |
-src_prepare() { |
676 |
- epatch "${PATCHES[@]}" |
677 |
- |
678 |
- local libdirs="/$(get_libdir) /usr/$(get_libdir)" |
679 |
- if [[ ${SYMLINK_LIB} = yes ]]; then |
680 |
- # Preserve lib -> lib64 symlinks in initramfs |
681 |
- [[ $libdirs =~ /lib\ ]] || libdirs+=" /lib /usr/lib" |
682 |
- fi |
683 |
- einfo "Setting libdirs to \"${libdirs}\" ..." |
684 |
- sed -e "3alibdirs=\"${libdirs}\"" \ |
685 |
- -i "${S}/dracut.conf.d/gentoo.conf.example" || die |
686 |
- |
687 |
- local udevdir="$("$(tc-getPKG_CONFIG)" udev --variable=udevdir)" |
688 |
- einfo "Setting udevdir to ${udevdir}..." |
689 |
- sed -r -e "s|^(udevdir=).*$|\1${udevdir}|" \ |
690 |
- -i "${S}/dracut.conf.d/gentoo.conf.example" || die |
691 |
- |
692 |
- if use systemd; then |
693 |
- local systemdutildir="$(systemd_get_utildir)" |
694 |
- local systemdsystemunitdir="$(systemd_get_unitdir)" |
695 |
- local systemdsystemconfdir="$("$(tc-getPKG_CONFIG)" systemd \ |
696 |
- --variable=systemdsystemconfdir)" |
697 |
- [[ ${systemdsystemconfdir} ]] \ |
698 |
- || systemdsystemconfdir=/etc/systemd/system |
699 |
- einfo "Setting systemdutildir to ${systemdutildir} and ..." |
700 |
- sed -e "5asystemdutildir=\"${systemdutildir}\"" \ |
701 |
- -i "${S}/dracut.conf.d/gentoo.conf.example" || die |
702 |
- einfo "Setting systemdsystemunitdir to ${systemdsystemunitdir} and..." |
703 |
- sed -e "6asystemdsystemunitdir=\"${systemdsystemunitdir}\"" \ |
704 |
- -i "${S}/dracut.conf.d/gentoo.conf.example" || die |
705 |
- einfo "Setting systemdsystemconfdir to ${systemdsystemconfdir}..." |
706 |
- sed -e "7asystemdsystemconfdir=\"${systemdsystemconfdir}\"" \ |
707 |
- -i "${S}/dracut.conf.d/gentoo.conf.example" || die |
708 |
- else |
709 |
- local systemdutildir="/lib/systemd" |
710 |
- einfo "Setting systemdutildir for standalone udev to" \ |
711 |
- "${systemdutildir}..." |
712 |
- sed -e "5asystemdutildir=\"${systemdutildir}\"" \ |
713 |
- -i "${S}/dracut.conf.d/gentoo.conf.example" || die |
714 |
- fi |
715 |
- |
716 |
- epatch_user |
717 |
-} |
718 |
- |
719 |
-src_configure() { |
720 |
- local myconf="--libdir=${MY_LIBDIR}" |
721 |
- myconf+=" --bashcompletiondir=$(get_bashcompdir)" |
722 |
- |
723 |
- if use systemd; then |
724 |
- myconf+=" --systemdsystemunitdir='$(systemd_get_unitdir)'" |
725 |
- fi |
726 |
- |
727 |
- econf ${myconf} |
728 |
-} |
729 |
- |
730 |
-src_compile() { |
731 |
- tc-export CC |
732 |
- emake doc install/dracut-install skipcpio/skipcpio |
733 |
-} |
734 |
- |
735 |
-src_install() { |
736 |
- default |
737 |
- |
738 |
- local my_libdir="${MY_LIBDIR}" |
739 |
- local dracutlibdir="${my_libdir#/}/dracut" |
740 |
- |
741 |
- echo "DRACUT_VERSION=$PVR" > "${D%/}/${dracutlibdir}/dracut-version.sh" |
742 |
- |
743 |
- insinto "${dracutlibdir}/dracut.conf.d/" |
744 |
- newins dracut.conf.d/gentoo.conf.example gentoo.conf |
745 |
- |
746 |
- insinto /etc/logrotate.d |
747 |
- newins dracut.logrotate dracut |
748 |
- |
749 |
- dodir /var/lib/dracut/overlay |
750 |
- |
751 |
- dohtml dracut.html |
752 |
- |
753 |
- if ! use systemd; then |
754 |
- # Scripts in kernel/install.d are systemd-specific |
755 |
- rm -r "${D%/}/${my_libdir}/kernel" || die |
756 |
- fi |
757 |
- |
758 |
- # |
759 |
- # Modules |
760 |
- # |
761 |
- local module |
762 |
- modules_dir="${D%/}/${dracutlibdir}/modules.d" |
763 |
- |
764 |
- use debug || rm_module 95debug |
765 |
- use selinux || rm_module 98selinux |
766 |
- |
767 |
- if use systemd; then |
768 |
- # With systemd following modules do not make sense |
769 |
- rm_module 96securityfs 97masterkey 98integrity |
770 |
- else |
771 |
- rm_module 00systemd 98dracut-systemd |
772 |
- # Without systemd following modules do not make sense |
773 |
- rm_module 00systemd-bootchart 01systemd-initrd 02systemd-networkd |
774 |
- fi |
775 |
- |
776 |
- # Remove modules which won't work for sure |
777 |
- rm_module 95fcoe # no tools |
778 |
- # fips module depends on masked app-crypt/hmaccalc |
779 |
- rm_module 01fips 02fips-aesni |
780 |
-} |
781 |
- |
782 |
-pkg_postinst() { |
783 |
- if linux-info_get_any_version && linux_config_exists; then |
784 |
- ewarn "" |
785 |
- ewarn "If the following test report contains a missing kernel" |
786 |
- ewarn "configuration option, you should reconfigure and rebuild your" |
787 |
- ewarn "kernel before booting image generated with this Dracut version." |
788 |
- ewarn "" |
789 |
- |
790 |
- local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS" |
791 |
- |
792 |
- # Kernel configuration options descriptions: |
793 |
- local desc_DEVTMPFS="Maintain a devtmpfs filesystem to mount at /dev" |
794 |
- local desc_BLK_DEV_INITRD="Initial RAM filesystem and RAM disk "\ |
795 |
-"(initramfs/initrd) support" |
796 |
- |
797 |
- local opt desc |
798 |
- |
799 |
- # Generate ERROR_* variables for check_extra_config. |
800 |
- for opt in ${CONFIG_CHECK}; do |
801 |
- opt=${opt#\~} |
802 |
- desc=desc_${opt} |
803 |
- eval "local ERROR_${opt}='CONFIG_${opt}: \"${!desc}\"" \ |
804 |
- "is missing and REQUIRED'" |
805 |
- done |
806 |
- |
807 |
- check_extra_config |
808 |
- echo |
809 |
- else |
810 |
- ewarn "" |
811 |
- ewarn "Your kernel configuration couldn't be checked. Do you have" |
812 |
- ewarn "/usr/src/linux/.config file there? Please check manually if" |
813 |
- ewarn "following options are enabled:" |
814 |
- ewarn "" |
815 |
- ewarn " CONFIG_BLK_DEV_INITRD" |
816 |
- ewarn " CONFIG_DEVTMPFS" |
817 |
- ewarn "" |
818 |
- fi |
819 |
- |
820 |
- elog "To get additional features, a number of optional runtime" |
821 |
- elog "dependencies may be installed:" |
822 |
- elog "" |
823 |
- optfeature "Networking support" net-misc/curl "net-misc/dhcp[client]" \ |
824 |
- sys-apps/iproute2 |
825 |
- optfeature \ |
826 |
- "Measure performance of the boot process for later visualisation" \ |
827 |
- app-benchmarks/bootchart2 app-admin/killproc sys-process/acct |
828 |
- optfeature "Scan for Btrfs on block devices" sys-fs/btrfs-progs |
829 |
- optfeature "Load kernel modules and drop this privilege for real init" \ |
830 |
- sys-libs/libcap |
831 |
- optfeature "Support CIFS" net-fs/cifs-utils |
832 |
- optfeature "Decrypt devices encrypted with cryptsetup/LUKS" \ |
833 |
- "sys-fs/cryptsetup[-static-libs]" |
834 |
- optfeature "Support for GPG-encrypted keys for crypt module" \ |
835 |
- app-crypt/gnupg |
836 |
- optfeature \ |
837 |
- "Allows use of dash instead of default bash (on your own risk)" \ |
838 |
- app-shells/dash |
839 |
- optfeature "Framebuffer splash (media-gfx/splashutils)" \ |
840 |
- media-gfx/splashutils |
841 |
- optfeature "Support iSCSI" sys-block/open-iscsi |
842 |
- optfeature "Support Logical Volume Manager" sys-fs/lvm2 |
843 |
- optfeature "Support MD devices, also known as software RAID devices" \ |
844 |
- sys-fs/mdadm |
845 |
- optfeature "Support Device Mapper multipathing" sys-fs/multipath-tools |
846 |
- optfeature "Plymouth boot splash" '>=sys-boot/plymouth-0.8.5-r5' |
847 |
- optfeature "Support network block devices" sys-block/nbd |
848 |
- optfeature "Support NFS" net-fs/nfs-utils net-nds/rpcbind |
849 |
- optfeature \ |
850 |
- "Install ssh and scp along with config files and specified keys" \ |
851 |
- net-misc/openssh |
852 |
- optfeature "Enable logging with syslog-ng or rsyslog" app-admin/syslog-ng \ |
853 |
- app-admin/rsyslog |
854 |
-} |
855 |
|
856 |
diff --git a/sys-kernel/dracut/dracut-044.ebuild b/sys-kernel/dracut/dracut-044.ebuild |
857 |
deleted file mode 100644 |
858 |
index 8d1e45c63a..0000000000 |
859 |
--- a/sys-kernel/dracut/dracut-044.ebuild |
860 |
+++ /dev/null |
861 |
@@ -1,253 +0,0 @@ |
862 |
-# Copyright 1999-2016 Gentoo Foundation |
863 |
-# Distributed under the terms of the GNU General Public License v2 |
864 |
-# $Id$ |
865 |
- |
866 |
-EAPI=5 |
867 |
- |
868 |
-inherit bash-completion-r1 eutils linux-info multilib systemd |
869 |
- |
870 |
-DESCRIPTION="Generic initramfs generation tool" |
871 |
-HOMEPAGE="https://dracut.wiki.kernel.org" |
872 |
-SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.xz" |
873 |
-LICENSE="GPL-2" |
874 |
-SLOT="0" |
875 |
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
876 |
-IUSE="debug selinux systemd" |
877 |
- |
878 |
-RESTRICT="test" |
879 |
- |
880 |
-CDEPEND="virtual/udev |
881 |
- systemd? ( >=sys-apps/systemd-199 ) |
882 |
- " |
883 |
-RDEPEND="${CDEPEND} |
884 |
- app-arch/cpio |
885 |
- >=app-shells/bash-4.0 |
886 |
- >sys-apps/kmod-5[tools] |
887 |
- || ( |
888 |
- >=sys-apps/sysvinit-2.87-r3 |
889 |
- sys-apps/systemd[sysv-utils] |
890 |
- sys-apps/systemd-sysv-utils |
891 |
- ) |
892 |
- >=sys-apps/util-linux-2.21 |
893 |
- |
894 |
- debug? ( dev-util/strace ) |
895 |
- selinux? ( |
896 |
- sys-libs/libselinux |
897 |
- sys-libs/libsepol |
898 |
- sec-policy/selinux-dracut |
899 |
- ) |
900 |
- " |
901 |
-DEPEND="${CDEPEND} |
902 |
- app-text/asciidoc |
903 |
- >=dev-libs/libxslt-1.1.26 |
904 |
- app-text/docbook-xml-dtd:4.5 |
905 |
- >=app-text/docbook-xsl-stylesheets-1.75.2 |
906 |
- virtual/pkgconfig |
907 |
- " |
908 |
- |
909 |
-DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules |
910 |
- README.testsuite TODO ) |
911 |
-MY_LIBDIR=/usr/lib |
912 |
-QA_MULTILIB_PATHS=" |
913 |
- usr/lib/dracut/dracut-install |
914 |
- usr/lib/dracut/skipcpio |
915 |
- " |
916 |
- |
917 |
-# |
918 |
-# Helper functions |
919 |
-# |
920 |
- |
921 |
-# Removes module from modules.d. |
922 |
-# $1 = module name |
923 |
-# Module name can be specified without number prefix. |
924 |
-rm_module() { |
925 |
- local force m |
926 |
- [[ $1 = -f ]] && force=-f |
927 |
- |
928 |
- for m in $@; do |
929 |
- if [[ $m =~ ^[0-9][0-9][^\ ]*$ ]]; then |
930 |
- rm ${force} --interactive=never -r "${modules_dir}"/$m |
931 |
- else |
932 |
- rm ${force} --interactive=never -r "${modules_dir}"/[0-9][0-9]$m |
933 |
- fi |
934 |
- done |
935 |
-} |
936 |
- |
937 |
-src_prepare() { |
938 |
- local libdirs="/$(get_libdir) /usr/$(get_libdir)" |
939 |
- if [[ ${SYMLINK_LIB} = yes ]]; then |
940 |
- # Preserve lib -> lib64 symlinks in initramfs |
941 |
- [[ $libdirs =~ /lib\ ]] || libdirs+=" /lib /usr/lib" |
942 |
- fi |
943 |
- einfo "Setting libdirs to \"${libdirs}\" ..." |
944 |
- sed -e "3alibdirs=\"${libdirs}\"" \ |
945 |
- -i "${S}/dracut.conf.d/gentoo.conf.example" || die |
946 |
- |
947 |
- local udevdir="$("$(tc-getPKG_CONFIG)" udev --variable=udevdir)" |
948 |
- einfo "Setting udevdir to ${udevdir}..." |
949 |
- sed -r -e "s|^(udevdir=).*$|\1${udevdir}|" \ |
950 |
- -i "${S}/dracut.conf.d/gentoo.conf.example" || die |
951 |
- |
952 |
- if use systemd; then |
953 |
- local systemdutildir="$(systemd_get_utildir)" |
954 |
- local systemdsystemunitdir="$(systemd_get_unitdir)" |
955 |
- local systemdsystemconfdir="$("$(tc-getPKG_CONFIG)" systemd \ |
956 |
- --variable=systemdsystemconfdir)" |
957 |
- [[ ${systemdsystemconfdir} ]] \ |
958 |
- || systemdsystemconfdir=/etc/systemd/system |
959 |
- einfo "Setting systemdutildir to ${systemdutildir} and ..." |
960 |
- sed -e "5asystemdutildir=\"${systemdutildir}\"" \ |
961 |
- -i "${S}/dracut.conf.d/gentoo.conf.example" || die |
962 |
- einfo "Setting systemdsystemunitdir to ${systemdsystemunitdir} and..." |
963 |
- sed -e "6asystemdsystemunitdir=\"${systemdsystemunitdir}\"" \ |
964 |
- -i "${S}/dracut.conf.d/gentoo.conf.example" || die |
965 |
- einfo "Setting systemdsystemconfdir to ${systemdsystemconfdir}..." |
966 |
- sed -e "7asystemdsystemconfdir=\"${systemdsystemconfdir}\"" \ |
967 |
- -i "${S}/dracut.conf.d/gentoo.conf.example" || die |
968 |
- else |
969 |
- local systemdutildir="/lib/systemd" |
970 |
- einfo "Setting systemdutildir for standalone udev to" \ |
971 |
- "${systemdutildir}..." |
972 |
- sed -e "5asystemdutildir=\"${systemdutildir}\"" \ |
973 |
- -i "${S}/dracut.conf.d/gentoo.conf.example" || die |
974 |
- fi |
975 |
- |
976 |
- epatch_user |
977 |
-} |
978 |
- |
979 |
-src_configure() { |
980 |
- local myconf="--libdir=${MY_LIBDIR}" |
981 |
- myconf+=" --bashcompletiondir=$(get_bashcompdir)" |
982 |
- |
983 |
- if use systemd; then |
984 |
- myconf+=" --systemdsystemunitdir='$(systemd_get_unitdir)'" |
985 |
- fi |
986 |
- |
987 |
- econf ${myconf} |
988 |
-} |
989 |
- |
990 |
-src_compile() { |
991 |
- tc-export CC |
992 |
- emake doc install/dracut-install skipcpio/skipcpio |
993 |
-} |
994 |
- |
995 |
-src_install() { |
996 |
- default |
997 |
- |
998 |
- local my_libdir="${MY_LIBDIR}" |
999 |
- local dracutlibdir="${my_libdir#/}/dracut" |
1000 |
- |
1001 |
- echo "DRACUT_VERSION=$PVR" > "${D%/}/${dracutlibdir}/dracut-version.sh" |
1002 |
- |
1003 |
- insinto "${dracutlibdir}/dracut.conf.d/" |
1004 |
- newins dracut.conf.d/gentoo.conf.example gentoo.conf |
1005 |
- |
1006 |
- insinto /etc/logrotate.d |
1007 |
- newins dracut.logrotate dracut |
1008 |
- |
1009 |
- dodir /var/lib/dracut/overlay |
1010 |
- |
1011 |
- dohtml dracut.html |
1012 |
- |
1013 |
- if ! use systemd; then |
1014 |
- # Scripts in kernel/install.d are systemd-specific |
1015 |
- rm -r "${D%/}/${my_libdir}/kernel" || die |
1016 |
- fi |
1017 |
- |
1018 |
- # |
1019 |
- # Modules |
1020 |
- # |
1021 |
- local module |
1022 |
- modules_dir="${D%/}/${dracutlibdir}/modules.d" |
1023 |
- |
1024 |
- use debug || rm_module 95debug |
1025 |
- use selinux || rm_module 98selinux |
1026 |
- |
1027 |
- if use systemd; then |
1028 |
- # With systemd following modules do not make sense |
1029 |
- rm_module 96securityfs 97masterkey 98integrity |
1030 |
- else |
1031 |
- rm_module 00systemd 98dracut-systemd |
1032 |
- # Without systemd following modules do not make sense |
1033 |
- rm_module 00systemd-bootchart 01systemd-initrd 02systemd-networkd |
1034 |
- fi |
1035 |
- |
1036 |
- # Remove modules which won't work for sure |
1037 |
- rm_module 95fcoe # no tools |
1038 |
- # fips module depends on masked app-crypt/hmaccalc |
1039 |
- rm_module 01fips 02fips-aesni |
1040 |
-} |
1041 |
- |
1042 |
-pkg_postinst() { |
1043 |
- if linux-info_get_any_version && linux_config_exists; then |
1044 |
- ewarn "" |
1045 |
- ewarn "If the following test report contains a missing kernel" |
1046 |
- ewarn "configuration option, you should reconfigure and rebuild your" |
1047 |
- ewarn "kernel before booting image generated with this Dracut version." |
1048 |
- ewarn "" |
1049 |
- |
1050 |
- local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS" |
1051 |
- |
1052 |
- # Kernel configuration options descriptions: |
1053 |
- local desc_DEVTMPFS="Maintain a devtmpfs filesystem to mount at /dev" |
1054 |
- local desc_BLK_DEV_INITRD="Initial RAM filesystem and RAM disk "\ |
1055 |
-"(initramfs/initrd) support" |
1056 |
- |
1057 |
- local opt desc |
1058 |
- |
1059 |
- # Generate ERROR_* variables for check_extra_config. |
1060 |
- for opt in ${CONFIG_CHECK}; do |
1061 |
- opt=${opt#\~} |
1062 |
- desc=desc_${opt} |
1063 |
- eval "local ERROR_${opt}='CONFIG_${opt}: \"${!desc}\"" \ |
1064 |
- "is missing and REQUIRED'" |
1065 |
- done |
1066 |
- |
1067 |
- check_extra_config |
1068 |
- echo |
1069 |
- else |
1070 |
- ewarn "" |
1071 |
- ewarn "Your kernel configuration couldn't be checked. Do you have" |
1072 |
- ewarn "/usr/src/linux/.config file there? Please check manually if" |
1073 |
- ewarn "following options are enabled:" |
1074 |
- ewarn "" |
1075 |
- ewarn " CONFIG_BLK_DEV_INITRD" |
1076 |
- ewarn " CONFIG_DEVTMPFS" |
1077 |
- ewarn "" |
1078 |
- fi |
1079 |
- |
1080 |
- elog "To get additional features, a number of optional runtime" |
1081 |
- elog "dependencies may be installed:" |
1082 |
- elog "" |
1083 |
- optfeature "Networking support" net-misc/curl "net-misc/dhcp[client]" \ |
1084 |
- sys-apps/iproute2 |
1085 |
- optfeature \ |
1086 |
- "Measure performance of the boot process for later visualisation" \ |
1087 |
- app-benchmarks/bootchart2 app-admin/killproc sys-process/acct |
1088 |
- optfeature "Scan for Btrfs on block devices" sys-fs/btrfs-progs |
1089 |
- optfeature "Load kernel modules and drop this privilege for real init" \ |
1090 |
- sys-libs/libcap |
1091 |
- optfeature "Support CIFS" net-fs/cifs-utils |
1092 |
- optfeature "Decrypt devices encrypted with cryptsetup/LUKS" \ |
1093 |
- "sys-fs/cryptsetup[-static-libs]" |
1094 |
- optfeature "Support for GPG-encrypted keys for crypt module" \ |
1095 |
- app-crypt/gnupg |
1096 |
- optfeature \ |
1097 |
- "Allows use of dash instead of default bash (on your own risk)" \ |
1098 |
- app-shells/dash |
1099 |
- optfeature "Framebuffer splash (media-gfx/splashutils)" \ |
1100 |
- media-gfx/splashutils |
1101 |
- optfeature "Support iSCSI" sys-block/open-iscsi |
1102 |
- optfeature "Support Logical Volume Manager" sys-fs/lvm2 |
1103 |
- optfeature "Support MD devices, also known as software RAID devices" \ |
1104 |
- sys-fs/mdadm |
1105 |
- optfeature "Support Device Mapper multipathing" sys-fs/multipath-tools |
1106 |
- optfeature "Plymouth boot splash" '>=sys-boot/plymouth-0.8.5-r5' |
1107 |
- optfeature "Support network block devices" sys-block/nbd |
1108 |
- optfeature "Support NFS" net-fs/nfs-utils net-nds/rpcbind |
1109 |
- optfeature \ |
1110 |
- "Install ssh and scp along with config files and specified keys" \ |
1111 |
- net-misc/openssh |
1112 |
- optfeature "Enable logging with syslog-ng or rsyslog" app-admin/syslog-ng \ |
1113 |
- app-admin/rsyslog |
1114 |
-} |
1115 |
|
1116 |
diff --git a/sys-kernel/dracut/files/034-0001-dracut.sh-do-not-bail-out-if-kernel-mo.patch b/sys-kernel/dracut/files/034-0001-dracut.sh-do-not-bail-out-if-kernel-mo.patch |
1117 |
deleted file mode 100644 |
1118 |
index 7500ecfdb7..0000000000 |
1119 |
--- a/sys-kernel/dracut/files/034-0001-dracut.sh-do-not-bail-out-if-kernel-mo.patch |
1120 |
+++ /dev/null |
1121 |
@@ -1,42 +0,0 @@ |
1122 |
-From 45e5079d4be0ac1a977bc41dcda423fcfa3280fc Mon Sep 17 00:00:00 2001 |
1123 |
-From: Harald Hoyer <harald@××××××.com> |
1124 |
-Date: Tue, 8 Oct 2013 15:03:40 +0200 |
1125 |
-Subject: [PATCH 1/5] dracut.sh: do not bail out, if kernel modules dir is |
1126 |
- missing |
1127 |
- |
1128 |
-and only print a warning message |
1129 |
---- |
1130 |
- dracut.sh | 11 ++++++----- |
1131 |
- 1 file changed, 6 insertions(+), 5 deletions(-) |
1132 |
- |
1133 |
-diff --git a/dracut.sh b/dracut.sh |
1134 |
-index e135dfc..d9533dd 100755 |
1135 |
---- a/dracut.sh |
1136 |
-+++ b/dracut.sh |
1137 |
-@@ -496,17 +496,18 @@ if [[ $regenerate_all == "yes" ]]; then |
1138 |
- ((ret+=$?)) |
1139 |
- done |
1140 |
- exit $ret |
1141 |
--elif [[ $kernel ]]; then |
1142 |
-- if ! [[ -d /lib/modules/$kernel ]] && [[ $no_kernel != yes ]]; then |
1143 |
-- printf -- "Kernel version $kernel has no modules in /lib/modules/$kernel\n" >&2 |
1144 |
-- exit 1 |
1145 |
-- fi |
1146 |
- fi |
1147 |
- |
1148 |
- if ! [[ $kernel ]]; then |
1149 |
- kernel=$(uname -r) |
1150 |
- fi |
1151 |
- |
1152 |
-+if [[ $kernel ]]; then |
1153 |
-+ if ! [[ -d /lib/modules/$kernel ]] && [[ $no_kernel != yes ]]; then |
1154 |
-+ printf -- "Kernel version $kernel has no module directory /lib/modules/$kernel\n" >&2 |
1155 |
-+ fi |
1156 |
-+fi |
1157 |
-+ |
1158 |
- if ! [[ $outfile ]]; then |
1159 |
- [[ -f /etc/machine-id ]] && read MACHINE_ID < /etc/machine-id |
1160 |
- |
1161 |
--- |
1162 |
-1.8.3.2 |
1163 |
- |
1164 |
|
1165 |
diff --git a/sys-kernel/dracut/files/034-0002-dracut-functions.sh-support-for-altern.patch b/sys-kernel/dracut/files/034-0002-dracut-functions.sh-support-for-altern.patch |
1166 |
deleted file mode 100644 |
1167 |
index acb2db7677..0000000000 |
1168 |
--- a/sys-kernel/dracut/files/034-0002-dracut-functions.sh-support-for-altern.patch |
1169 |
+++ /dev/null |
1170 |
@@ -1,41 +0,0 @@ |
1171 |
-From c5a2f35eb2a90d8787d127b44cb6b5e0536d16ce Mon Sep 17 00:00:00 2001 |
1172 |
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@×××××××.name> |
1173 |
-Date: Sun, 6 Jan 2013 13:35:01 +0100 |
1174 |
-Subject: [PATCH 2/5] dracut-functions.sh: support for alternative udev dirs - |
1175 |
- udevaltdirs |
1176 |
- |
1177 |
-It is required for Gentoo which moves udev from / to /usr and supports |
1178 |
-both /lib/udev and /usr/lib/udev for compatibility with other packages. |
1179 |
- |
1180 |
-Credits go to Alexander Tsoy <alexander@××××.me>. |
1181 |
- |
1182 |
-Conflicts: |
1183 |
- dracut-functions.sh |
1184 |
---- |
1185 |
- dracut-functions.sh | 10 ++++++++++ |
1186 |
- 1 file changed, 10 insertions(+) |
1187 |
- |
1188 |
-diff --git a/dracut-functions.sh b/dracut-functions.sh |
1189 |
-index 45e0911..c1cbdeb 100755 |
1190 |
---- a/dracut-functions.sh |
1191 |
-+++ b/dracut-functions.sh |
1192 |
-@@ -872,6 +872,16 @@ inst_rules() { |
1193 |
- inst_dir "$_target" |
1194 |
- for _rule in "$@"; do |
1195 |
- if [ "${_rule#/}" = "$_rule" ]; then |
1196 |
-+ for r in ${udevaltdirs}; do |
1197 |
-+ [[ "$r" = "${udevdir}" ]] && continue |
1198 |
-+ if [[ -e $r/rules.d/$_rule ]]; then |
1199 |
-+ _found="$r/rules.d/$_rule" |
1200 |
-+ inst_rule_programs "$_found" |
1201 |
-+ inst_rule_group_owner "$_found" |
1202 |
-+ inst_rule_initqueue "$_found" |
1203 |
-+ inst_simple "$_found" "${udevdir}/rules.d/${_found##*/}" |
1204 |
-+ fi |
1205 |
-+ done |
1206 |
- for r in ${udevdir}/rules.d ${hostonly:+/etc/udev/rules.d}; do |
1207 |
- if [[ -e $r/$_rule ]]; then |
1208 |
- _found="$r/$_rule" |
1209 |
--- |
1210 |
-1.8.3.2 |
1211 |
- |
1212 |
|
1213 |
diff --git a/sys-kernel/dracut/files/034-0003-gentoo.conf-let-udevdir-be-handled-by-.patch b/sys-kernel/dracut/files/034-0003-gentoo.conf-let-udevdir-be-handled-by-.patch |
1214 |
deleted file mode 100644 |
1215 |
index e5bee434ef..0000000000 |
1216 |
--- a/sys-kernel/dracut/files/034-0003-gentoo.conf-let-udevdir-be-handled-by-.patch |
1217 |
+++ /dev/null |
1218 |
@@ -1,30 +0,0 @@ |
1219 |
-From 29ade4d78b7609877659aa5938b3fba2954ce415 Mon Sep 17 00:00:00 2001 |
1220 |
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@×××××××.name> |
1221 |
-Date: Sun, 16 Dec 2012 20:02:48 +0100 |
1222 |
-Subject: [PATCH 3/5] gentoo.conf: let udevdir= be handled by pkg-config and |
1223 |
- use udevaltdirs |
1224 |
- |
1225 |
-To avoid need of rebuild after udev update/downgrade let udevdir= be set |
1226 |
-dynamically with pkg-config. Use udevaltdirs to search for rules both |
1227 |
-in old and new locations. |
1228 |
---- |
1229 |
- dracut.conf.d/gentoo.conf.example | 3 ++- |
1230 |
- 1 file changed, 2 insertions(+), 1 deletion(-) |
1231 |
- |
1232 |
-diff --git a/dracut.conf.d/gentoo.conf.example b/dracut.conf.d/gentoo.conf.example |
1233 |
-index 26e7314..f9617f0 100644 |
1234 |
---- a/dracut.conf.d/gentoo.conf.example |
1235 |
-+++ b/dracut.conf.d/gentoo.conf.example |
1236 |
-@@ -1,7 +1,8 @@ |
1237 |
- # /etc/dracut.conf.d/gentoo.conf |
1238 |
- # dracut config file customized for Gentoo Base System release 2 |
1239 |
- |
1240 |
--udevdir=/lib/udev |
1241 |
-+udevdir= |
1242 |
-+udevaltdirs="/lib/udev /usr/lib/udev" |
1243 |
- ro_mnt=yes |
1244 |
- |
1245 |
- # |
1246 |
--- |
1247 |
-1.8.3.2 |
1248 |
- |
1249 |
|
1250 |
diff --git a/sys-kernel/dracut/files/034-0004-Use-the-same-paths-in-dracut.sh-as-tho.patch b/sys-kernel/dracut/files/034-0004-Use-the-same-paths-in-dracut.sh-as-tho.patch |
1251 |
deleted file mode 100644 |
1252 |
index dec964e5a8..0000000000 |
1253 |
--- a/sys-kernel/dracut/files/034-0004-Use-the-same-paths-in-dracut.sh-as-tho.patch |
1254 |
+++ /dev/null |
1255 |
@@ -1,74 +0,0 @@ |
1256 |
-From 6660721bd34b7a25026ffc6a6df4cdfdc8742ed3 Mon Sep 17 00:00:00 2001 |
1257 |
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@×××××××.name> |
1258 |
-Date: Wed, 2 Oct 2013 22:37:09 +0200 |
1259 |
-Subject: [PATCH 4/5] Use the same paths in dracut.sh as those set with |
1260 |
- configure script |
1261 |
- |
1262 |
-Makefile alters destination main dracut script and sets dracutbasedir to |
1263 |
-the value of pkglibdir set in configure. |
1264 |
---- |
1265 |
- Makefile | 3 +++ |
1266 |
- dracut.sh | 9 ++++----- |
1267 |
- 2 files changed, 7 insertions(+), 5 deletions(-) |
1268 |
- |
1269 |
-diff --git a/Makefile b/Makefile |
1270 |
-index 124a41b..ea504f5 100644 |
1271 |
---- a/Makefile |
1272 |
-+++ b/Makefile |
1273 |
-@@ -91,6 +91,9 @@ install: dracut-version.sh |
1274 |
- mkdir -p $(DESTDIR)$(pkglibdir)/modules.d |
1275 |
- mkdir -p $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man7 $(DESTDIR)$(mandir)/man8 |
1276 |
- install -m 0755 dracut.sh $(DESTDIR)$(bindir)/dracut |
1277 |
-+ sed -r \ |
1278 |
-+ -e "s|^(pkglibdir)=.*|\1=$(pkglibdir)|" \ |
1279 |
-+ -i $(DESTDIR)$(bindir)/dracut |
1280 |
- install -m 0755 dracut-catimages.sh $(DESTDIR)$(bindir)/dracut-catimages |
1281 |
- install -m 0755 mkinitrd-dracut.sh $(DESTDIR)$(bindir)/mkinitrd |
1282 |
- install -m 0755 lsinitrd.sh $(DESTDIR)$(bindir)/lsinitrd |
1283 |
-diff --git a/dracut.sh b/dracut.sh |
1284 |
-index d9533dd..cf18c81 100755 |
1285 |
---- a/dracut.sh |
1286 |
-+++ b/dracut.sh |
1287 |
-@@ -26,10 +26,13 @@ |
1288 |
- # store for logging |
1289 |
- dracut_args=( "$@" ) |
1290 |
- |
1291 |
-+# base dirs |
1292 |
-+pkglibdir=/usr/lib/dracut |
1293 |
-+dracutbasedir="$pkglibdir" |
1294 |
-+ |
1295 |
- set -o pipefail |
1296 |
- |
1297 |
- usage() { |
1298 |
-- [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut |
1299 |
- if [[ -f $dracutbasedir/dracut-version.sh ]]; then |
1300 |
- . $dracutbasedir/dracut-version.sh |
1301 |
- fi |
1302 |
-@@ -54,7 +57,6 @@ EOF |
1303 |
- } |
1304 |
- |
1305 |
- long_usage() { |
1306 |
-- [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut |
1307 |
- if [[ -f $dracutbasedir/dracut-version.sh ]]; then |
1308 |
- . $dracutbasedir/dracut-version.sh |
1309 |
- fi |
1310 |
-@@ -549,8 +551,6 @@ export DRACUT_LOG_LEVEL=warning |
1311 |
- debug=yes |
1312 |
- } |
1313 |
- |
1314 |
--[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut |
1315 |
-- |
1316 |
- # if we were not passed a config file, try the default one |
1317 |
- if [[ ! -f $conffile ]]; then |
1318 |
- if [[ $allowlocal ]]; then |
1319 |
-@@ -669,7 +669,6 @@ stdloglvl=$((stdloglvl + verbosity_mod_l)) |
1320 |
- [[ $use_fstab_l ]] && use_fstab=$use_fstab_l |
1321 |
- [[ $mdadmconf_l ]] && mdadmconf=$mdadmconf_l |
1322 |
- [[ $lvmconf_l ]] && lvmconf=$lvmconf_l |
1323 |
--[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut |
1324 |
- [[ $fw_dir ]] || fw_dir="/lib/firmware/updates /lib/firmware" |
1325 |
- [[ $tmpdir_l ]] && tmpdir="$tmpdir_l" |
1326 |
- [[ $tmpdir ]] || tmpdir=/var/tmp |
1327 |
--- |
1328 |
-1.8.3.2 |
1329 |
- |
1330 |
|
1331 |
diff --git a/sys-kernel/dracut/files/034-0005-Install-dracut-install-into-libexec-di.patch b/sys-kernel/dracut/files/034-0005-Install-dracut-install-into-libexec-di.patch |
1332 |
deleted file mode 100644 |
1333 |
index 6af99197ed..0000000000 |
1334 |
--- a/sys-kernel/dracut/files/034-0005-Install-dracut-install-into-libexec-di.patch |
1335 |
+++ /dev/null |
1336 |
@@ -1,81 +0,0 @@ |
1337 |
-From 80dbe6dfbdb2cd3475006e210fe057dceb81ddf2 Mon Sep 17 00:00:00 2001 |
1338 |
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@×××××××.name> |
1339 |
-Date: Wed, 2 Oct 2013 22:40:43 +0200 |
1340 |
-Subject: [PATCH 5/5] Install dracut-install into libexec dir instead of lib |
1341 |
- dir |
1342 |
- |
1343 |
-dracut-install script is the only thing ABI specific atm. |
1344 |
- |
1345 |
-See https://bugs.gentoo.org/show_bug.cgi?id=485218 for details on the |
1346 |
-problem. |
1347 |
---- |
1348 |
- Makefile | 4 +++- |
1349 |
- configure | 1 + |
1350 |
- dracut-functions.sh | 4 ++++ |
1351 |
- dracut.sh | 1 + |
1352 |
- 4 files changed, 9 insertions(+), 1 deletion(-) |
1353 |
- |
1354 |
-diff --git a/Makefile b/Makefile |
1355 |
-index ea504f5..e004a79 100644 |
1356 |
---- a/Makefile |
1357 |
-+++ b/Makefile |
1358 |
-@@ -92,6 +92,7 @@ install: dracut-version.sh |
1359 |
- mkdir -p $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man7 $(DESTDIR)$(mandir)/man8 |
1360 |
- install -m 0755 dracut.sh $(DESTDIR)$(bindir)/dracut |
1361 |
- sed -r \ |
1362 |
-+ -e "s|^(libexecdir)=.*|\1=$(libexecdir)|" \ |
1363 |
- -e "s|^(pkglibdir)=.*|\1=$(pkglibdir)|" \ |
1364 |
- -i $(DESTDIR)$(bindir)/dracut |
1365 |
- install -m 0755 dracut-catimages.sh $(DESTDIR)$(bindir)/dracut-catimages |
1366 |
-@@ -135,7 +136,8 @@ endif |
1367 |
- done \ |
1368 |
- fi |
1369 |
- if [ -f install/dracut-install ]; then \ |
1370 |
-- install -m 0755 install/dracut-install $(DESTDIR)$(pkglibdir)/dracut-install; \ |
1371 |
-+ mkdir -p $(DESTDIR)$(libexecdir); \ |
1372 |
-+ install -m 0755 install/dracut-install $(DESTDIR)$(libexecdir)/dracut-install; \ |
1373 |
- fi |
1374 |
- mkdir -p $(DESTDIR)${prefix}/lib/kernel/install.d |
1375 |
- install -m 0755 50-dracut.install $(DESTDIR)${prefix}/lib/kernel/install.d/50-dracut.install |
1376 |
-diff --git a/configure b/configure |
1377 |
-index 19b5e1f..d2ffc2c 100755 |
1378 |
---- a/configure |
1379 |
-+++ b/configure |
1380 |
-@@ -61,6 +61,7 @@ sbindir ?= ${sbindir:-${prefix}/sbin} |
1381 |
- mandir ?= ${mandir:-${prefix}/share/man} |
1382 |
- enable_documentation ?= ${enable_documentation:-yes} |
1383 |
- bindir ?= ${bindir:-${prefix}/bin} |
1384 |
-+libexecdir ?= ${libexecdir:-${prefix}/libexec} |
1385 |
- EOF |
1386 |
- |
1387 |
- { |
1388 |
-diff --git a/dracut-functions.sh b/dracut-functions.sh |
1389 |
-index c1cbdeb..72b7f1b 100755 |
1390 |
---- a/dracut-functions.sh |
1391 |
-+++ b/dracut-functions.sh |
1392 |
-@@ -694,6 +694,10 @@ if ! [[ $DRACUT_INSTALL ]]; then |
1393 |
- DRACUT_INSTALL=$(find_binary dracut-install) |
1394 |
- fi |
1395 |
- |
1396 |
-+if ! [[ $DRACUT_INSTALL ]] && [[ -x $libexecdir/dracut-install ]]; then |
1397 |
-+ DRACUT_INSTALL=$libexecdir/dracut-install |
1398 |
-+fi |
1399 |
-+ |
1400 |
- if ! [[ $DRACUT_INSTALL ]] && [[ -x $dracutbasedir/dracut-install ]]; then |
1401 |
- DRACUT_INSTALL=$dracutbasedir/dracut-install |
1402 |
- fi |
1403 |
-diff --git a/dracut.sh b/dracut.sh |
1404 |
-index cf18c81..e28b929 100755 |
1405 |
---- a/dracut.sh |
1406 |
-+++ b/dracut.sh |
1407 |
-@@ -27,6 +27,7 @@ |
1408 |
- dracut_args=( "$@" ) |
1409 |
- |
1410 |
- # base dirs |
1411 |
-+libexecdir=/usr/libexec |
1412 |
- pkglibdir=/usr/lib/dracut |
1413 |
- dracutbasedir="$pkglibdir" |
1414 |
- |
1415 |
--- |
1416 |
-1.8.3.2 |
1417 |
- |
1418 |
|
1419 |
diff --git a/sys-kernel/dracut/files/034-0006-resume-fix-swap-detection-in-hostonly.patch b/sys-kernel/dracut/files/034-0006-resume-fix-swap-detection-in-hostonly.patch |
1420 |
deleted file mode 100644 |
1421 |
index e97780c259..0000000000 |
1422 |
--- a/sys-kernel/dracut/files/034-0006-resume-fix-swap-detection-in-hostonly.patch |
1423 |
+++ /dev/null |
1424 |
@@ -1,31 +0,0 @@ |
1425 |
-From 0c89bcc27516803d68444488ede3d513ba982039 Mon Sep 17 00:00:00 2001 |
1426 |
-From: Alexander Tsoy <alexander@××××.me> |
1427 |
-Date: Wed, 9 Oct 2013 06:39:46 +0400 |
1428 |
-Subject: [PATCH 6/6] resume: fix swap detection in hostonly |
1429 |
- |
1430 |
-Check for other possible fs types. This fixes swap detection when using |
1431 |
-TuxOnIce kernel. |
1432 |
- |
1433 |
-Note that parse-resume.sh generate udev rules with support for |
1434 |
-ID_FS_TYPE=suspend, but we do not include it here, because it is |
1435 |
-libvolume_id thing and host_fs_types is populated using blkid. |
1436 |
---- |
1437 |
- modules.d/95resume/module-setup.sh | 2 +- |
1438 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
1439 |
- |
1440 |
-diff --git a/modules.d/95resume/module-setup.sh b/modules.d/95resume/module-setup.sh |
1441 |
-index 518ebf0..a1ddb46 100755 |
1442 |
---- a/modules.d/95resume/module-setup.sh |
1443 |
-+++ b/modules.d/95resume/module-setup.sh |
1444 |
-@@ -6,7 +6,7 @@ check() { |
1445 |
- # No point trying to support resume, if no swap partition exist |
1446 |
- [[ $hostonly ]] || [[ $mount_needs ]] && { |
1447 |
- for fs in "${host_fs_types[@]}"; do |
1448 |
-- [[ $fs = swap ]] && return 0 |
1449 |
-+ [[ $fs =~ ^(swap|swsuspend|swsupend)$ ]] && return 0 |
1450 |
- done |
1451 |
- return 255 |
1452 |
- } |
1453 |
--- |
1454 |
-1.8.3.2 |
1455 |
- |
1456 |
|
1457 |
diff --git a/sys-kernel/dracut/files/034-0007-dracut.sh-also-mkdir-run-lock-which-is.patch b/sys-kernel/dracut/files/034-0007-dracut.sh-also-mkdir-run-lock-which-is.patch |
1458 |
deleted file mode 100644 |
1459 |
index 0cf2586ed4..0000000000 |
1460 |
--- a/sys-kernel/dracut/files/034-0007-dracut.sh-also-mkdir-run-lock-which-is.patch |
1461 |
+++ /dev/null |
1462 |
@@ -1,25 +0,0 @@ |
1463 |
-From be723725cd6ea1c41b52c1bff5a569eb8cd0c76d Mon Sep 17 00:00:00 2001 |
1464 |
-From: Harald Hoyer <harald@××××××.com> |
1465 |
-Date: Wed, 16 Oct 2013 11:31:54 +0200 |
1466 |
-Subject: [PATCH 07/12] dracut.sh: also mkdir /run/lock, which is copied to |
1467 |
- |
1468 |
---- |
1469 |
- dracut.sh | 2 +- |
1470 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
1471 |
- |
1472 |
-diff --git a/dracut.sh b/dracut.sh |
1473 |
-index e28b929..309aa7d 100755 |
1474 |
---- a/dracut.sh |
1475 |
-+++ b/dracut.sh |
1476 |
-@@ -1081,7 +1081,7 @@ if [[ $kernel_only != yes ]]; then |
1477 |
- fi |
1478 |
- done |
1479 |
- |
1480 |
-- for d in dev proc sys sysroot root run run/lock run/initramfs; do |
1481 |
-+ for d in dev proc sys sysroot root run run/log run/lock run/initramfs; do |
1482 |
- if [ -L "/$d" ]; then |
1483 |
- inst_symlink "/$d" |
1484 |
- else |
1485 |
--- |
1486 |
-1.8.4.3 |
1487 |
- |
1488 |
|
1489 |
diff --git a/sys-kernel/dracut/files/034-0008-dracut.sh-no-need-to-make-subdirs-in-r.patch b/sys-kernel/dracut/files/034-0008-dracut.sh-no-need-to-make-subdirs-in-r.patch |
1490 |
deleted file mode 100644 |
1491 |
index 380411cc5f..0000000000 |
1492 |
--- a/sys-kernel/dracut/files/034-0008-dracut.sh-no-need-to-make-subdirs-in-r.patch |
1493 |
+++ /dev/null |
1494 |
@@ -1,25 +0,0 @@ |
1495 |
-From 34712f015f13221b653a1ed2ee75804f06a22357 Mon Sep 17 00:00:00 2001 |
1496 |
-From: Harald Hoyer <harald@××××××.com> |
1497 |
-Date: Wed, 16 Oct 2013 11:39:17 +0200 |
1498 |
-Subject: [PATCH 08/12] dracut.sh: no need to make subdirs in run |
1499 |
- |
1500 |
---- |
1501 |
- dracut.sh | 2 +- |
1502 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
1503 |
- |
1504 |
-diff --git a/dracut.sh b/dracut.sh |
1505 |
-index 309aa7d..4f58eed 100755 |
1506 |
---- a/dracut.sh |
1507 |
-+++ b/dracut.sh |
1508 |
-@@ -1081,7 +1081,7 @@ if [[ $kernel_only != yes ]]; then |
1509 |
- fi |
1510 |
- done |
1511 |
- |
1512 |
-- for d in dev proc sys sysroot root run run/log run/lock run/initramfs; do |
1513 |
-+ for d in dev proc sys sysroot root run; do |
1514 |
- if [ -L "/$d" ]; then |
1515 |
- inst_symlink "/$d" |
1516 |
- else |
1517 |
--- |
1518 |
-1.8.4.3 |
1519 |
- |
1520 |
|
1521 |
diff --git a/sys-kernel/dracut/files/034-0009-lvm-install-thin-utils-for-non-hostonl.patch b/sys-kernel/dracut/files/034-0009-lvm-install-thin-utils-for-non-hostonl.patch |
1522 |
deleted file mode 100644 |
1523 |
index 8bf0f7c398..0000000000 |
1524 |
--- a/sys-kernel/dracut/files/034-0009-lvm-install-thin-utils-for-non-hostonl.patch |
1525 |
+++ /dev/null |
1526 |
@@ -1,41 +0,0 @@ |
1527 |
-From bd3303000b32cb500b2d769c6852784a807cee47 Mon Sep 17 00:00:00 2001 |
1528 |
-From: Harald Hoyer <harald@××××××.com> |
1529 |
-Date: Tue, 8 Oct 2013 10:30:00 +0200 |
1530 |
-Subject: [PATCH 09/12] lvm: install thin utils for non-hostonly |
1531 |
- |
1532 |
---- |
1533 |
- modules.d/90lvm/module-setup.sh | 18 +++++++++++------- |
1534 |
- 1 file changed, 11 insertions(+), 7 deletions(-) |
1535 |
- |
1536 |
-diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh |
1537 |
-index f98ffff..514addc 100755 |
1538 |
---- a/modules.d/90lvm/module-setup.sh |
1539 |
-+++ b/modules.d/90lvm/module-setup.sh |
1540 |
-@@ -52,13 +52,17 @@ install() { |
1541 |
- |
1542 |
- inst lvm |
1543 |
- |
1544 |
-- get_host_lvs | while read line; do |
1545 |
-- printf "%s" " rd.lvm.lv=$line" |
1546 |
-- if ! [[ $_needthin ]]; then |
1547 |
-- [[ "$(lvs --noheadings -o segtype ${line%%/*} 2>/dev/null)" == *thin* ]] && _needthin=1 |
1548 |
-- fi |
1549 |
-- done >> "${initdir}/etc/cmdline.d/90lvm.conf" |
1550 |
-- echo >> "${initdir}/etc/cmdline.d/90lvm.conf" |
1551 |
-+ if [[ $hostonly ]]; then |
1552 |
-+ get_host_lvs | while read line; do |
1553 |
-+ printf "%s" " rd.lvm.lv=$line" |
1554 |
-+ if ! [[ $_needthin ]]; then |
1555 |
-+ [[ "$(lvs --noheadings -o segtype ${line%%/*} 2>/dev/null)" == *thin* ]] && _needthin=1 |
1556 |
-+ fi |
1557 |
-+ done >> "${initdir}/etc/cmdline.d/90lvm.conf" |
1558 |
-+ echo >> "${initdir}/etc/cmdline.d/90lvm.conf" |
1559 |
-+ else |
1560 |
-+ _needthin=1 |
1561 |
-+ fi |
1562 |
- |
1563 |
- inst_rules "$moddir/64-lvm.rules" |
1564 |
- |
1565 |
--- |
1566 |
-1.8.4.3 |
1567 |
- |
1568 |
|
1569 |
diff --git a/sys-kernel/dracut/files/034-0011-lvm-fix-thin-recognition.patch b/sys-kernel/dracut/files/034-0011-lvm-fix-thin-recognition.patch |
1570 |
deleted file mode 100644 |
1571 |
index b2dfc77781..0000000000 |
1572 |
--- a/sys-kernel/dracut/files/034-0011-lvm-fix-thin-recognition.patch |
1573 |
+++ /dev/null |
1574 |
@@ -1,40 +0,0 @@ |
1575 |
-From a70dff7f103b27d5b7016e13a64c7710c61dc96e Mon Sep 17 00:00:00 2001 |
1576 |
-From: Harald Hoyer <harald@××××××.com> |
1577 |
-Date: Wed, 16 Oct 2013 11:30:08 +0200 |
1578 |
-Subject: [PATCH 11/12] lvm: fix thin recognition |
1579 |
- |
1580 |
-The global var setting was happening in a pipe and did not have an |
1581 |
-effect. |
1582 |
- |
1583 |
-Use <<<$() instead. |
1584 |
- |
1585 |
-< <() cannot be used, because dracut is called in chroot's environments, |
1586 |
-where /dev/fd does not point to /proc/self/fd, but bash wants |
1587 |
-/dev/fd/<num> for this construct. |
1588 |
---- |
1589 |
- modules.d/90lvm/module-setup.sh | 5 +++-- |
1590 |
- 1 file changed, 3 insertions(+), 2 deletions(-) |
1591 |
- |
1592 |
-diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh |
1593 |
-index f8b598d..cbdf4a2 100755 |
1594 |
---- a/modules.d/90lvm/module-setup.sh |
1595 |
-+++ b/modules.d/90lvm/module-setup.sh |
1596 |
-@@ -57,12 +57,13 @@ install() { |
1597 |
- inst lvm |
1598 |
- |
1599 |
- if [[ $hostonly ]]; then |
1600 |
-- get_host_lvs | while read line; do |
1601 |
-+ while read line; do |
1602 |
-+ [[ -n "$line" ]] || continue |
1603 |
- printf "%s" " rd.lvm.lv=$line" |
1604 |
- if ! [[ $_needthin ]]; then |
1605 |
- [[ "$(lvs --noheadings -o segtype ${line%%/*} 2>/dev/null)" == *thin* ]] && _needthin=1 |
1606 |
- fi |
1607 |
-- done >> "${initdir}/etc/cmdline.d/90lvm.conf" |
1608 |
-+ done <<<$(get_host_lvs) >> "${initdir}/etc/cmdline.d/90lvm.conf" |
1609 |
- echo >> "${initdir}/etc/cmdline.d/90lvm.conf" |
1610 |
- else |
1611 |
- _needthin=1 |
1612 |
--- |
1613 |
-1.8.4.3 |
1614 |
- |
1615 |
|
1616 |
diff --git a/sys-kernel/dracut/files/034-0012-lvm-always-install-thin-utils-for-lvm.patch b/sys-kernel/dracut/files/034-0012-lvm-always-install-thin-utils-for-lvm.patch |
1617 |
deleted file mode 100644 |
1618 |
index 074566b69a..0000000000 |
1619 |
--- a/sys-kernel/dracut/files/034-0012-lvm-always-install-thin-utils-for-lvm.patch |
1620 |
+++ /dev/null |
1621 |
@@ -1,79 +0,0 @@ |
1622 |
-From 615071016ecfa223b2744fc17e137de780167115 Mon Sep 17 00:00:00 2001 |
1623 |
-From: Harald Hoyer <harald@××××××.com> |
1624 |
-Date: Mon, 21 Oct 2013 09:09:26 +0200 |
1625 |
-Subject: [PATCH 12/12] lvm: always install thin utils for lvm |
1626 |
- |
1627 |
---- |
1628 |
- modules.d/90lvm/module-setup.sh | 33 +++++++-------------------------- |
1629 |
- 1 file changed, 7 insertions(+), 26 deletions(-) |
1630 |
- |
1631 |
-diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh |
1632 |
-index cbdf4a2..87374da 100755 |
1633 |
---- a/modules.d/90lvm/module-setup.sh |
1634 |
-+++ b/modules.d/90lvm/module-setup.sh |
1635 |
-@@ -24,7 +24,8 @@ depends() { |
1636 |
- return 0 |
1637 |
- } |
1638 |
- |
1639 |
--get_host_lvs() { |
1640 |
-+# called by dracut |
1641 |
-+cmdline() { |
1642 |
- local _activated |
1643 |
- declare -A _activated |
1644 |
- |
1645 |
-@@ -37,37 +38,20 @@ get_host_lvs() { |
1646 |
- eval $(dmsetup splitname --nameprefixes --noheadings --rows "$dev" 2>/dev/null) |
1647 |
- [[ ${DM_VG_NAME} ]] && [[ ${DM_LV_NAME} ]] || return 1 |
1648 |
- if ! [[ ${_activated[${DM_VG_NAME}/${DM_LV_NAME}]} ]]; then |
1649 |
-- printf "%s\n" "${DM_VG_NAME}/${DM_LV_NAME} " |
1650 |
-+ printf " rd.lvm.lv=%s\n" "${DM_VG_NAME}/${DM_LV_NAME} " |
1651 |
- _activated["${DM_VG_NAME}/${DM_LV_NAME}"]=1 |
1652 |
- fi |
1653 |
- done |
1654 |
- } |
1655 |
- |
1656 |
- # called by dracut |
1657 |
--cmdline() { |
1658 |
-- get_host_lvs | while read line; do |
1659 |
-- printf " rd.lvm.lv=$line" |
1660 |
-- done |
1661 |
--} |
1662 |
-- |
1663 |
--# called by dracut |
1664 |
- install() { |
1665 |
-- local _i _needthin |
1666 |
-+ local _i |
1667 |
- |
1668 |
- inst lvm |
1669 |
- |
1670 |
-- if [[ $hostonly ]]; then |
1671 |
-- while read line; do |
1672 |
-- [[ -n "$line" ]] || continue |
1673 |
-- printf "%s" " rd.lvm.lv=$line" |
1674 |
-- if ! [[ $_needthin ]]; then |
1675 |
-- [[ "$(lvs --noheadings -o segtype ${line%%/*} 2>/dev/null)" == *thin* ]] && _needthin=1 |
1676 |
-- fi |
1677 |
-- done <<<$(get_host_lvs) >> "${initdir}/etc/cmdline.d/90lvm.conf" |
1678 |
-- echo >> "${initdir}/etc/cmdline.d/90lvm.conf" |
1679 |
-- else |
1680 |
-- _needthin=1 |
1681 |
-- fi |
1682 |
-+ cmdline >> "${initdir}/etc/cmdline.d/90lvm.conf" |
1683 |
-+ echo >> "${initdir}/etc/cmdline.d/90lvm.conf" |
1684 |
- |
1685 |
- inst_rules "$moddir/64-lvm.rules" |
1686 |
- |
1687 |
-@@ -103,9 +87,6 @@ install() { |
1688 |
- |
1689 |
- inst_libdir_file "libdevmapper-event-lvm*.so" |
1690 |
- |
1691 |
-- if [[ $_needthin ]]; then |
1692 |
-- inst_multiple -o thin_dump thin_restore thin_check thin_repair |
1693 |
-- fi |
1694 |
-- |
1695 |
-+ inst_multiple -o thin_dump thin_restore thin_check thin_repair |
1696 |
- } |
1697 |
- |
1698 |
--- |
1699 |
-1.8.4.3 |
1700 |
- |
1701 |
|
1702 |
diff --git a/sys-kernel/dracut/files/034-0013-usrmount-always-install.patch b/sys-kernel/dracut/files/034-0013-usrmount-always-install.patch |
1703 |
deleted file mode 100644 |
1704 |
index 55fd87c1b0..0000000000 |
1705 |
--- a/sys-kernel/dracut/files/034-0013-usrmount-always-install.patch |
1706 |
+++ /dev/null |
1707 |
@@ -1,31 +0,0 @@ |
1708 |
-From ffbe30d1e1e9fb09136bfc2d29a3cc65292b5690 Mon Sep 17 00:00:00 2001 |
1709 |
-From: Alexander Tsoy <alexander@××××.me> |
1710 |
-Date: Thu, 21 Nov 2013 20:33:38 +0400 |
1711 |
-Subject: [PATCH 13/13] usrmount: always install |
1712 |
- |
1713 |
-/usr should be mounted by initramfs even if /sbin/init lives in / |
1714 |
- |
1715 |
-Conflicts: |
1716 |
- modules.d/98usrmount/module-setup.sh |
1717 |
---- |
1718 |
- modules.d/98usrmount/module-setup.sh | 3 --- |
1719 |
- 1 file changed, 3 deletions(-) |
1720 |
- |
1721 |
-diff --git a/modules.d/98usrmount/module-setup.sh b/modules.d/98usrmount/module-setup.sh |
1722 |
-index 1af789f..31a6229 100755 |
1723 |
---- a/modules.d/98usrmount/module-setup.sh |
1724 |
-+++ b/modules.d/98usrmount/module-setup.sh |
1725 |
-@@ -4,10 +4,7 @@ |
1726 |
- |
1727 |
- # called by dracut |
1728 |
- check() { |
1729 |
-- local _init |
1730 |
- [[ $mount_needs ]] && return 1 |
1731 |
-- _init=$(readlink -f /sbin/init) |
1732 |
-- [[ "$init" == "${init##/usr}" ]] && return 255 |
1733 |
- return 0 |
1734 |
- } |
1735 |
- |
1736 |
--- |
1737 |
-1.8.4.4 |
1738 |
- |
1739 |
|
1740 |
diff --git a/sys-kernel/dracut/files/034-0014-udev-rules-add-eudev-rules.patch b/sys-kernel/dracut/files/034-0014-udev-rules-add-eudev-rules.patch |
1741 |
deleted file mode 100644 |
1742 |
index 0b3fc39d2f..0000000000 |
1743 |
--- a/sys-kernel/dracut/files/034-0014-udev-rules-add-eudev-rules.patch |
1744 |
+++ /dev/null |
1745 |
@@ -1,29 +0,0 @@ |
1746 |
-From 29f735ac0e54421d1518b8d0f730523ebb7e6d5a Mon Sep 17 00:00:00 2001 |
1747 |
-From: Alexander Tsoy <alexander@××××.me> |
1748 |
-Date: Wed, 25 Dec 2013 14:00:26 +0400 |
1749 |
-Subject: [PATCH] udev-rules: add eudev rules |
1750 |
- |
1751 |
-eudev configured with "--enable-modules --disable-libkmod" installs |
1752 |
-80-drivers-modprobe.rules instead of 80-drivers.rules |
1753 |
- |
1754 |
-https://bugs.gentoo.org/show_bug.cgi?id=494188 |
1755 |
---- |
1756 |
- modules.d/95udev-rules/module-setup.sh | 2 ++ |
1757 |
- 1 file changed, 2 insertions(+) |
1758 |
- |
1759 |
-diff --git a/modules.d/95udev-rules/module-setup.sh b/modules.d/95udev-rules/module-setup.sh |
1760 |
-index 88c3da2..ebc4447 100755 |
1761 |
---- a/modules.d/95udev-rules/module-setup.sh |
1762 |
-+++ b/modules.d/95udev-rules/module-setup.sh |
1763 |
-@@ -39,6 +39,8 @@ install() { |
1764 |
- prepare_udev_rules 59-persistent-storage.rules 61-persistent-storage.rules |
1765 |
- # debian udev rules |
1766 |
- inst_rules 91-permissions.rules |
1767 |
-+ # eudev rules |
1768 |
-+ inst_rules 80-drivers-modprobe.rules |
1769 |
- |
1770 |
- { |
1771 |
- for i in cdrom tape dialout floppy; do |
1772 |
--- |
1773 |
-1.8.3.2 |
1774 |
- |
1775 |
|
1776 |
diff --git a/sys-kernel/dracut/files/040-0001-dracut-functions.sh-support-for-altern.patch b/sys-kernel/dracut/files/040-0001-dracut-functions.sh-support-for-altern.patch |
1777 |
deleted file mode 100644 |
1778 |
index 55b3699818..0000000000 |
1779 |
--- a/sys-kernel/dracut/files/040-0001-dracut-functions.sh-support-for-altern.patch |
1780 |
+++ /dev/null |
1781 |
@@ -1,41 +0,0 @@ |
1782 |
-From ed2f8d6145ef12084af882575091a7d44a3e47c1 Mon Sep 17 00:00:00 2001 |
1783 |
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@×××××××.name> |
1784 |
-Date: Sun, 6 Jan 2013 13:35:01 +0100 |
1785 |
-Subject: [PATCH 1/4] dracut-functions.sh: support for alternative udev dirs - |
1786 |
- udevaltdirs |
1787 |
- |
1788 |
-It is required for Gentoo which moves udev from / to /usr and supports |
1789 |
-both /lib/udev and /usr/lib/udev for compatibility with other packages. |
1790 |
- |
1791 |
-Credits go to Alexander Tsoy <alexander@××××.me>. |
1792 |
- |
1793 |
-Conflicts: |
1794 |
- dracut-functions.sh |
1795 |
---- |
1796 |
- dracut-functions.sh | 10 ++++++++++ |
1797 |
- 1 file changed, 10 insertions(+) |
1798 |
- |
1799 |
-diff --git a/dracut-functions.sh b/dracut-functions.sh |
1800 |
-index 1bcc3b4..72afce2 100755 |
1801 |
---- a/dracut-functions.sh |
1802 |
-+++ b/dracut-functions.sh |
1803 |
-@@ -943,6 +943,16 @@ inst_rules() { |
1804 |
- inst_dir "$_target" |
1805 |
- for _rule in "$@"; do |
1806 |
- if [ "${_rule#/}" = "$_rule" ]; then |
1807 |
-+ for r in ${udevaltdirs}; do |
1808 |
-+ [[ "$r" = "${udevdir}" ]] && continue |
1809 |
-+ if [[ -e $r/rules.d/$_rule ]]; then |
1810 |
-+ _found="$r/rules.d/$_rule" |
1811 |
-+ inst_rule_programs "$_found" |
1812 |
-+ inst_rule_group_owner "$_found" |
1813 |
-+ inst_rule_initqueue "$_found" |
1814 |
-+ inst_simple "$_found" "${udevdir}/rules.d/${_found##*/}" |
1815 |
-+ fi |
1816 |
-+ done |
1817 |
- for r in ${udevdir}/rules.d ${hostonly:+/etc/udev/rules.d}; do |
1818 |
- if [[ -e $r/$_rule ]]; then |
1819 |
- _found="$r/$_rule" |
1820 |
--- |
1821 |
-2.1.3 |
1822 |
- |
1823 |
|
1824 |
diff --git a/sys-kernel/dracut/files/040-0002-gentoo.conf-let-udevdir-be-handled-by-.patch b/sys-kernel/dracut/files/040-0002-gentoo.conf-let-udevdir-be-handled-by-.patch |
1825 |
deleted file mode 100644 |
1826 |
index 52b97692f9..0000000000 |
1827 |
--- a/sys-kernel/dracut/files/040-0002-gentoo.conf-let-udevdir-be-handled-by-.patch |
1828 |
+++ /dev/null |
1829 |
@@ -1,30 +0,0 @@ |
1830 |
-From a562cb9ad84784cb4ba7679a2fc3a269d31a4ca3 Mon Sep 17 00:00:00 2001 |
1831 |
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@×××××××.name> |
1832 |
-Date: Sun, 16 Dec 2012 20:02:48 +0100 |
1833 |
-Subject: [PATCH 2/4] gentoo.conf: let udevdir= be handled by pkg-config and |
1834 |
- use udevaltdirs |
1835 |
- |
1836 |
-To avoid need of rebuild after udev update/downgrade let udevdir= be set |
1837 |
-dynamically with pkg-config. Use udevaltdirs to search for rules both |
1838 |
-in old and new locations. |
1839 |
---- |
1840 |
- dracut.conf.d/gentoo.conf.example | 3 ++- |
1841 |
- 1 file changed, 2 insertions(+), 1 deletion(-) |
1842 |
- |
1843 |
-diff --git a/dracut.conf.d/gentoo.conf.example b/dracut.conf.d/gentoo.conf.example |
1844 |
-index 26e7314..f9617f0 100644 |
1845 |
---- a/dracut.conf.d/gentoo.conf.example |
1846 |
-+++ b/dracut.conf.d/gentoo.conf.example |
1847 |
-@@ -1,7 +1,8 @@ |
1848 |
- # /etc/dracut.conf.d/gentoo.conf |
1849 |
- # dracut config file customized for Gentoo Base System release 2 |
1850 |
- |
1851 |
--udevdir=/lib/udev |
1852 |
-+udevdir= |
1853 |
-+udevaltdirs="/lib/udev /usr/lib/udev" |
1854 |
- ro_mnt=yes |
1855 |
- |
1856 |
- # |
1857 |
--- |
1858 |
-2.1.3 |
1859 |
- |
1860 |
|
1861 |
diff --git a/sys-kernel/dracut/files/040-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch b/sys-kernel/dracut/files/040-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch |
1862 |
deleted file mode 100644 |
1863 |
index fbfd9ee419..0000000000 |
1864 |
--- a/sys-kernel/dracut/files/040-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch |
1865 |
+++ /dev/null |
1866 |
@@ -1,74 +0,0 @@ |
1867 |
-From 5a1de9053d27feeb283253554033e7ad25c9aa31 Mon Sep 17 00:00:00 2001 |
1868 |
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@×××××××.name> |
1869 |
-Date: Wed, 2 Oct 2013 22:37:09 +0200 |
1870 |
-Subject: [PATCH 3/4] Use the same paths in dracut.sh as those set with |
1871 |
- configure script |
1872 |
- |
1873 |
-Makefile alters destination main dracut script and sets dracutbasedir to |
1874 |
-the value of pkglibdir set in configure. |
1875 |
---- |
1876 |
- Makefile | 3 +++ |
1877 |
- dracut.sh | 9 ++++----- |
1878 |
- 2 files changed, 7 insertions(+), 5 deletions(-) |
1879 |
- |
1880 |
-diff --git a/Makefile b/Makefile |
1881 |
-index 7127368..a4c35e5 100644 |
1882 |
---- a/Makefile |
1883 |
-+++ b/Makefile |
1884 |
-@@ -103,6 +103,9 @@ install: dracut-version.sh |
1885 |
- mkdir -p $(DESTDIR)$(pkglibdir)/modules.d |
1886 |
- mkdir -p $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man7 $(DESTDIR)$(mandir)/man8 |
1887 |
- install -m 0755 dracut.sh $(DESTDIR)$(bindir)/dracut |
1888 |
-+ sed -r \ |
1889 |
-+ -e "s|^(pkglibdir)=.*|\1=$(pkglibdir)|" \ |
1890 |
-+ -i $(DESTDIR)$(bindir)/dracut |
1891 |
- install -m 0755 dracut-catimages.sh $(DESTDIR)$(bindir)/dracut-catimages |
1892 |
- install -m 0755 mkinitrd-dracut.sh $(DESTDIR)$(bindir)/mkinitrd |
1893 |
- install -m 0755 lsinitrd.sh $(DESTDIR)$(bindir)/lsinitrd |
1894 |
-diff --git a/dracut.sh b/dracut.sh |
1895 |
-index 1c7e208..ea30a7b 100755 |
1896 |
---- a/dracut.sh |
1897 |
-+++ b/dracut.sh |
1898 |
-@@ -24,10 +24,13 @@ |
1899 |
- # store for logging |
1900 |
- dracut_args=( "$@" ) |
1901 |
- |
1902 |
-+# base dirs |
1903 |
-+pkglibdir=/usr/lib/dracut |
1904 |
-+dracutbasedir="$pkglibdir" |
1905 |
-+ |
1906 |
- set -o pipefail |
1907 |
- |
1908 |
- usage() { |
1909 |
-- [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut |
1910 |
- if [[ -f $dracutbasedir/dracut-version.sh ]]; then |
1911 |
- . $dracutbasedir/dracut-version.sh |
1912 |
- fi |
1913 |
-@@ -52,7 +55,6 @@ EOF |
1914 |
- } |
1915 |
- |
1916 |
- long_usage() { |
1917 |
-- [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut |
1918 |
- if [[ -f $dracutbasedir/dracut-version.sh ]]; then |
1919 |
- . $dracutbasedir/dracut-version.sh |
1920 |
- fi |
1921 |
-@@ -656,8 +658,6 @@ export DRACUT_LOG_LEVEL=warning |
1922 |
- debug=yes |
1923 |
- } |
1924 |
- |
1925 |
--[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut |
1926 |
-- |
1927 |
- # if we were not passed a config file, try the default one |
1928 |
- if [[ ! -f $conffile ]]; then |
1929 |
- if [[ $allowlocal ]]; then |
1930 |
-@@ -798,7 +798,6 @@ stdloglvl=$((stdloglvl + verbosity_mod_l)) |
1931 |
- [[ $use_fstab_l ]] && use_fstab=$use_fstab_l |
1932 |
- [[ $mdadmconf_l ]] && mdadmconf=$mdadmconf_l |
1933 |
- [[ $lvmconf_l ]] && lvmconf=$lvmconf_l |
1934 |
--[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut |
1935 |
- [[ $fw_dir ]] || fw_dir="/lib/firmware/updates /lib/firmware" |
1936 |
- [[ $tmpdir_l ]] && tmpdir="$tmpdir_l" |
1937 |
- [[ $tmpdir ]] || tmpdir=/var/tmp |
1938 |
--- |
1939 |
-2.1.3 |
1940 |
- |
1941 |
|
1942 |
diff --git a/sys-kernel/dracut/files/040-0004-Install-dracut-install-into-libexec-di.patch b/sys-kernel/dracut/files/040-0004-Install-dracut-install-into-libexec-di.patch |
1943 |
deleted file mode 100644 |
1944 |
index 2cf27f339c..0000000000 |
1945 |
--- a/sys-kernel/dracut/files/040-0004-Install-dracut-install-into-libexec-di.patch |
1946 |
+++ /dev/null |
1947 |
@@ -1,81 +0,0 @@ |
1948 |
-From ed9375739c3f7e48f6e1c3037c5a589c49d78613 Mon Sep 17 00:00:00 2001 |
1949 |
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@×××××××.name> |
1950 |
-Date: Wed, 2 Oct 2013 22:40:43 +0200 |
1951 |
-Subject: [PATCH 4/4] Install dracut-install into libexec dir instead of lib |
1952 |
- dir |
1953 |
- |
1954 |
-dracut-install script is the only thing ABI specific atm. |
1955 |
- |
1956 |
-See https://bugs.gentoo.org/show_bug.cgi?id=485218 for details on the |
1957 |
-problem. |
1958 |
---- |
1959 |
- Makefile | 4 +++- |
1960 |
- configure | 1 + |
1961 |
- dracut-functions.sh | 4 ++++ |
1962 |
- dracut.sh | 1 + |
1963 |
- 4 files changed, 9 insertions(+), 1 deletion(-) |
1964 |
- |
1965 |
-diff --git a/Makefile b/Makefile |
1966 |
-index a4c35e5..af61faf 100644 |
1967 |
---- a/Makefile |
1968 |
-+++ b/Makefile |
1969 |
-@@ -104,6 +104,7 @@ install: dracut-version.sh |
1970 |
- mkdir -p $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man7 $(DESTDIR)$(mandir)/man8 |
1971 |
- install -m 0755 dracut.sh $(DESTDIR)$(bindir)/dracut |
1972 |
- sed -r \ |
1973 |
-+ -e "s|^(libexecdir)=.*|\1=$(libexecdir)|" \ |
1974 |
- -e "s|^(pkglibdir)=.*|\1=$(pkglibdir)|" \ |
1975 |
- -i $(DESTDIR)$(bindir)/dracut |
1976 |
- install -m 0755 dracut-catimages.sh $(DESTDIR)$(bindir)/dracut-catimages |
1977 |
-@@ -147,7 +148,8 @@ endif |
1978 |
- done \ |
1979 |
- fi |
1980 |
- if [ -f install/dracut-install ]; then \ |
1981 |
-- install -m 0755 install/dracut-install $(DESTDIR)$(pkglibdir)/dracut-install; \ |
1982 |
-+ mkdir -p $(DESTDIR)$(libexecdir); \ |
1983 |
-+ install -m 0755 install/dracut-install $(DESTDIR)$(libexecdir)/dracut-install; \ |
1984 |
- fi |
1985 |
- if [ -f skipcpio/skipcpio ]; then \ |
1986 |
- install -m 0755 skipcpio/skipcpio $(DESTDIR)$(pkglibdir)/skipcpio; \ |
1987 |
-diff --git a/configure b/configure |
1988 |
-index 0bd3d2d..17370de 100755 |
1989 |
---- a/configure |
1990 |
-+++ b/configure |
1991 |
-@@ -59,6 +59,7 @@ sbindir ?= ${sbindir:-${prefix}/sbin} |
1992 |
- mandir ?= ${mandir:-${prefix}/share/man} |
1993 |
- enable_documentation ?= ${enable_documentation:-yes} |
1994 |
- bindir ?= ${bindir:-${prefix}/bin} |
1995 |
-+libexecdir ?= ${libexecdir:-${prefix}/libexec} |
1996 |
- EOF |
1997 |
- |
1998 |
- { |
1999 |
-diff --git a/dracut-functions.sh b/dracut-functions.sh |
2000 |
-index 72afce2..1d85315 100755 |
2001 |
---- a/dracut-functions.sh |
2002 |
-+++ b/dracut-functions.sh |
2003 |
-@@ -741,6 +741,10 @@ if ! [[ $DRACUT_INSTALL ]]; then |
2004 |
- DRACUT_INSTALL=$(find_binary dracut-install) |
2005 |
- fi |
2006 |
- |
2007 |
-+if ! [[ $DRACUT_INSTALL ]] && [[ -x $libexecdir/dracut-install ]]; then |
2008 |
-+ DRACUT_INSTALL=$libexecdir/dracut-install |
2009 |
-+fi |
2010 |
-+ |
2011 |
- if ! [[ $DRACUT_INSTALL ]] && [[ -x $dracutbasedir/dracut-install ]]; then |
2012 |
- DRACUT_INSTALL=$dracutbasedir/dracut-install |
2013 |
- fi |
2014 |
-diff --git a/dracut.sh b/dracut.sh |
2015 |
-index ea30a7b..08f27eb 100755 |
2016 |
---- a/dracut.sh |
2017 |
-+++ b/dracut.sh |
2018 |
-@@ -25,6 +25,7 @@ |
2019 |
- dracut_args=( "$@" ) |
2020 |
- |
2021 |
- # base dirs |
2022 |
-+libexecdir=/usr/libexec |
2023 |
- pkglibdir=/usr/lib/dracut |
2024 |
- dracutbasedir="$pkglibdir" |
2025 |
- |
2026 |
--- |
2027 |
-2.1.3 |
2028 |
- |
2029 |
|
2030 |
diff --git a/sys-kernel/dracut/files/040-0005-NEWS-add-040-entry.patch b/sys-kernel/dracut/files/040-0005-NEWS-add-040-entry.patch |
2031 |
deleted file mode 100644 |
2032 |
index eeb4610e41..0000000000 |
2033 |
--- a/sys-kernel/dracut/files/040-0005-NEWS-add-040-entry.patch |
2034 |
+++ /dev/null |
2035 |
@@ -1,25 +0,0 @@ |
2036 |
-From 36c91220234af69a96cd95e575b47f0a3ec4c645 Mon Sep 17 00:00:00 2001 |
2037 |
-From: Harald Hoyer <harald@××××××.com> |
2038 |
-Date: Fri, 24 Oct 2014 14:41:29 +0200 |
2039 |
-Subject: [PATCH 5/5] NEWS: add 040 entry |
2040 |
- |
2041 |
---- |
2042 |
- NEWS | 5 +++++ |
2043 |
- 1 file changed, 5 insertions(+) |
2044 |
- |
2045 |
-diff --git a/NEWS b/NEWS |
2046 |
-index 1b79da1..da44068 100644 |
2047 |
---- a/NEWS |
2048 |
-+++ b/NEWS |
2049 |
-@@ -1,3 +1,8 @@ |
2050 |
-+dracut-040 |
2051 |
-+========== |
2052 |
-+- fixed dracut module dependency checks |
2053 |
-+- fixed test suite |
2054 |
-+ |
2055 |
- dracut-039 |
2056 |
- ========== |
2057 |
- - DRACUT_PATH can now be used to specify the PATH used by dracut |
2058 |
--- |
2059 |
-2.1.3 |
2060 |
- |
2061 |
|
2062 |
diff --git a/sys-kernel/dracut/files/040-0006-Don-t-pass-rsyncable-option-to-gzip-Ge.patch b/sys-kernel/dracut/files/040-0006-Don-t-pass-rsyncable-option-to-gzip-Ge.patch |
2063 |
deleted file mode 100644 |
2064 |
index 1ade9bd1e9..0000000000 |
2065 |
--- a/sys-kernel/dracut/files/040-0006-Don-t-pass-rsyncable-option-to-gzip-Ge.patch |
2066 |
+++ /dev/null |
2067 |
@@ -1,26 +0,0 @@ |
2068 |
-From ff57ba111c03957d4a68459efd91322c24223861 Mon Sep 17 00:00:00 2001 |
2069 |
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@×××××××.name> |
2070 |
-Date: Sat, 1 Nov 2014 22:25:07 +0100 |
2071 |
-Subject: [PATCH 6/6] Don't pass --rsyncable option to gzip - Gentoo gzip |
2072 |
- doesn't support it |
2073 |
- |
2074 |
---- |
2075 |
- dracut.sh | 2 +- |
2076 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
2077 |
- |
2078 |
-diff --git a/dracut.sh b/dracut.sh |
2079 |
-index 08f27eb..17be895 100755 |
2080 |
---- a/dracut.sh |
2081 |
-+++ b/dracut.sh |
2082 |
-@@ -822,7 +822,7 @@ case $compress in |
2083 |
- bzip2) compress="bzip2 -9";; |
2084 |
- lzma) compress="lzma -9 -T0";; |
2085 |
- xz) compress="xz --check=crc32 --lzma2=dict=1MiB -T0";; |
2086 |
-- gzip) compress="gzip -n -9 --rsyncable"; command -v pigz > /dev/null 2>&1 && compress="pigz -9 -n -T -R";; |
2087 |
-+ gzip) compress="gzip -n -9"; command -v pigz > /dev/null 2>&1 && compress="pigz -9 -n -T -R";; |
2088 |
- lzo) compress="lzop -9";; |
2089 |
- lz4) compress="lz4 -l -9";; |
2090 |
- esac |
2091 |
--- |
2092 |
-2.1.3 |
2093 |
- |
2094 |
|
2095 |
diff --git a/sys-kernel/dracut/files/040-0007-Take-into-account-lib64-dirs-when-dete.patch b/sys-kernel/dracut/files/040-0007-Take-into-account-lib64-dirs-when-dete.patch |
2096 |
deleted file mode 100644 |
2097 |
index 5d10312846..0000000000 |
2098 |
--- a/sys-kernel/dracut/files/040-0007-Take-into-account-lib64-dirs-when-dete.patch |
2099 |
+++ /dev/null |
2100 |
@@ -1,44 +0,0 @@ |
2101 |
-From 25efd305dace3275c661e0a7dfbaef42b4cbc6d7 Mon Sep 17 00:00:00 2001 |
2102 |
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@×××××××.name> |
2103 |
-Date: Sun, 11 Jan 2015 15:10:39 +0100 |
2104 |
-Subject: [PATCH 7/7] Take into account lib64 dirs when detecting version, |
2105 |
- modules and params |
2106 |
- |
2107 |
---- |
2108 |
- lsinitrd.sh | 6 +++--- |
2109 |
- 1 file changed, 3 insertions(+), 3 deletions(-) |
2110 |
- |
2111 |
-diff --git a/lsinitrd.sh b/lsinitrd.sh |
2112 |
-index 4f12c2c..dc1f88f 100755 |
2113 |
---- a/lsinitrd.sh |
2114 |
-+++ b/lsinitrd.sh |
2115 |
-@@ -124,7 +124,7 @@ extract_files() |
2116 |
- list_modules() |
2117 |
- { |
2118 |
- echo "dracut modules:" |
2119 |
-- $CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib/dracut/modules.txt' 'usr/lib/dracut/modules.txt' 2>/dev/null |
2120 |
-+ $CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib64/dracut/modules.txt' 'lib/dracut/modules.txt' 'usr/lib/dracut/modules.txt' 2>/dev/null |
2121 |
- ((ret+=$?)) |
2122 |
- } |
2123 |
- |
2124 |
-@@ -217,7 +217,7 @@ ret=0 |
2125 |
- if (( ${#filenames[@]} > 0 )); then |
2126 |
- extract_files |
2127 |
- else |
2128 |
-- version=$($CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib/dracut/dracut-*' 'usr/lib/dracut/dracut-*' 2>/dev/null) |
2129 |
-+ version=$($CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib64/dracut/dracut-*' 'lib/dracut/dracut-*' 'usr/lib/dracut/dracut-*' 2>/dev/null) |
2130 |
- ((ret+=$?)) |
2131 |
- echo "Version: $version" |
2132 |
- echo |
2133 |
-@@ -226,7 +226,7 @@ else |
2134 |
- echo "========================================================================" |
2135 |
- else |
2136 |
- echo -n "Arguments: " |
2137 |
-- $CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib/dracut/build-parameter.txt' 'usr/lib/dracut/build-parameter.txt' 2>/dev/null |
2138 |
-+ $CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib64/dracut/build-parameter.txt' 'lib/dracut/build-parameter.txt' 'usr/lib/dracut/build-parameter.txt' 2>/dev/null |
2139 |
- echo |
2140 |
- list_modules |
2141 |
- list_files |
2142 |
--- |
2143 |
-2.2.1 |
2144 |
- |
2145 |
|
2146 |
diff --git a/sys-kernel/dracut/files/041-0001-Use-the-same-paths-in-dracut.sh-as-tho.patch b/sys-kernel/dracut/files/041-0001-Use-the-same-paths-in-dracut.sh-as-tho.patch |
2147 |
deleted file mode 100644 |
2148 |
index d16119ccae..0000000000 |
2149 |
--- a/sys-kernel/dracut/files/041-0001-Use-the-same-paths-in-dracut.sh-as-tho.patch |
2150 |
+++ /dev/null |
2151 |
@@ -1,74 +0,0 @@ |
2152 |
-From 89334439113c0ea8196ac5e9e188e6a1bbebe267 Mon Sep 17 00:00:00 2001 |
2153 |
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@×××××××.name> |
2154 |
-Date: Wed, 2 Oct 2013 22:37:09 +0200 |
2155 |
-Subject: [PATCH 1/4] Use the same paths in dracut.sh as those set with |
2156 |
- configure script |
2157 |
- |
2158 |
-Makefile alters destination main dracut script and sets dracutbasedir to |
2159 |
-the value of pkglibdir set in configure. |
2160 |
---- |
2161 |
- Makefile | 3 +++ |
2162 |
- dracut.sh | 9 ++++----- |
2163 |
- 2 files changed, 7 insertions(+), 5 deletions(-) |
2164 |
- |
2165 |
-diff --git a/Makefile b/Makefile |
2166 |
-index 41ae274..41968b0 100644 |
2167 |
---- a/Makefile |
2168 |
-+++ b/Makefile |
2169 |
-@@ -103,6 +103,9 @@ install: dracut-version.sh |
2170 |
- mkdir -p $(DESTDIR)$(pkglibdir)/modules.d |
2171 |
- mkdir -p $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man7 $(DESTDIR)$(mandir)/man8 |
2172 |
- install -m 0755 dracut.sh $(DESTDIR)$(bindir)/dracut |
2173 |
-+ sed -r \ |
2174 |
-+ -e "s|^(pkglibdir)=.*|\1=$(pkglibdir)|" \ |
2175 |
-+ -i $(DESTDIR)$(bindir)/dracut |
2176 |
- install -m 0755 dracut-catimages.sh $(DESTDIR)$(bindir)/dracut-catimages |
2177 |
- install -m 0755 mkinitrd-dracut.sh $(DESTDIR)$(bindir)/mkinitrd |
2178 |
- install -m 0755 lsinitrd.sh $(DESTDIR)$(bindir)/lsinitrd |
2179 |
-diff --git a/dracut.sh b/dracut.sh |
2180 |
-index 5e2feba..89a711e 100755 |
2181 |
---- a/dracut.sh |
2182 |
-+++ b/dracut.sh |
2183 |
-@@ -24,10 +24,13 @@ |
2184 |
- # store for logging |
2185 |
- dracut_args=( "$@" ) |
2186 |
- |
2187 |
-+# base dirs |
2188 |
-+pkglibdir=/usr/lib/dracut |
2189 |
-+dracutbasedir="$pkglibdir" |
2190 |
-+ |
2191 |
- set -o pipefail |
2192 |
- |
2193 |
- usage() { |
2194 |
-- [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut |
2195 |
- if [[ -f $dracutbasedir/dracut-version.sh ]]; then |
2196 |
- . $dracutbasedir/dracut-version.sh |
2197 |
- fi |
2198 |
-@@ -52,7 +55,6 @@ EOF |
2199 |
- } |
2200 |
- |
2201 |
- long_usage() { |
2202 |
-- [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut |
2203 |
- if [[ -f $dracutbasedir/dracut-version.sh ]]; then |
2204 |
- . $dracutbasedir/dracut-version.sh |
2205 |
- fi |
2206 |
-@@ -666,8 +668,6 @@ export DRACUT_LOG_LEVEL=warning |
2207 |
- debug=yes |
2208 |
- } |
2209 |
- |
2210 |
--[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut |
2211 |
-- |
2212 |
- # if we were not passed a config file, try the default one |
2213 |
- if [[ ! -f $conffile ]]; then |
2214 |
- if [[ $allowlocal ]]; then |
2215 |
-@@ -808,7 +808,6 @@ stdloglvl=$((stdloglvl + verbosity_mod_l)) |
2216 |
- [[ $use_fstab_l ]] && use_fstab=$use_fstab_l |
2217 |
- [[ $mdadmconf_l ]] && mdadmconf=$mdadmconf_l |
2218 |
- [[ $lvmconf_l ]] && lvmconf=$lvmconf_l |
2219 |
--[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut |
2220 |
- [[ $fw_dir ]] || fw_dir="/lib/firmware/updates /lib/firmware" |
2221 |
- [[ $tmpdir_l ]] && tmpdir="$tmpdir_l" |
2222 |
- [[ $tmpdir ]] || tmpdir=/var/tmp |
2223 |
--- |
2224 |
-2.3.3 |
2225 |
- |
2226 |
|
2227 |
diff --git a/sys-kernel/dracut/files/041-0002-Install-dracut-install-and-skipcpio-in.patch b/sys-kernel/dracut/files/041-0002-Install-dracut-install-and-skipcpio-in.patch |
2228 |
deleted file mode 100644 |
2229 |
index 5202ac3740..0000000000 |
2230 |
--- a/sys-kernel/dracut/files/041-0002-Install-dracut-install-and-skipcpio-in.patch |
2231 |
+++ /dev/null |
2232 |
@@ -1,125 +0,0 @@ |
2233 |
-From 7d8dadfdb2d59ac60c6a579f602e13ac7c743e39 Mon Sep 17 00:00:00 2001 |
2234 |
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@×××××××.name> |
2235 |
-Date: Wed, 2 Oct 2013 22:40:43 +0200 |
2236 |
-Subject: [PATCH 2/4] Install dracut-install and skipcpio into libexec dir |
2237 |
- instead of lib dir |
2238 |
- |
2239 |
-dracut-install and skipcpio are the only ABI specific things atm. |
2240 |
- |
2241 |
-See https://bugs.gentoo.org/show_bug.cgi?id=485218 for details on the |
2242 |
-problem. |
2243 |
---- |
2244 |
- Makefile | 7 +++++-- |
2245 |
- configure | 1 + |
2246 |
- dracut-functions.sh | 4 ++++ |
2247 |
- dracut-initramfs-restore.sh | 4 ++-- |
2248 |
- dracut.sh | 1 + |
2249 |
- lsinitrd.sh | 4 ++-- |
2250 |
- 6 files changed, 15 insertions(+), 6 deletions(-) |
2251 |
- |
2252 |
-diff --git a/Makefile b/Makefile |
2253 |
-index 41968b0..bb007d1 100644 |
2254 |
---- a/Makefile |
2255 |
-+++ b/Makefile |
2256 |
-@@ -104,6 +104,7 @@ install: dracut-version.sh |
2257 |
- mkdir -p $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man7 $(DESTDIR)$(mandir)/man8 |
2258 |
- install -m 0755 dracut.sh $(DESTDIR)$(bindir)/dracut |
2259 |
- sed -r \ |
2260 |
-+ -e "s|^(libexecdir)=.*|\1=$(libexecdir)|" \ |
2261 |
- -e "s|^(pkglibdir)=.*|\1=$(pkglibdir)|" \ |
2262 |
- -i $(DESTDIR)$(bindir)/dracut |
2263 |
- install -m 0755 dracut-catimages.sh $(DESTDIR)$(bindir)/dracut-catimages |
2264 |
-@@ -147,10 +148,12 @@ endif |
2265 |
- done \ |
2266 |
- fi |
2267 |
- if [ -f install/dracut-install ]; then \ |
2268 |
-- install -m 0755 install/dracut-install $(DESTDIR)$(pkglibdir)/dracut-install; \ |
2269 |
-+ mkdir -p $(DESTDIR)$(libexecdir)/dracut; \ |
2270 |
-+ install -m 0755 install/dracut-install $(DESTDIR)$(libexecdir)/dracut/dracut-install; \ |
2271 |
- fi |
2272 |
- if [ -f skipcpio/skipcpio ]; then \ |
2273 |
-- install -m 0755 skipcpio/skipcpio $(DESTDIR)$(pkglibdir)/skipcpio; \ |
2274 |
-+ mkdir -p $(DESTDIR)$(libexecdir)/dracut; \ |
2275 |
-+ install -m 0755 skipcpio/skipcpio $(DESTDIR)$(libexecdir)/dracut/skipcpio; \ |
2276 |
- fi |
2277 |
- mkdir -p $(DESTDIR)${prefix}/lib/kernel/install.d |
2278 |
- install -m 0755 50-dracut.install $(DESTDIR)${prefix}/lib/kernel/install.d/50-dracut.install |
2279 |
-diff --git a/configure b/configure |
2280 |
-index 0bd3d2d..17370de 100755 |
2281 |
---- a/configure |
2282 |
-+++ b/configure |
2283 |
-@@ -59,6 +59,7 @@ sbindir ?= ${sbindir:-${prefix}/sbin} |
2284 |
- mandir ?= ${mandir:-${prefix}/share/man} |
2285 |
- enable_documentation ?= ${enable_documentation:-yes} |
2286 |
- bindir ?= ${bindir:-${prefix}/bin} |
2287 |
-+libexecdir ?= ${libexecdir:-${prefix}/libexec} |
2288 |
- EOF |
2289 |
- |
2290 |
- { |
2291 |
-diff --git a/dracut-functions.sh b/dracut-functions.sh |
2292 |
-index 37ddca2..953acd1 100755 |
2293 |
---- a/dracut-functions.sh |
2294 |
-+++ b/dracut-functions.sh |
2295 |
-@@ -733,6 +733,10 @@ if ! [[ $DRACUT_INSTALL ]]; then |
2296 |
- DRACUT_INSTALL=$(find_binary dracut-install) |
2297 |
- fi |
2298 |
- |
2299 |
-+if ! [[ $DRACUT_INSTALL ]] && [[ -x $dracutlibexecdir/dracut-install ]]; then |
2300 |
-+ DRACUT_INSTALL=$dracutlibexecdir/dracut-install |
2301 |
-+fi |
2302 |
-+ |
2303 |
- if ! [[ $DRACUT_INSTALL ]] && [[ -x $dracutbasedir/dracut-install ]]; then |
2304 |
- DRACUT_INSTALL=$dracutbasedir/dracut-install |
2305 |
- elif ! [[ $DRACUT_INSTALL ]] && [[ -x $dracutbasedir/install/dracut-install ]]; then |
2306 |
-diff --git a/dracut-initramfs-restore.sh b/dracut-initramfs-restore.sh |
2307 |
-index 8b9b80f..8dd358e 100644 |
2308 |
---- a/dracut-initramfs-restore.sh |
2309 |
-+++ b/dracut-initramfs-restore.sh |
2310 |
-@@ -8,8 +8,8 @@ set -e |
2311 |
- |
2312 |
- KERNEL_VERSION="$(uname -r)" |
2313 |
- |
2314 |
--[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut |
2315 |
--SKIP="$dracutbasedir/skipcpio" |
2316 |
-+[[ $dracutlibexecdir ]] || dracutlibexecdir=/usr/libexec/dracut |
2317 |
-+SKIP="$dracutlibexecdir/skipcpio" |
2318 |
- [[ -x $SKIP ]] || SKIP=cat |
2319 |
- |
2320 |
- [[ -f /etc/machine-id ]] && read MACHINE_ID < /etc/machine-id |
2321 |
-diff --git a/dracut.sh b/dracut.sh |
2322 |
-index 89a711e..9cfeef1 100755 |
2323 |
---- a/dracut.sh |
2324 |
-+++ b/dracut.sh |
2325 |
-@@ -25,6 +25,7 @@ |
2326 |
- dracut_args=( "$@" ) |
2327 |
- |
2328 |
- # base dirs |
2329 |
-+dracutlibexecdir=/usr/libexec/dracut |
2330 |
- pkglibdir=/usr/lib/dracut |
2331 |
- dracutbasedir="$pkglibdir" |
2332 |
- |
2333 |
-diff --git a/lsinitrd.sh b/lsinitrd.sh |
2334 |
-index 4f12c2c..2ed6e56 100755 |
2335 |
---- a/lsinitrd.sh |
2336 |
-+++ b/lsinitrd.sh |
2337 |
-@@ -33,7 +33,7 @@ usage() |
2338 |
- } |
2339 |
- |
2340 |
- |
2341 |
--[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut |
2342 |
-+[[ $dracutlibexecdir ]] || dracutlibexecdir=/usr/libexec/dracut |
2343 |
- |
2344 |
- sorted=0 |
2345 |
- modules=0 |
2346 |
-@@ -158,7 +158,7 @@ case $bin in |
2347 |
- echo "Early CPIO image" |
2348 |
- list_files |
2349 |
- fi |
2350 |
-- SKIP="$dracutbasedir/skipcpio" |
2351 |
-+ SKIP="$dracutlibexecdir/skipcpio" |
2352 |
- if ! [[ -x $SKIP ]]; then |
2353 |
- echo |
2354 |
- echo "'$SKIP' not found, cannot display remaining contents!" >&2 |
2355 |
--- |
2356 |
-2.3.3 |
2357 |
- |
2358 |
|
2359 |
diff --git a/sys-kernel/dracut/files/041-0003-Take-into-account-lib64-dirs-when-dete.patch b/sys-kernel/dracut/files/041-0003-Take-into-account-lib64-dirs-when-dete.patch |
2360 |
deleted file mode 100644 |
2361 |
index b355f8445c..0000000000 |
2362 |
--- a/sys-kernel/dracut/files/041-0003-Take-into-account-lib64-dirs-when-dete.patch |
2363 |
+++ /dev/null |
2364 |
@@ -1,60 +0,0 @@ |
2365 |
-From acfd4d98e821dbaa9ae68dde82fb8843fbf5de59 Mon Sep 17 00:00:00 2001 |
2366 |
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@×××××××.name> |
2367 |
-Date: Sun, 11 Jan 2015 15:10:39 +0100 |
2368 |
-Subject: [PATCH 3/4] Take into account lib64 dirs when detecting version, |
2369 |
- modules and params |
2370 |
- |
2371 |
---- |
2372 |
- lsinitrd.sh | 15 ++++++++++++--- |
2373 |
- 1 file changed, 12 insertions(+), 3 deletions(-) |
2374 |
- |
2375 |
-diff --git a/lsinitrd.sh b/lsinitrd.sh |
2376 |
-index 2ed6e56..0355c87 100755 |
2377 |
---- a/lsinitrd.sh |
2378 |
-+++ b/lsinitrd.sh |
2379 |
-@@ -108,6 +108,12 @@ if ! [[ -f "$image" ]]; then |
2380 |
- exit 1 |
2381 |
- fi |
2382 |
- |
2383 |
-+dracutlibdirs() { |
2384 |
-+ for d in lib64/dracut lib/dracut usr/lib64/dracut usr/lib/dracut; do |
2385 |
-+ echo "$d/$1" |
2386 |
-+ done |
2387 |
-+} |
2388 |
-+ |
2389 |
- extract_files() |
2390 |
- { |
2391 |
- (( ${#filenames[@]} == 1 )) && nofileinfo=1 |
2392 |
-@@ -124,7 +130,8 @@ extract_files() |
2393 |
- list_modules() |
2394 |
- { |
2395 |
- echo "dracut modules:" |
2396 |
-- $CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib/dracut/modules.txt' 'usr/lib/dracut/modules.txt' 2>/dev/null |
2397 |
-+ $CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- \ |
2398 |
-+ $(dracutlibdirs modules.txt) 2>/dev/null |
2399 |
- ((ret+=$?)) |
2400 |
- } |
2401 |
- |
2402 |
-@@ -217,7 +224,8 @@ ret=0 |
2403 |
- if (( ${#filenames[@]} > 0 )); then |
2404 |
- extract_files |
2405 |
- else |
2406 |
-- version=$($CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib/dracut/dracut-*' 'usr/lib/dracut/dracut-*' 2>/dev/null) |
2407 |
-+ version=$($CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- \ |
2408 |
-+ $(dracutlibdirs 'dracut-*') 2>/dev/null) |
2409 |
- ((ret+=$?)) |
2410 |
- echo "Version: $version" |
2411 |
- echo |
2412 |
-@@ -226,7 +234,8 @@ else |
2413 |
- echo "========================================================================" |
2414 |
- else |
2415 |
- echo -n "Arguments: " |
2416 |
-- $CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib/dracut/build-parameter.txt' 'usr/lib/dracut/build-parameter.txt' 2>/dev/null |
2417 |
-+ $CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- \ |
2418 |
-+ $(dracutlibdirs build-parameter.txt) 2>/dev/null |
2419 |
- echo |
2420 |
- list_modules |
2421 |
- list_files |
2422 |
--- |
2423 |
-2.3.3 |
2424 |
- |
2425 |
|
2426 |
diff --git a/sys-kernel/dracut/files/041-0004-Portability-fixes.patch b/sys-kernel/dracut/files/041-0004-Portability-fixes.patch |
2427 |
deleted file mode 100644 |
2428 |
index f92cba390e..0000000000 |
2429 |
--- a/sys-kernel/dracut/files/041-0004-Portability-fixes.patch |
2430 |
+++ /dev/null |
2431 |
@@ -1,63 +0,0 @@ |
2432 |
-From 82f7e46c8fdb2bb41b7b26916e463add7af70a94 Mon Sep 17 00:00:00 2001 |
2433 |
-From: xtraeme <xtraeme@×××××××××.eu> |
2434 |
-Date: Tue, 2 Jun 2015 11:11:21 +0200 |
2435 |
-Subject: [PATCH 5/5] Portability fixes: |
2436 |
- |
2437 |
-- Use uid_t not __uid_t. |
2438 |
-- Define _GNU_SOURCE for cpu_set_t and others. |
2439 |
-- Include string.h for strncmp(). |
2440 |
-- Detect musl's ldd error message. |
2441 |
---- |
2442 |
- install/dracut-install.c | 7 ++++++- |
2443 |
- install/util.h | 3 +++ |
2444 |
- 2 files changed, 9 insertions(+), 1 deletion(-) |
2445 |
- |
2446 |
-diff --git a/install/dracut-install.c b/install/dracut-install.c |
2447 |
-index 201f181..0ff5c49 100644 |
2448 |
---- a/install/dracut-install.c |
2449 |
-+++ b/install/dracut-install.c |
2450 |
-@@ -222,7 +222,7 @@ static int cp(const char *src, const char *dst) |
2451 |
- if (ret == 0) { |
2452 |
- struct timeval tv[2]; |
2453 |
- if (fchown(dest_desc, sb.st_uid, sb.st_gid) != 0) |
2454 |
-- if(fchown(dest_desc, (__uid_t) - 1, sb.st_gid) != 0) |
2455 |
-+ if(fchown(dest_desc, (uid_t) - 1, sb.st_gid) != 0) |
2456 |
- log_error("Failed to chown %s: %m", dst); |
2457 |
- tv[0].tv_sec = sb.st_atime; |
2458 |
- tv[0].tv_usec = 0; |
2459 |
-@@ -388,6 +388,11 @@ static int resolve_deps(const char *src) |
2460 |
- break; |
2461 |
- } |
2462 |
- |
2463 |
-+ /* musl ldd */ |
2464 |
-+ if (strstr(buf, "Not a valid dynamic program")) |
2465 |
-+ break; |
2466 |
-+ |
2467 |
-+ /* glibc */ |
2468 |
- if (strstr(buf, "not a dynamic executable")) |
2469 |
- break; |
2470 |
- |
2471 |
-diff --git a/install/util.h b/install/util.h |
2472 |
-index cc7b988..2ad3254 100644 |
2473 |
---- a/install/util.h |
2474 |
-+++ b/install/util.h |
2475 |
-@@ -20,6 +20,8 @@ |
2476 |
- along with systemd; If not, see <http://www.gnu.org/licenses/>. |
2477 |
- ***/ |
2478 |
- |
2479 |
-+#define _GNU_SOURCE |
2480 |
-+ |
2481 |
- #include <inttypes.h> |
2482 |
- #include <time.h> |
2483 |
- #include <sys/time.h> |
2484 |
-@@ -27,6 +29,7 @@ |
2485 |
- #include <stdbool.h> |
2486 |
- #include <stdlib.h> |
2487 |
- #include <stdio.h> |
2488 |
-+#include <string.h> |
2489 |
- #include <signal.h> |
2490 |
- #include <sched.h> |
2491 |
- #include <limits.h> |
2492 |
--- |
2493 |
-2.4.1 |
2494 |
- |
2495 |
|
2496 |
diff --git a/sys-kernel/dracut/files/041-0005-base-dracut-lib.sh-remove-bashism.patch b/sys-kernel/dracut/files/041-0005-base-dracut-lib.sh-remove-bashism.patch |
2497 |
deleted file mode 100644 |
2498 |
index 47bfdc5e09..0000000000 |
2499 |
--- a/sys-kernel/dracut/files/041-0005-base-dracut-lib.sh-remove-bashism.patch |
2500 |
+++ /dev/null |
2501 |
@@ -1,27 +0,0 @@ |
2502 |
-From 7ab0852f24a803ea2c9b0d8e1ce45d13cdd25320 Mon Sep 17 00:00:00 2001 |
2503 |
-From: Alexander Tsoy <alexander@××××.me> |
2504 |
-Date: Tue, 24 Feb 2015 22:28:24 +0300 |
2505 |
-Subject: [PATCH 5/5] base/dracut-lib.sh: remove bashism |
2506 |
- |
2507 |
---- |
2508 |
- modules.d/99base/dracut-lib.sh | 4 +++- |
2509 |
- 1 file changed, 3 insertions(+), 1 deletion(-) |
2510 |
- |
2511 |
-diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh |
2512 |
-index 5c1504f..c1a22b6 100755 |
2513 |
---- a/modules.d/99base/dracut-lib.sh |
2514 |
-+++ b/modules.d/99base/dracut-lib.sh |
2515 |
-@@ -886,7 +886,9 @@ dev_unit_name() |
2516 |
- dev="${dev##/}" |
2517 |
- dev="$(str_replace "$dev" '\' '\x5c')" |
2518 |
- dev="$(str_replace "$dev" '-' '\x2d')" |
2519 |
-- dev=${dev/#\./\\x2e} |
2520 |
-+ if [ "${dev##.}" != "$dev" ]; then |
2521 |
-+ dev="\x2e${dev##.}" |
2522 |
-+ fi |
2523 |
- dev="$(str_replace "$dev" '/' '-')" |
2524 |
- |
2525 |
- printf -- "%s" "$dev" |
2526 |
--- |
2527 |
-2.4.1 |
2528 |
- |
2529 |
|
2530 |
diff --git a/sys-kernel/dracut/files/043-0001-Revert-lvm-Don-t-activate-LVs-with-act.patch b/sys-kernel/dracut/files/043-0001-Revert-lvm-Don-t-activate-LVs-with-act.patch |
2531 |
deleted file mode 100644 |
2532 |
index 54d1ef83ab..0000000000 |
2533 |
--- a/sys-kernel/dracut/files/043-0001-Revert-lvm-Don-t-activate-LVs-with-act.patch |
2534 |
+++ /dev/null |
2535 |
@@ -1,33 +0,0 @@ |
2536 |
-From 7c782700a82e6f8b1cb665075e14eaf9d4f70867 Mon Sep 17 00:00:00 2001 |
2537 |
-From: Fabian Deutsch <fabiand@×××××××××××××.org> |
2538 |
-Date: Thu, 25 Jun 2015 11:17:59 +0200 |
2539 |
-Subject: [PATCH] Revert "lvm: Don't activate LVs with activationskip set" |
2540 |
- |
2541 |
-This reverts commit cfa365a32d47388c8476064b23d7d4684f1e591b. |
2542 |
- |
2543 |
-The logic in commit cfa365a was added to prevent (odl) lvms from |
2544 |
-activating snapshots which should not be activated. |
2545 |
-Newer lvms however do this automatically (not enabling an LV if the |
2546 |
-the 'k' attribute set), thus we can revert the previous commit. |
2547 |
---- |
2548 |
- modules.d/90lvm/lvm_scan.sh | 4 ---- |
2549 |
- 1 file changed, 4 deletions(-) |
2550 |
- |
2551 |
-diff --git a/modules.d/90lvm/lvm_scan.sh b/modules.d/90lvm/lvm_scan.sh |
2552 |
-index ce46e14..7495644 100755 |
2553 |
---- a/modules.d/90lvm/lvm_scan.sh |
2554 |
-+++ b/modules.d/90lvm/lvm_scan.sh |
2555 |
-@@ -106,10 +106,6 @@ if [ -n "$LVS" ] ; then |
2556 |
- info "Scanning devices $lvmdevs for LVM logical volumes $LVS" |
2557 |
- lvm lvscan --ignorelockingfailure 2>&1 | vinfo |
2558 |
- for LV in $LVS; do |
2559 |
-- if [ "x$(lvm lvs --noheadings --select "lv_attr =~ k" $LV | wc -l)" = "x0" ]; then |
2560 |
-- info "Skipping activation of '$LV' because activationskip is set." |
2561 |
-- continue |
2562 |
-- fi |
2563 |
- if [ -z "$sysinit" ]; then |
2564 |
- lvm lvchange --yes -ay --ignorelockingfailure $nopoll --ignoremonitoring $LV 2>&1 | vinfo |
2565 |
- else |
2566 |
--- |
2567 |
-2.4.5 |
2568 |
- |
2569 |
|
2570 |
diff --git a/sys-kernel/dracut/files/043-0002-Replace-echo-n-with-printf-in-code-wit.patch b/sys-kernel/dracut/files/043-0002-Replace-echo-n-with-printf-in-code-wit.patch |
2571 |
deleted file mode 100644 |
2572 |
index 7f0e62732a..0000000000 |
2573 |
--- a/sys-kernel/dracut/files/043-0002-Replace-echo-n-with-printf-in-code-wit.patch |
2574 |
+++ /dev/null |
2575 |
@@ -1,275 +0,0 @@ |
2576 |
-From 15f330fe1afe9ac8870461faad55b7d63e791aca Mon Sep 17 00:00:00 2001 |
2577 |
-From: Mike Gilbert <floppym@g.o> |
2578 |
-Date: Tue, 14 Jul 2015 22:22:14 -0400 |
2579 |
-Subject: [PATCH 2/3] Replace echo -n with printf in code with a /bin/sh |
2580 |
- shebang |
2581 |
- |
2582 |
-POSIX does not mandate that echo support the -n parameter. |
2583 |
-printf has more well-defined behavior. |
2584 |
---- |
2585 |
- modules.d/04watchdog/watchdog-stop.sh | 2 +- |
2586 |
- modules.d/40network/net-lib.sh | 2 +- |
2587 |
- modules.d/45ifcfg/write-ifcfg.sh | 2 +- |
2588 |
- modules.d/90lvm/lvm_scan.sh | 4 ++-- |
2589 |
- modules.d/95fcoe/fcoe-up.sh | 2 +- |
2590 |
- modules.d/98usrmount/mount-usr.sh | 2 +- |
2591 |
- modules.d/99base/dracut-lib.sh | 6 +++--- |
2592 |
- modules.d/99base/init.sh | 2 +- |
2593 |
- test/TEST-10-RAID/create-root.sh | 2 +- |
2594 |
- test/TEST-10-RAID/cryptroot-ask.sh | 2 +- |
2595 |
- test/TEST-12-RAID-DEG/create-root.sh | 2 +- |
2596 |
- test/TEST-12-RAID-DEG/cryptroot-ask.sh | 2 +- |
2597 |
- test/TEST-13-ENC-RAID-LVM/create-root.sh | 2 +- |
2598 |
- test/TEST-13-ENC-RAID-LVM/cryptroot-ask.sh | 2 +- |
2599 |
- test/TEST-14-IMSM/cryptroot-ask.sh | 2 +- |
2600 |
- test/TEST-20-NFS/client-init.sh | 2 +- |
2601 |
- test/TEST-40-NBD/create-root.sh | 2 +- |
2602 |
- test/TEST-40-NBD/cryptroot-ask.sh | 2 +- |
2603 |
- 18 files changed, 21 insertions(+), 21 deletions(-) |
2604 |
- |
2605 |
-diff --git a/modules.d/04watchdog/watchdog-stop.sh b/modules.d/04watchdog/watchdog-stop.sh |
2606 |
-index 91d45d6..921f969 100755 |
2607 |
---- a/modules.d/04watchdog/watchdog-stop.sh |
2608 |
-+++ b/modules.d/04watchdog/watchdog-stop.sh |
2609 |
-@@ -1,2 +1,2 @@ |
2610 |
- #!/bin/sh |
2611 |
--[ -c /dev/watchdog ] && echo -n 'V' > /dev/watchdog |
2612 |
-+[ -c /dev/watchdog ] && printf 'V' > /dev/watchdog |
2613 |
-diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh |
2614 |
-index a09cdaf..6c739e8 100755 |
2615 |
---- a/modules.d/40network/net-lib.sh |
2616 |
-+++ b/modules.d/40network/net-lib.sh |
2617 |
-@@ -189,7 +189,7 @@ set_ifname() { |
2618 |
- fix_bootif() { |
2619 |
- local macaddr=${1} |
2620 |
- local IFS='-' |
2621 |
-- macaddr=$(for i in ${macaddr} ; do echo -n $i:; done) |
2622 |
-+ macaddr=$(printf '%s:' ${macaddr}) |
2623 |
- macaddr=${macaddr%:} |
2624 |
- # strip hardware type field from pxelinux |
2625 |
- [ -n "${macaddr%??:??:??:??:??:??}" ] && macaddr=${macaddr#??:} |
2626 |
-diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh |
2627 |
-index fa7db27..251d684 100755 |
2628 |
---- a/modules.d/45ifcfg/write-ifcfg.sh |
2629 |
-+++ b/modules.d/45ifcfg/write-ifcfg.sh |
2630 |
-@@ -48,7 +48,7 @@ print_s390() { |
2631 |
- for i in /sys/class/net/$_netif/device/cdev[0-9]*; do |
2632 |
- [ -e $i ] || continue |
2633 |
- channel=$(readlink -f $i) |
2634 |
-- echo -n "${channel##*/}," |
2635 |
-+ printf '%s' "${channel##*/}," |
2636 |
- done |
2637 |
- }) |
2638 |
- [ -n "$SUBCHANNELS" ] || return 1 |
2639 |
-diff --git a/modules.d/90lvm/lvm_scan.sh b/modules.d/90lvm/lvm_scan.sh |
2640 |
-index 7495644..ead28aa 100755 |
2641 |
---- a/modules.d/90lvm/lvm_scan.sh |
2642 |
-+++ b/modules.d/90lvm/lvm_scan.sh |
2643 |
-@@ -15,14 +15,14 @@ SNAPSIZE=$(getargs rd.lvm.snapsize -d rd_LVM_SNAPSIZE=) |
2644 |
- lvmdevs=$( |
2645 |
- for f in /tmp/.lvm_scan-*; do |
2646 |
- [ -e "$f" ] || continue |
2647 |
-- echo -n "${f##/tmp/.lvm_scan-} " |
2648 |
-+ printf '%s' "${f##/tmp/.lvm_scan-} " |
2649 |
- done |
2650 |
- ) |
2651 |
- |
2652 |
- if [ ! -e /etc/lvm/lvm.conf ]; then |
2653 |
- { |
2654 |
- echo 'devices {'; |
2655 |
-- echo -n ' filter = [ ' |
2656 |
-+ printf ' filter = [ ' |
2657 |
- for dev in $lvmdevs; do |
2658 |
- printf '"a|^/dev/%s$|", ' $dev; |
2659 |
- done; |
2660 |
-diff --git a/modules.d/95fcoe/fcoe-up.sh b/modules.d/95fcoe/fcoe-up.sh |
2661 |
-index 43a0ad5..950e4b6 100755 |
2662 |
---- a/modules.d/95fcoe/fcoe-up.sh |
2663 |
-+++ b/modules.d/95fcoe/fcoe-up.sh |
2664 |
-@@ -64,7 +64,7 @@ elif [ "$netdriver" = "bnx2x" ]; then |
2665 |
- sleep 3 |
2666 |
- fipvlan "$netif" -c -s |
2667 |
- else |
2668 |
-- echo -n "$netif" > /sys/module/fcoe/parameters/create |
2669 |
-+ printf '%s' "$netif" > /sys/module/fcoe/parameters/create |
2670 |
- fi |
2671 |
- |
2672 |
- need_shutdown |
2673 |
-diff --git a/modules.d/98usrmount/mount-usr.sh b/modules.d/98usrmount/mount-usr.sh |
2674 |
-index c29610f..d1a629c 100755 |
2675 |
---- a/modules.d/98usrmount/mount-usr.sh |
2676 |
-+++ b/modules.d/98usrmount/mount-usr.sh |
2677 |
-@@ -12,7 +12,7 @@ filtersubvol() { |
2678 |
- while [ $# -gt 0 ]; do |
2679 |
- case $1 in |
2680 |
- subvol\=*) :;; |
2681 |
-- *) echo -n "${1}," ;; |
2682 |
-+ *) printf '%s' "${1}," ;; |
2683 |
- esac |
2684 |
- shift |
2685 |
- done |
2686 |
-diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh |
2687 |
-index 08110cc..7a3c58c 100755 |
2688 |
---- a/modules.d/99base/dracut-lib.sh |
2689 |
-+++ b/modules.d/99base/dracut-lib.sh |
2690 |
-@@ -298,7 +298,7 @@ _dogetargs() { |
2691 |
- fi |
2692 |
- done |
2693 |
- if [ -n "$_found" ]; then |
2694 |
-- [ $# -gt 0 ] && echo -n "$@" |
2695 |
-+ [ $# -gt 0 ] && printf '%s' "$*" |
2696 |
- return 0 |
2697 |
- fi |
2698 |
- return 1; |
2699 |
-@@ -329,9 +329,9 @@ getargs() { |
2700 |
- done |
2701 |
- if [ -n "$_gfound" ]; then |
2702 |
- if [ $# -gt 0 ]; then |
2703 |
-- echo -n "$@" |
2704 |
-+ printf '%s' "$*" |
2705 |
- else |
2706 |
-- echo -n 1 |
2707 |
-+ printf 1 |
2708 |
- fi |
2709 |
- debug_on |
2710 |
- return 0 |
2711 |
-diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh |
2712 |
-index f96dbb5..a59e8ea 100755 |
2713 |
---- a/modules.d/99base/init.sh |
2714 |
-+++ b/modules.d/99base/init.sh |
2715 |
-@@ -253,7 +253,7 @@ while :; do |
2716 |
- done |
2717 |
- |
2718 |
- { |
2719 |
-- echo -n "Mounted root filesystem " |
2720 |
-+ printf "Mounted root filesystem " |
2721 |
- while read dev mp rest || [ -n "$dev" ]; do [ "$mp" = "$NEWROOT" ] && echo $dev; done < /proc/mounts |
2722 |
- } | vinfo |
2723 |
- |
2724 |
-diff --git a/test/TEST-10-RAID/create-root.sh b/test/TEST-10-RAID/create-root.sh |
2725 |
-index a7e56a5..7b5f2a7 100755 |
2726 |
---- a/test/TEST-10-RAID/create-root.sh |
2727 |
-+++ b/test/TEST-10-RAID/create-root.sh |
2728 |
-@@ -18,7 +18,7 @@ mdadm --create /dev/md0 --run --auto=yes --level=5 --raid-devices=3 /dev/sda2 /d |
2729 |
- # randomly. |
2730 |
- mdadm -W /dev/md0 |
2731 |
- set -e |
2732 |
--echo -n test >keyfile |
2733 |
-+printf test >keyfile |
2734 |
- cryptsetup -q luksFormat /dev/md0 /keyfile |
2735 |
- echo "The passphrase is test" |
2736 |
- cryptsetup luksOpen /dev/md0 dracut_crypt_test </keyfile |
2737 |
-diff --git a/test/TEST-10-RAID/cryptroot-ask.sh b/test/TEST-10-RAID/cryptroot-ask.sh |
2738 |
-index 407d067..c39eff6 100755 |
2739 |
---- a/test/TEST-10-RAID/cryptroot-ask.sh |
2740 |
-+++ b/test/TEST-10-RAID/cryptroot-ask.sh |
2741 |
-@@ -1,5 +1,5 @@ |
2742 |
- #!/bin/sh |
2743 |
- |
2744 |
- [ -b "/dev/mapper/$2" ] && exit 0 |
2745 |
--echo -n test >/keyfile |
2746 |
-+printf test >/keyfile |
2747 |
- /sbin/cryptsetup luksOpen "$1" "$2" </keyfile |
2748 |
-diff --git a/test/TEST-12-RAID-DEG/create-root.sh b/test/TEST-12-RAID-DEG/create-root.sh |
2749 |
-index 7b9a171..3299aa6 100755 |
2750 |
---- a/test/TEST-12-RAID-DEG/create-root.sh |
2751 |
-+++ b/test/TEST-12-RAID-DEG/create-root.sh |
2752 |
-@@ -20,7 +20,7 @@ mdadm --create /dev/md0 --run --auto=yes --level=5 --raid-devices=3 /dev/sdb /de |
2753 |
- # wait for the array to finish initailizing, otherwise this sometimes fails |
2754 |
- # randomly. |
2755 |
- mdadm -W /dev/md0 |
2756 |
--echo -n test >keyfile |
2757 |
-+printf test >keyfile |
2758 |
- cryptsetup -q luksFormat /dev/md0 /keyfile |
2759 |
- echo "The passphrase is test" |
2760 |
- set -e |
2761 |
-diff --git a/test/TEST-12-RAID-DEG/cryptroot-ask.sh b/test/TEST-12-RAID-DEG/cryptroot-ask.sh |
2762 |
-index db27c5b..78ed7f5 100755 |
2763 |
---- a/test/TEST-12-RAID-DEG/cryptroot-ask.sh |
2764 |
-+++ b/test/TEST-12-RAID-DEG/cryptroot-ask.sh |
2765 |
-@@ -1,6 +1,6 @@ |
2766 |
- #!/bin/sh |
2767 |
- |
2768 |
- [ -b /dev/mapper/$2 ] && exit 0 |
2769 |
--echo -n test >/keyfile |
2770 |
-+printf test >/keyfile |
2771 |
- /sbin/cryptsetup luksOpen $1 $2 </keyfile |
2772 |
- |
2773 |
-diff --git a/test/TEST-13-ENC-RAID-LVM/create-root.sh b/test/TEST-13-ENC-RAID-LVM/create-root.sh |
2774 |
-index e74fe7f..72bc765 100755 |
2775 |
---- a/test/TEST-13-ENC-RAID-LVM/create-root.sh |
2776 |
-+++ b/test/TEST-13-ENC-RAID-LVM/create-root.sh |
2777 |
-@@ -14,7 +14,7 @@ sfdisk /dev/sda <<EOF |
2778 |
- ,25M |
2779 |
- EOF |
2780 |
- udevadm settle |
2781 |
--echo -n test >keyfile |
2782 |
-+printf test >keyfile |
2783 |
- cryptsetup -q luksFormat /dev/sda2 /keyfile |
2784 |
- cryptsetup -q luksFormat /dev/sda3 /keyfile |
2785 |
- cryptsetup -q luksFormat /dev/sda4 /keyfile |
2786 |
-diff --git a/test/TEST-13-ENC-RAID-LVM/cryptroot-ask.sh b/test/TEST-13-ENC-RAID-LVM/cryptroot-ask.sh |
2787 |
-index db27c5b..78ed7f5 100755 |
2788 |
---- a/test/TEST-13-ENC-RAID-LVM/cryptroot-ask.sh |
2789 |
-+++ b/test/TEST-13-ENC-RAID-LVM/cryptroot-ask.sh |
2790 |
-@@ -1,6 +1,6 @@ |
2791 |
- #!/bin/sh |
2792 |
- |
2793 |
- [ -b /dev/mapper/$2 ] && exit 0 |
2794 |
--echo -n test >/keyfile |
2795 |
-+printf test >/keyfile |
2796 |
- /sbin/cryptsetup luksOpen $1 $2 </keyfile |
2797 |
- |
2798 |
-diff --git a/test/TEST-14-IMSM/cryptroot-ask.sh b/test/TEST-14-IMSM/cryptroot-ask.sh |
2799 |
-index db27c5b..78ed7f5 100755 |
2800 |
---- a/test/TEST-14-IMSM/cryptroot-ask.sh |
2801 |
-+++ b/test/TEST-14-IMSM/cryptroot-ask.sh |
2802 |
-@@ -1,6 +1,6 @@ |
2803 |
- #!/bin/sh |
2804 |
- |
2805 |
- [ -b /dev/mapper/$2 ] && exit 0 |
2806 |
--echo -n test >/keyfile |
2807 |
-+printf test >/keyfile |
2808 |
- /sbin/cryptsetup luksOpen $1 $2 </keyfile |
2809 |
- |
2810 |
-diff --git a/test/TEST-20-NFS/client-init.sh b/test/TEST-20-NFS/client-init.sh |
2811 |
-index 2311981..a443289 100755 |
2812 |
---- a/test/TEST-20-NFS/client-init.sh |
2813 |
-+++ b/test/TEST-20-NFS/client-init.sh |
2814 |
-@@ -8,7 +8,7 @@ strstr() { [ "${1##*"$2"*}" != "$1" ]; } |
2815 |
- |
2816 |
- stty sane |
2817 |
- if strstr "$CMDLINE" "rd.shell"; then |
2818 |
-- [ -c /dev/watchdog ] && echo -n 'V' > /dev/watchdog |
2819 |
-+ [ -c /dev/watchdog ] && printf 'V' > /dev/watchdog |
2820 |
- strstr "$(setsid --help)" "control" && CTTY="-c" |
2821 |
- setsid $CTTY sh -i |
2822 |
- fi |
2823 |
-diff --git a/test/TEST-40-NBD/create-root.sh b/test/TEST-40-NBD/create-root.sh |
2824 |
-index 391279e..20d0eff 100755 |
2825 |
---- a/test/TEST-40-NBD/create-root.sh |
2826 |
-+++ b/test/TEST-40-NBD/create-root.sh |
2827 |
-@@ -5,7 +5,7 @@ for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do |
2828 |
- done |
2829 |
- rm -f -- /etc/lvm/lvm.conf |
2830 |
- udevadm control --reload |
2831 |
--echo -n test >keyfile |
2832 |
-+printf test >keyfile |
2833 |
- cryptsetup -q luksFormat /dev/sdb /keyfile |
2834 |
- echo "The passphrase is test" |
2835 |
- cryptsetup luksOpen /dev/sdb dracut_crypt_test </keyfile && \ |
2836 |
-diff --git a/test/TEST-40-NBD/cryptroot-ask.sh b/test/TEST-40-NBD/cryptroot-ask.sh |
2837 |
-index db27c5b..78ed7f5 100755 |
2838 |
---- a/test/TEST-40-NBD/cryptroot-ask.sh |
2839 |
-+++ b/test/TEST-40-NBD/cryptroot-ask.sh |
2840 |
-@@ -1,6 +1,6 @@ |
2841 |
- #!/bin/sh |
2842 |
- |
2843 |
- [ -b /dev/mapper/$2 ] && exit 0 |
2844 |
--echo -n test >/keyfile |
2845 |
-+printf test >/keyfile |
2846 |
- /sbin/cryptsetup luksOpen $1 $2 </keyfile |
2847 |
- |
2848 |
--- |
2849 |
-2.5.0 |
2850 |
- |
2851 |
|
2852 |
diff --git a/sys-kernel/dracut/files/043-0003-syncheck-Look-for-echo-n-usage-in-modu.patch b/sys-kernel/dracut/files/043-0003-syncheck-Look-for-echo-n-usage-in-modu.patch |
2853 |
deleted file mode 100644 |
2854 |
index 8be88334cc..0000000000 |
2855 |
--- a/sys-kernel/dracut/files/043-0003-syncheck-Look-for-echo-n-usage-in-modu.patch |
2856 |
+++ /dev/null |
2857 |
@@ -1,26 +0,0 @@ |
2858 |
-From 4e17745f9786bfe21d5419c2e0eeff8c5667e747 Mon Sep 17 00:00:00 2001 |
2859 |
-From: Mike Gilbert <floppym@g.o> |
2860 |
-Date: Tue, 14 Jul 2015 11:12:16 -0400 |
2861 |
-Subject: [PATCH 3/3] syncheck: Look for 'echo -n' usage in modules |
2862 |
- |
2863 |
---- |
2864 |
- Makefile | 3 ++- |
2865 |
- 1 file changed, 2 insertions(+), 1 deletion(-) |
2866 |
- |
2867 |
-diff --git a/Makefile b/Makefile |
2868 |
-index 0af5d0f..16c6d2a 100644 |
2869 |
---- a/Makefile |
2870 |
-+++ b/Makefile |
2871 |
-@@ -211,7 +211,8 @@ syncheck: |
2872 |
- [ "$${i##*/}" = "module-setup.sh" ] && continue; \ |
2873 |
- read line < "$$i"; [ "$${line#*bash*}" != "$$line" ] && continue; \ |
2874 |
- [ $$V ] && echo "posix syntax check: $$i"; bash --posix -n "$$i" ; ret=$$(($$ret+$$?)); \ |
2875 |
-- [ $$V ] && echo "checking for [[: $$i"; if grep -Fq '[[ ' "$$i" ; then ret=$$(($$ret+1)); echo "$$i contains [["; fi \ |
2876 |
-+ [ $$V ] && echo "checking for [[: $$i"; if grep -Fq '[[ ' "$$i" ; then ret=$$(($$ret+1)); echo "$$i contains [["; fi; \ |
2877 |
-+ [ $$V ] && echo "checking for echo -n: $$i"; if grep -Fq 'echo -n ' "$$i" ; then ret=$$(($$ret+1)); echo "$$i contains echo -n"; fi \ |
2878 |
- done;exit $$ret |
2879 |
- @ret=0;for i in *.sh mkinitrd-dracut.sh modules.d/*/*.sh \ |
2880 |
- modules.d/*/module-setup.sh; do \ |
2881 |
--- |
2882 |
-2.5.0 |
2883 |
- |
2884 |
|
2885 |
diff --git a/sys-kernel/dracut/files/043-0004-dracut-initramfs-restore-make-mount-er.patch b/sys-kernel/dracut/files/043-0004-dracut-initramfs-restore-make-mount-er.patch |
2886 |
deleted file mode 100644 |
2887 |
index 23e30e1f70..0000000000 |
2888 |
--- a/sys-kernel/dracut/files/043-0004-dracut-initramfs-restore-make-mount-er.patch |
2889 |
+++ /dev/null |
2890 |
@@ -1,28 +0,0 @@ |
2891 |
-From a18c8fdc9cb3eb917e9a7a30466839c33131cc8a Mon Sep 17 00:00:00 2001 |
2892 |
-From: Alexander Tsoy <alexander@××××.me> |
2893 |
-Date: Tue, 28 Jul 2015 14:55:59 +0300 |
2894 |
-Subject: [PATCH 4/4] dracut-initramfs-restore: make mount error nonfatal |
2895 |
- |
2896 |
-Script enables errexit option (set -e). So if /boot is not a mount point |
2897 |
-or is already mounted, then script dies after unsuccessful mount |
2898 |
-command. Fix this by always returning successful result. |
2899 |
---- |
2900 |
- dracut-initramfs-restore.sh | 2 +- |
2901 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
2902 |
- |
2903 |
-diff --git a/dracut-initramfs-restore.sh b/dracut-initramfs-restore.sh |
2904 |
-index 0e6a1a8..0c41a59 100644 |
2905 |
---- a/dracut-initramfs-restore.sh |
2906 |
-+++ b/dracut-initramfs-restore.sh |
2907 |
-@@ -14,7 +14,7 @@ SKIP="$dracutbasedir/skipcpio" |
2908 |
- |
2909 |
- [[ -f /etc/machine-id ]] && read MACHINE_ID < /etc/machine-id |
2910 |
- |
2911 |
--mount -o ro /boot &>/dev/null |
2912 |
-+mount -o ro /boot &>/dev/null || true |
2913 |
- |
2914 |
- if [[ $MACHINE_ID ]] && [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]] ; then |
2915 |
- IMG="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd" |
2916 |
--- |
2917 |
-2.5.0 |
2918 |
- |