mirror of
https://github.com/flatcar/scripts.git
synced 2025-12-07 10:22:12 +01:00
Merge pull request #563 from dm0-/dracut
bump(sys-kernel/dracut): sync with upstream
This commit is contained in:
commit
a1d5775603
@ -1,15 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install postinst prepare setup
|
||||
DEPEND=virtual/udev !>=sys-fs/udev-210 !>=sys-apps/systemd-210 dracut_modules_systemd? ( >=sys-apps/systemd-199 ) selinux? ( sec-policy/selinux-dracut ) app-text/asciidoc >=dev-libs/libxslt-1.1.26 app-text/docbook-xml-dtd:4.5 >=app-text/docbook-xsl-stylesheets-1.75.2 virtual/pkgconfig virtual/pkgconfig
|
||||
DESCRIPTION=Generic initramfs generation tool
|
||||
EAPI=4
|
||||
HOMEPAGE=https://dracut.wiki.kernel.org
|
||||
IUSE=debug device-mapper net selinux dracut_modules_biosdevname dracut_modules_bootchart dracut_modules_btrfs dracut_modules_caps dracut_modules_crypt-gpg dracut_modules_crypt-loop dracut_modules_dash dracut_modules_gensplash dracut_modules_mdraid dracut_modules_multipath dracut_modules_plymouth dracut_modules_syslog dracut_modules_systemd dracut_modules_crypt dracut_modules_dmraid dracut_modules_dmsquash-live dracut_modules_livenet dracut_modules_lvm dracut_modules_cifs dracut_modules_iscsi dracut_modules_livenet dracut_modules_nbd dracut_modules_nfs dracut_modules_ssh-client
|
||||
KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
|
||||
LICENSE=GPL-2
|
||||
RDEPEND=virtual/udev !>=sys-fs/udev-210 !>=sys-apps/systemd-210 dracut_modules_systemd? ( >=sys-apps/systemd-199 ) selinux? ( sec-policy/selinux-dracut ) app-arch/cpio >=app-shells/bash-4.0 >=sys-apps/baselayout-1.12.14-r1 >sys-apps/kmod-5[tools] || ( >=sys-apps/sysvinit-2.87-r3 sys-apps/systemd[sysv-utils] sys-apps/systemd-sysv-utils ) >=sys-apps/util-linux-2.21 debug? ( dev-util/strace ) device-mapper? ( >=sys-fs/lvm2-2.02.33 ) net? ( net-misc/curl >=net-misc/dhcp-4.2.4_p2-r1[client] sys-apps/iproute2 ) selinux? ( sys-libs/libselinux sys-libs/libsepol ) dracut_modules_biosdevname? ( sys-apps/biosdevname ) dracut_modules_bootchart? ( app-admin/killproc app-benchmarks/bootchart2 sys-process/acct ) dracut_modules_btrfs? ( sys-fs/btrfs-progs ) dracut_modules_caps? ( sys-libs/libcap ) dracut_modules_cifs? ( net-fs/cifs-utils ) dracut_modules_crypt? ( sys-fs/cryptsetup ) dracut_modules_crypt-gpg? ( app-crypt/gnupg ) dracut_modules_dash? ( >=app-shells/dash-0.5.4.11 ) dracut_modules_dmraid? ( sys-fs/dmraid sys-fs/multipath-tools ) dracut_modules_gensplash? ( media-gfx/splashutils ) dracut_modules_iscsi? ( >=sys-block/open-iscsi-2.0.871.3 ) dracut_modules_lvm? ( >=sys-fs/lvm2-2.02.33 ) dracut_modules_mdraid? ( >=sys-fs/mdadm-3.2.6-r1 ) dracut_modules_multipath? ( sys-fs/multipath-tools ) dracut_modules_nbd? ( sys-block/nbd ) dracut_modules_nfs? ( net-fs/nfs-utils net-nds/rpcbind ) dracut_modules_plymouth? ( >=sys-boot/plymouth-0.8.3-r1 ) dracut_modules_ssh-client? ( net-misc/openssh ) dracut_modules_syslog? ( || ( app-admin/syslog-ng app-admin/rsyslog ) )
|
||||
REQUIRED_USE=dracut_modules_bootchart? ( !dracut_modules_systemd ) dracut_modules_crypt-gpg? ( dracut_modules_crypt ) dracut_modules_crypt-loop? ( dracut_modules_crypt ) dracut_modules_livenet? ( dracut_modules_dmsquash-live ) dracut_modules_crypt? ( device-mapper ) dracut_modules_dmraid? ( device-mapper ) dracut_modules_dmsquash-live? ( device-mapper ) dracut_modules_livenet? ( device-mapper ) dracut_modules_lvm? ( device-mapper ) dracut_modules_cifs? ( net ) dracut_modules_iscsi? ( net ) dracut_modules_livenet? ( net ) dracut_modules_nbd? ( net ) dracut_modules_nfs? ( net ) dracut_modules_ssh-client? ( net )
|
||||
RESTRICT=test
|
||||
SLOT=0
|
||||
SRC_URI=mirror://kernel/linux/utils/boot/dracut/dracut-034.tar.bz2 https://dev.gentoo.org/~aidecoe/distfiles/sys-kernel/dracut/034-0010-module-setup.sh-add-comments.patch.bz2
|
||||
_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 0236be304ee52e7f179ed2f337075515 systemd ec2e9154031d942186c75c0aabb41900 toolchain-funcs 6eb35f81556258a4bc9182ad3dfd58ee versionator c80ccf29e90adea7c5cae94b42eb76d0
|
||||
_md5_=2ede29bc50113e7f48d09f810250acfb
|
||||
@ -1,14 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install postinst prepare setup
|
||||
DEPEND=virtual/udev systemd? ( >=sys-apps/systemd-199 ) app-text/asciidoc >=dev-libs/libxslt-1.1.26 app-text/docbook-xml-dtd:4.5 >=app-text/docbook-xsl-stylesheets-1.75.2 virtual/pkgconfig virtual/pkgconfig
|
||||
DESCRIPTION=Generic initramfs generation tool
|
||||
EAPI=4
|
||||
HOMEPAGE=https://dracut.wiki.kernel.org
|
||||
IUSE=debug selinux systemd
|
||||
KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
|
||||
LICENSE=GPL-2
|
||||
RDEPEND=virtual/udev systemd? ( >=sys-apps/systemd-199 ) app-arch/cpio >=app-shells/bash-4.0 >sys-apps/kmod-5[tools] || ( >=sys-apps/sysvinit-2.87-r3 sys-apps/systemd[sysv-utils] sys-apps/systemd-sysv-utils ) >=sys-apps/util-linux-2.21 debug? ( dev-util/strace ) selinux? ( sys-libs/libselinux sys-libs/libsepol sec-policy/selinux-dracut )
|
||||
RESTRICT=test
|
||||
SLOT=0
|
||||
SRC_URI=mirror://kernel/linux/utils/boot/dracut/dracut-041.tar.xz
|
||||
_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 0236be304ee52e7f179ed2f337075515 systemd ec2e9154031d942186c75c0aabb41900 toolchain-funcs 6eb35f81556258a4bc9182ad3dfd58ee versionator c80ccf29e90adea7c5cae94b42eb76d0
|
||||
_md5_=840959cb155ccc5f040c520d5b874be2
|
||||
@ -1,14 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install postinst prepare setup
|
||||
DEPEND=virtual/udev systemd? ( >=sys-apps/systemd-199 ) app-text/asciidoc >=dev-libs/libxslt-1.1.26 app-text/docbook-xml-dtd:4.5 >=app-text/docbook-xsl-stylesheets-1.75.2 virtual/pkgconfig virtual/pkgconfig
|
||||
DESCRIPTION=Generic initramfs generation tool
|
||||
EAPI=4
|
||||
HOMEPAGE=https://dracut.wiki.kernel.org
|
||||
IUSE=debug selinux systemd
|
||||
KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
|
||||
LICENSE=GPL-2
|
||||
RDEPEND=virtual/udev systemd? ( >=sys-apps/systemd-199 ) app-arch/cpio >=app-shells/bash-4.0 >sys-apps/kmod-5[tools] || ( >=sys-apps/sysvinit-2.87-r3 sys-apps/systemd[sysv-utils] sys-apps/systemd-sysv-utils ) >=sys-apps/util-linux-2.21 debug? ( dev-util/strace ) selinux? ( sys-libs/libselinux sys-libs/libsepol sec-policy/selinux-dracut )
|
||||
RESTRICT=test
|
||||
SLOT=0
|
||||
SRC_URI=mirror://kernel/linux/utils/boot/dracut/dracut-043.tar.xz
|
||||
_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 0236be304ee52e7f179ed2f337075515 systemd ec2e9154031d942186c75c0aabb41900 toolchain-funcs 6eb35f81556258a4bc9182ad3dfd58ee versionator c80ccf29e90adea7c5cae94b42eb76d0
|
||||
_md5_=3b37e33e49f155995c030c9e8e45fab2
|
||||
@ -4,11 +4,11 @@ DESCRIPTION=Generic initramfs generation tool
|
||||
EAPI=5
|
||||
HOMEPAGE=https://dracut.wiki.kernel.org
|
||||
IUSE=debug selinux systemd
|
||||
KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
|
||||
KEYWORDS=alpha amd64 ~arm ia64 ppc ~ppc64 sparc x86
|
||||
LICENSE=GPL-2
|
||||
RDEPEND=virtual/udev systemd? ( >=sys-apps/systemd-199 ) app-arch/cpio >=app-shells/bash-4.0 >sys-apps/kmod-5[tools] || ( >=sys-apps/sysvinit-2.87-r3 sys-apps/systemd[sysv-utils] sys-apps/systemd-sysv-utils ) >=sys-apps/util-linux-2.21 debug? ( dev-util/strace ) selinux? ( sys-libs/libselinux sys-libs/libsepol sec-policy/selinux-dracut )
|
||||
RDEPEND=virtual/udev systemd? ( >=sys-apps/systemd-199 ) app-arch/cpio >=app-shells/bash-4.0 >sys-apps/kmod-5[tools] || ( >=sys-apps/sysvinit-2.87-r3 sys-apps/systemd[sysv-utils] sys-apps/systemd-sysv-utils ) >=sys-apps/util-linux-2.21 debug? ( dev-util/strace ) selinux? ( sys-libs/libselinux sys-libs/libsepol sec-policy/selinux-dracut ) !>=app-shells/bash-4.4
|
||||
RESTRICT=test
|
||||
SLOT=0
|
||||
SRC_URI=mirror://kernel/linux/utils/boot/dracut/dracut-044.tar.xz
|
||||
_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 0236be304ee52e7f179ed2f337075515 systemd ec2e9154031d942186c75c0aabb41900 toolchain-funcs 6eb35f81556258a4bc9182ad3dfd58ee versionator c80ccf29e90adea7c5cae94b42eb76d0
|
||||
_md5_=b9135192e0deb95fbb1e06d21169aa77
|
||||
_md5_=c156037e906e085d1edda743b41059fc
|
||||
@ -1,14 +1,14 @@
|
||||
DEFINED_PHASES=compile configure install postinst prepare setup
|
||||
DEPEND=virtual/udev systemd? ( >=sys-apps/systemd-199 ) app-text/asciidoc >=dev-libs/libxslt-1.1.26 app-text/docbook-xml-dtd:4.5 >=app-text/docbook-xsl-stylesheets-1.75.2 virtual/pkgconfig virtual/pkgconfig
|
||||
DEPEND=virtual/udev systemd? ( >=sys-apps/systemd-199 virtual/pkgconfig ) app-text/asciidoc >=dev-libs/libxslt-1.1.26 app-text/docbook-xml-dtd:4.5 >=app-text/docbook-xsl-stylesheets-1.75.2 virtual/pkgconfig virtual/pkgconfig
|
||||
DESCRIPTION=Generic initramfs generation tool
|
||||
EAPI=4
|
||||
EAPI=6
|
||||
HOMEPAGE=https://dracut.wiki.kernel.org
|
||||
IUSE=debug selinux systemd
|
||||
KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
|
||||
LICENSE=GPL-2
|
||||
RDEPEND=virtual/udev systemd? ( >=sys-apps/systemd-199 ) app-arch/cpio >=app-shells/bash-4.0 >sys-apps/kmod-5[tools] || ( >=sys-apps/sysvinit-2.87-r3 sys-apps/systemd[sysv-utils] sys-apps/systemd-sysv-utils ) >=sys-apps/util-linux-2.21 debug? ( dev-util/strace ) selinux? ( sys-libs/libselinux sys-libs/libsepol sec-policy/selinux-dracut )
|
||||
RDEPEND=virtual/udev systemd? ( >=sys-apps/systemd-199 virtual/pkgconfig ) app-arch/cpio >=app-shells/bash-4.0 >sys-apps/kmod-5[tools] || ( >=sys-apps/sysvinit-2.87-r3 sys-apps/systemd[sysv-utils] sys-apps/systemd-sysv-utils ) >=sys-apps/util-linux-2.21 debug? ( dev-util/strace ) selinux? ( sys-libs/libselinux sys-libs/libsepol sec-policy/selinux-dracut )
|
||||
RESTRICT=test
|
||||
SLOT=0
|
||||
SRC_URI=mirror://kernel/linux/utils/boot/dracut/dracut-040.tar.xz
|
||||
SRC_URI=mirror://kernel/linux/utils/boot/dracut/dracut-044.tar.xz
|
||||
_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 0236be304ee52e7f179ed2f337075515 systemd ec2e9154031d942186c75c0aabb41900 toolchain-funcs 6eb35f81556258a4bc9182ad3dfd58ee versionator c80ccf29e90adea7c5cae94b42eb76d0
|
||||
_md5_=c07a846d4310349fd76ad66335fde463
|
||||
_md5_=70bf8de0aa84668280131f20766293f0
|
||||
14
sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/dracut-045-r2
vendored
Normal file
14
sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-kernel/dracut-045-r2
vendored
Normal file
@ -0,0 +1,14 @@
|
||||
DEFINED_PHASES=configure install postinst setup
|
||||
DEPEND=virtual/udev virtual/pkgconfig >=sys-apps/kmod-15[tools] app-text/asciidoc >=dev-libs/libxslt-1.1.26 app-text/docbook-xml-dtd:4.5 >=app-text/docbook-xsl-stylesheets-1.75.2 virtual/pkgconfig
|
||||
DESCRIPTION=Generic initramfs generation tool
|
||||
EAPI=6
|
||||
HOMEPAGE=https://dracut.wiki.kernel.org
|
||||
IUSE=debug selinux
|
||||
KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
|
||||
LICENSE=GPL-2
|
||||
RDEPEND=virtual/udev virtual/pkgconfig >=sys-apps/kmod-15[tools] app-arch/cpio >=app-shells/bash-4.0:0 || ( >=sys-apps/sysvinit-2.87-r3 sys-apps/systemd[sysv-utils] sys-apps/systemd-sysv-utils ) sys-apps/coreutils[xattr(-)] >=sys-apps/util-linux-2.21 debug? ( dev-util/strace ) selinux? ( sys-libs/libselinux sys-libs/libsepol sec-policy/selinux-dracut ) !net-analyzer/arping
|
||||
RESTRICT=test
|
||||
SLOT=0
|
||||
SRC_URI=mirror://kernel/linux/utils/boot/dracut/dracut-045.tar.xz
|
||||
_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 0236be304ee52e7f179ed2f337075515 systemd ec2e9154031d942186c75c0aabb41900 toolchain-funcs 6eb35f81556258a4bc9182ad3dfd58ee versionator c80ccf29e90adea7c5cae94b42eb76d0
|
||||
_md5_=8fb70134e2ae8c2a9b1ad5757ba20894
|
||||
@ -1,201 +0,0 @@
|
||||
# ChangeLog for sys-kernel/dracut
|
||||
# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
|
||||
# (auto-generated from git log)
|
||||
|
||||
*dracut-043 (09 Aug 2015)
|
||||
*dracut-041-r3 (09 Aug 2015)
|
||||
*dracut-040-r3 (09 Aug 2015)
|
||||
*dracut-034-r4 (09 Aug 2015)
|
||||
|
||||
09 Aug 2015; Robin H. Johnson <robbat2@gentoo.org> +dracut-034-r4.ebuild,
|
||||
+dracut-040-r3.ebuild, +dracut-041-r3.ebuild, +dracut-043.ebuild,
|
||||
+files/034-0001-dracut.sh-do-not-bail-out-if-kernel-mo.patch,
|
||||
+files/034-0002-dracut-functions.sh-support-for-altern.patch,
|
||||
+files/034-0003-gentoo.conf-let-udevdir-be-handled-by-.patch,
|
||||
+files/034-0004-Use-the-same-paths-in-dracut.sh-as-tho.patch,
|
||||
+files/034-0005-Install-dracut-install-into-libexec-di.patch,
|
||||
+files/034-0006-resume-fix-swap-detection-in-hostonly.patch,
|
||||
+files/034-0007-dracut.sh-also-mkdir-run-lock-which-is.patch,
|
||||
+files/034-0008-dracut.sh-no-need-to-make-subdirs-in-r.patch,
|
||||
+files/034-0009-lvm-install-thin-utils-for-non-hostonl.patch,
|
||||
+files/034-0011-lvm-fix-thin-recognition.patch,
|
||||
+files/034-0012-lvm-always-install-thin-utils-for-lvm.patch,
|
||||
+files/034-0013-usrmount-always-install.patch,
|
||||
+files/034-0014-udev-rules-add-eudev-rules.patch,
|
||||
+files/040-0001-dracut-functions.sh-support-for-altern.patch,
|
||||
+files/040-0002-gentoo.conf-let-udevdir-be-handled-by-.patch,
|
||||
+files/040-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch,
|
||||
+files/040-0004-Install-dracut-install-into-libexec-di.patch,
|
||||
+files/040-0005-NEWS-add-040-entry.patch,
|
||||
+files/040-0006-Don-t-pass-rsyncable-option-to-gzip-Ge.patch,
|
||||
+files/040-0007-Take-into-account-lib64-dirs-when-dete.patch,
|
||||
+files/041-0001-Use-the-same-paths-in-dracut.sh-as-tho.patch,
|
||||
+files/041-0002-Install-dracut-install-and-skipcpio-in.patch,
|
||||
+files/041-0003-Take-into-account-lib64-dirs-when-dete.patch,
|
||||
+files/041-0004-Portability-fixes.patch,
|
||||
+files/041-0005-base-dracut-lib.sh-remove-bashism.patch, +metadata.xml:
|
||||
proj/gentoo: Initial commit
|
||||
|
||||
This commit represents a new era for Gentoo:
|
||||
Storing the gentoo-x86 tree in Git, as converted from CVS.
|
||||
|
||||
This commit is the start of the NEW history.
|
||||
Any historical data is intended to be grafted onto this point.
|
||||
|
||||
Creation process:
|
||||
1. Take final CVS checkout snapshot
|
||||
2. Remove ALL ChangeLog* files
|
||||
3. Transform all Manifests to thin
|
||||
4. Remove empty Manifests
|
||||
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
|
||||
5.1. Do not touch files with -kb/-ko keyword flags.
|
||||
|
||||
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
|
||||
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration
|
||||
tests
|
||||
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this
|
||||
project
|
||||
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo
|
||||
developer, wrote Git features for the migration
|
||||
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve
|
||||
cvs2svn
|
||||
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
|
||||
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014
|
||||
work in migration
|
||||
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
|
||||
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on
|
||||
the bikeshed
|
||||
|
||||
09 Aug 2015; Matthew Thode <prometheanfire@gentoo.org> metadata.xml:
|
||||
adding self to maintainers list
|
||||
|
||||
Signed-off-by: Matthew Thode <prometheanfire@gentoo.org>
|
||||
|
||||
*dracut-043-r1 (12 Aug 2015)
|
||||
|
||||
12 Aug 2015; Amadeusz Żołnowski <aidecoe@gentoo.org> +dracut-043-r1.ebuild,
|
||||
+files/043-0001-Revert-lvm-Don-t-activate-LVs-with-act.patch:
|
||||
Remove broken LVM activation skip logic
|
||||
|
||||
Gentoo-Bug: 553444
|
||||
|
||||
12 Aug 2015; Amadeusz Żołnowski <aidecoe@gentoo.org> metadata.xml:
|
||||
Add Patrick McLean as the primary maintainer
|
||||
|
||||
Package-Manager: portage-2.2.20
|
||||
|
||||
12 Aug 2015; Amadeusz Żołnowski <aidecoe@gentoo.org> metadata.xml:
|
||||
Move me lower on the list of maintainers
|
||||
|
||||
Package-Manager: portage-2.2.20
|
||||
|
||||
13 Aug 2015; Mike Gilbert <floppym@gentoo.org> dracut-043-r1.ebuild:
|
||||
Replace $Header: $ with $Id$ where it has accidentally been reverted
|
||||
|
||||
16 Aug 2015; Amadeusz Żołnowski <aidecoe@gentoo.org> dracut-034-r4.ebuild,
|
||||
dracut-040-r3.ebuild, dracut-041-r3.ebuild, dracut-043.ebuild,
|
||||
dracut-043-r1.ebuild:
|
||||
Don't complain about missing sources
|
||||
|
||||
Use /proc/config.gz if sources are not installed.
|
||||
|
||||
Gentoo-Bug: 508652
|
||||
|
||||
Package-Manager: portage-2.2.20.1
|
||||
|
||||
16 Aug 2015; Amadeusz Żołnowski <aidecoe@gentoo.org> dracut-043-r1.ebuild,
|
||||
+files/043-0002-Replace-echo-n-with-printf-in-code-wit.patch,
|
||||
+files/043-0003-syncheck-Look-for-echo-n-usage-in-modu.patch:
|
||||
Add patches removing non-portable use of `echo -n`
|
||||
|
||||
Gentoo-Bug: 554750
|
||||
|
||||
Package-Manager: portage-2.2.20.1
|
||||
|
||||
*dracut-043-r2 (16 Aug 2015)
|
||||
|
||||
16 Aug 2015; Amadeusz Żołnowski <aidecoe@gentoo.org> -dracut-043-r1.ebuild,
|
||||
+dracut-043-r2.ebuild:
|
||||
Bump revision to trigger user update
|
||||
|
||||
Bump due to following change:
|
||||
|
||||
Add patches removing non-portable use of `echo -n`
|
||||
|
||||
Gentoo-Bug: 554750
|
||||
|
||||
Package-Manager: portage-2.2.20.1
|
||||
|
||||
16 Aug 2015; Amadeusz Żołnowski <aidecoe@gentoo.org> -dracut-043.ebuild:
|
||||
Remove old revision of 043 version
|
||||
|
||||
Package-Manager: portage-2.2.20.1
|
||||
|
||||
16 Aug 2015; Amadeusz Żołnowski <aidecoe@gentoo.org> dracut-043-r2.ebuild,
|
||||
+files/043-0004-dracut-initramfs-restore-make-mount-er.patch:
|
||||
Add patch fixing dracut-initramfs-restore
|
||||
|
||||
Patch makes mount error nonfatal in dracut-initramfs-restore.
|
||||
|
||||
Commit on behalf of Alexander Tsoy <alexander@tsoy.me>.
|
||||
|
||||
Gentoo-Bug: 533084
|
||||
|
||||
Package-Manager: portage-2.2.20.1
|
||||
|
||||
24 Aug 2015; Justin Lecher <jlec@gentoo.org> dracut-034-r4.ebuild,
|
||||
metadata.xml:
|
||||
Use https by default
|
||||
|
||||
Convert all URLs for sites supporting encrypted connections from http to
|
||||
https
|
||||
|
||||
Signed-off-by: Justin Lecher <jlec@gentoo.org>
|
||||
|
||||
24 Aug 2015; Justin Lecher <jlec@gentoo.org> dracut-034-r4.ebuild,
|
||||
dracut-040-r3.ebuild, dracut-041-r3.ebuild, dracut-043-r2.ebuild:
|
||||
Use https for kernel.org and redhat.com
|
||||
|
||||
Signed-off-by: Justin Lecher <jlec@gentoo.org>
|
||||
|
||||
24 Aug 2015; Mike Gilbert <floppym@gentoo.org> metadata.xml:
|
||||
Revert DOCTYPE SYSTEM https changes in metadata.xml
|
||||
|
||||
repoman does not yet accept the https version.
|
||||
This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450.
|
||||
|
||||
Bug: https://bugs.gentoo.org/552720
|
||||
|
||||
12 Sep 2015; Justin Lecher <jlec@gentoo.org> dracut-040-r3.ebuild,
|
||||
dracut-041-r3.ebuild, dracut-043-r2.ebuild, metadata.xml:
|
||||
Use optfeature from eutils.eclass
|
||||
|
||||
Package-Manager: portage-2.2.20
|
||||
Signed-off-by: Justin Lecher <jlec@gentoo.org>
|
||||
|
||||
*dracut-044 (03 Jan 2016)
|
||||
|
||||
03 Jan 2016; Manuel Rüger <mrueg@gentoo.org> +dracut-044.ebuild:
|
||||
Version bump
|
||||
|
||||
Gentoo-Bug: 567118
|
||||
|
||||
Package-Manager: portage-2.2.26
|
||||
|
||||
24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
|
||||
Replace all herds with appropriate projects (GLEP 67)
|
||||
|
||||
Replace all uses of herd with appropriate project maintainers, or no
|
||||
maintainers in case of herds requested to be disbanded.
|
||||
|
||||
24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
|
||||
Set appropriate maintainer types in metadata.xml (GLEP 67)
|
||||
|
||||
29 Mar 2016; Ian Delaney <idella4@gentoo.org> metadata.xml:
|
||||
cleanup of entries in metadata
|
||||
|
||||
Remove prometheanfire with consent give in irc, today
|
||||
also remove redundant presence of gentoo proxy maintianers project
|
||||
|
||||
Package-Manager: portage-2.2.28
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,43 +1,14 @@
|
||||
AUX 034-0001-dracut.sh-do-not-bail-out-if-kernel-mo.patch 1140 SHA256 4c69a0c918aa1351316aeaeaab926defc5841b9743633e23fdf4fd8e54773707 SHA512 74122a07e64ae410f76a0b630385ea6a146121c706f2235c3a43108f3743c9162fa3473ee1a266b0e5004f27bb02559f363dfa46764bc007f3395d16291904c6 WHIRLPOOL de4a4f7cfdc727f7a913ac7e005594b7392b95eb8540fd3bff44bdebd6dab136a2833f3f75bab04288e1a14a65e76303db356c0bbe7db421e51bc7d3447ce7cf
|
||||
AUX 034-0002-dracut-functions.sh-support-for-altern.patch 1487 SHA256 85cd66fe8d36405dbf459a496ee3d5ed32e0606933218a23266caf591c0c04ee SHA512 00e7a22b76911a5cc9ccf82815643409307159ec0fd329c6f86bf8f6f76c0c235b76c8fd4f588d0e5b1820b2654acbc4735eda09df68da7a676e7e5e252364aa WHIRLPOOL 9c05204b4eb8129598e1177203dd9c5312082f97c922c65e8e325bc89feded2c030e66a793b7bcdebd95feda06f8cf01327e95ad71693706e7de02369f9f2571
|
||||
AUX 034-0003-gentoo.conf-let-udevdir-be-handled-by-.patch 950 SHA256 2e6e49dd481048906275c5d31756cff1cb8e9166dbf4aa61a46de81b552f93ec SHA512 ecf99d9bbc326c4fce1319d67af9cc55e1e3559f98568df13e51728b0da40a9e18e201662cf7e743a61ddd90caa014987130894fc8bc3bf47f381ec35d36fcd4 WHIRLPOOL f6cff2f46dbf40bfbb15174e1c984ed84f1abf1707d9369c6b43ab874efbae3f50f2cae211bc31a9f8a81bf6fd00a93dc14f614d196716d19d5e15dc43c5ac87
|
||||
AUX 034-0004-Use-the-same-paths-in-dracut.sh-as-tho.patch 2410 SHA256 2fb390da6f7cb03b60ba4483f38010792c2a32a3568411abcd1a1e38f99deffe SHA512 5360942f5f946d143869306620123582f4be92f4ac5d4ac95e9df7ef07f4f3448375be5a4629491a402eb6eaf58bd432cd7c7cf464efdcb33fefde8090dcee89 WHIRLPOOL a634844933482377852ec29bbef372bf3df0d47e879ae56249ee191b400c708d6bee8d0e0a292f73f4d520be9b41cd46efa884037bffe7c685f7c8fdb4ce16e9
|
||||
AUX 034-0005-Install-dracut-install-into-libexec-di.patch 2618 SHA256 752215c0d9eadd31ae683927141a8bbfc4515c4691ad4efc2fd2ea9e9356d6af SHA512 ce9fcfec44d5733c6367eba2a1a44a559dbfbe5194d6f3a9914405abc1541457b76110fbe388ebee4a4642eb5e64c5eb2eb342ba8091a44fb9f25ac95b17da6c WHIRLPOOL 009d7b73df4874b424b0788c2e279010a01521e6ed2eec96609175cca74427af9d81584e015234a6467975c3000a7e4321e9e96a34d4a2757e29ad7adb76bf84
|
||||
AUX 034-0006-resume-fix-swap-detection-in-hostonly.patch 1133 SHA256 cdd8d41e111c28309042e8c363479f7a3a5801968e82904098e871635dac629c SHA512 191b6af5c39868cd3c9704f1903a31b25714e561ee9a664fbe9846a594c4b3e2396e8417b80e2c2dd388a905e19360d89b56b80bbe85570afa9dae511c8fd837 WHIRLPOOL f15f378f09c6817a6b8d83ef084a4ac9fd737d080aebdbb3da29482820d016ef0377410de312efbab372586283336d842ad11d9d44e5d75514ee4bd64040cf25
|
||||
AUX 034-0007-dracut.sh-also-mkdir-run-lock-which-is.patch 712 SHA256 e8b34fc8d8469ed91221f5c771ce29c26848cb872d49666a29bb7c7c20862434 SHA512 3a6424533c1b9eda3c88c75c9ca426f73c516d42c3d3abcd43d0b91cc570c9a61aa46c6fda9018942188621a2e6f350d8fc8b9c44ceec9ce1e8c31c86a70f61d WHIRLPOOL 909d7e6131cc12b9502dcfc14e8248b75e32d36d8e5bce448b71054bc9994148f81385c1dd5b86a9a92235e3f59d8bee85ce35b0080cb590c6ff1cc85b7a2450
|
||||
AUX 034-0008-dracut.sh-no-need-to-make-subdirs-in-r.patch 679 SHA256 783675384c6c12c3e5da66c0e304974015f8fb504f41f396b9483d9c0a99b7a0 SHA512 100ea222ce9df2e936ea717d54e2728db04136fb71ebc1c3cfff989107a69644a487ecdeb1e322317cbccdb736d954f24a625b8ef1f57e09c29c6656dede8889 WHIRLPOOL 55aef33e0e09e9ad7cecf9d529ed05502bab8b642bd5f7de472aa55af98fbde153625eaf705f30cf3c0b7cb8acf7a0ad417dbd387f2951a5062b4410200af6aa
|
||||
AUX 034-0009-lvm-install-thin-utils-for-non-hostonl.patch 1376 SHA256 32e21c2c61f9bbc2d2392ae8bba1346bbc9907ddd77352e98460aec966259844 SHA512 89fa06f2bb8b7858d524c2c8b4be0caa76111dc1d3c8ca6cd90d71e0bb2bb53f23401d248900e265ad74feb4844e4c78865383758a1c87e3de1b1bf0c7e0b5a1 WHIRLPOOL f9cddb5a6f9a8f57082995c3249b4d46d2f25c8aeeba07e91847f0b2023edf31a3141a52a08fdadd67b4a7ae78c53e4e31f70007189a6792c9bca696f4e1977f
|
||||
AUX 034-0011-lvm-fix-thin-recognition.patch 1373 SHA256 5218cfaf55b50cfd128a64b34327aab992889729b5d9edabea3913d39914fcf2 SHA512 92573f86939a811462728b74a5df93e51746dc0a45162af2f27f9d417ac9194046b24f1f5d7b79f290f1fdd6468e99ebdd6454f779fdf2050ec9578eeff2fe6b WHIRLPOOL c77a87d181f0d37757c68fdccf130b1d618f717abb07d917a08a84c912dfec9e058f9615e084532bbb96149073dc841b1e6c8bd975169abf4766a8d62b370d8b
|
||||
AUX 034-0012-lvm-always-install-thin-utils-for-lvm.patch 2264 SHA256 f322a4ef7a308839b77a9fe2d16d3d4fc043b5e089d55145b51877e9b5dc3d1c SHA512 708d43d9d04b191656d35b9a3594ba23620445d5eeebb9f598068765a2b8833987dd422a7760d4ead1792ce6607b18505f29868c23e0721e3af7c5c851586e0c WHIRLPOOL 47360e4523c0bd5112065c32e011e2a8dc190e6699d287b8d1c5c3b6d59b27bd689cf9daf76fd77beba132dec5c58144eda78e61565e408784cf7ff575551a2e
|
||||
AUX 034-0013-usrmount-always-install.patch 827 SHA256 5049b63e1095eb81d68d165f188cb512ce29468ace7abbcff8b469e63a8f6f2f SHA512 88abe8ea6ee70fd62d9b225e74063e1c3c31262084b2593df7e52000b0a0efea6c60eac275f7a9416c98d24b7bd548f1db2556a655f8a29706457adbc20b6aea WHIRLPOOL 3c7ce176250777031d7c38df79bfbcba3aa7a752151080fd1fe11ceb2df8e5aa50c1835fe135ce061c92f99de205b077ad3de6a8749e685c288ada512bea7a29
|
||||
AUX 034-0014-udev-rules-add-eudev-rules.patch 967 SHA256 20867f20970846434ffc82ca7c33f6aa63407aa316abc4a261d20f9955725d42 SHA512 4199e65459d33d2d99556bb2c753b143f1e2e71cb6150b83d7513f4887a2bbc3299ed1da33d9c8438a1d9e2231353ce7e39f9cacdd3fe346083eea2905d2f903 WHIRLPOOL 59f691a3663fa35329eb3aff776e1f637518b6fce36ec3d4f09a62c2b5ff11c4c67eb78ae73e57db8c4ad97de6b758d82705445639788bb819899a63a9f17318
|
||||
AUX 040-0001-dracut-functions.sh-support-for-altern.patch 1485 SHA256 77032e034fb7fcfafac2baf3635339488f6a77e12e065e9a37a3ae5461aa5460 SHA512 db28659fb6c3df4880b50412959cd9596e4fa77f08d76687fd720d39c432a0adb80b72719ac1d7dd9adf8a721d9502caa0ede1eee7c0237d4486782a390803f3 WHIRLPOOL 3bc9e31282161275366ac9c7ae5ba63dbda92d6ed23cc93d814cefc40e4ce0850d3752db9957f9de7cbd2a175e93c0550868a81b73afcb4fbd58927cf16cf2f1
|
||||
AUX 040-0002-gentoo.conf-let-udevdir-be-handled-by-.patch 948 SHA256 c20ccfd9a3ed2b90461cd191d95d91131f7e707fca3d046b4f84998795d92852 SHA512 4fad54a8ef919a43dfb6c493779f88856a5194421672cb0abb9754ca7a652371c8f50c8586b2a43bfa010625bdf26e7be491b22a869c2fb2b7dde89eb69c9f85 WHIRLPOOL 6168d29356f89d9f40cc3c2da6993ff54ef9fd514cbb9435e067f6b5b598d2687a5ed77bb1fa41dd2a8dd1bc91f1ec93ff712c2eac78847337716eb50e174456
|
||||
AUX 040-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch 2410 SHA256 1db2096f0a3664cd7bf2128f826c140f0574c7ce56c4085415657059009f9598 SHA512 b4f481548895cfe24360e26b9218d333bd3d827333f5ca9a0fa94d8a8952da45d769bdf60c84aabb8582e1b97f08afb74346c5335e8104e566734bd7c5887c40 WHIRLPOOL cb7ab314f3384f731ac060431965a2fd1928382e1819a51ff8d8807273aa6de088b053d07ddd4b4ab652487efc37a7c9ad1c0f8a067c0eee8e33a4bf7e6d25cd
|
||||
AUX 040-0004-Install-dracut-install-into-libexec-di.patch 2581 SHA256 aaf07b481d99ca43e3b692fde96c78cdad3785a0507bf39a9b7db5667ad39e46 SHA512 695577921cbf0d3629dfaee0c5a55fb525a937453d16ca04ebfd7de0bad053f7f956300c443d2d47a2461ac2f48da86d2b3d9e0345bc50e94c608c8d2de13aef WHIRLPOOL 2f49074529b8fab63bbfafe17cc6af13320ea51b5609e4ca8fd6d1bd26d8da53dc0a4222b09dccf1766bf509d141bb781fb9368e9cd99f2ee22bc23b6ee543bb
|
||||
AUX 040-0005-NEWS-add-040-entry.patch 525 SHA256 8ede46792c1df587a45f5635661e1eddcd4819254e551aeb0a3da6a161258407 SHA512 0c23ab050653a6bc9ea8188b674bdbf2cc649530cc956e4731263c78fd2f29007806e9152e157f08d348750469dfe489f025087156a53b27905d85246046e27e WHIRLPOOL 9442ef0610c0f9f0ed0a0c72ae8fe3961c5c9a12a8ae1ce9837b66190b3418c70bb73f1dd5e0f78f0a9b8ceaefcdf59c6442897cc0e78040406b37597a702aea
|
||||
AUX 040-0006-Don-t-pass-rsyncable-option-to-gzip-Ge.patch 913 SHA256 7aec938b001d483b8f8a11eab2e165bbf52de1128ec0e196d4a8bf474d3cc4ba SHA512 60e117f8594275911addddc530edebca83a9585c4c7abeb8f3cc03bde16781e961f5194f97335efae3411fb53777bfc6db3921823272c95c34f338cff1be538e WHIRLPOOL a469a2461aea8cd9d459100102ebbf908084945e568ebe3fd78ca7a4730825e31f7286c58bb65adee0c7158d39a5b9064c51dea72ed11bc89470712560c529c7
|
||||
AUX 040-0007-Take-into-account-lib64-dirs-when-dete.patch 1877 SHA256 df68184338dd092f01a42064ed7fcdb78e46f348027ff55cb15169c88d0e94f2 SHA512 5f2669addca7b70566213a066a12ba101273611244c3b190c8efca184a0fc50a3afc05bb08bedb998aa387e68abb034cd8fcf914013b2cb99efc9aab6924aed0 WHIRLPOOL b5475357f89e142519db4dd1d3fc8dc2f5a526926e58609a54b9358983a02ce2d04086468f0aca8ae3a930ecef5187c39b8fa0ea9443803e555fa46693173861
|
||||
AUX 041-0001-Use-the-same-paths-in-dracut.sh-as-tho.patch 2410 SHA256 31f7ef0e7837f7f3977c29eb6102beb238e170edbdbbe0da0c9e0893424a22b7 SHA512 98e3ceaf1ad196ca951ef48aae5dae6eb4ee2eb603d7d842fd134c24713bceb9732efc5924670abd32409c82c6a1cec60b24da1353fd7846f1af475008dccabc WHIRLPOOL 847df267c421d01a220816e803802394e321a75f9b0130209844e717e1692e38961108590f2148e2a57737150c27a94ebd78b5d7c2ec9c5a5d5816348aa18a52
|
||||
AUX 041-0002-Install-dracut-install-and-skipcpio-in.patch 4255 SHA256 b32c724c08daefa3886e11a5b098da6ef66039ef01378ea24beb52b81cd61b83 SHA512 cc6b09811729b177885600c7c5de061051e8b15ee190396665e705d086f723b28c0b4b892ba1faee645765b364361b03d6f70c1039b48b745c6c50d82e090db6 WHIRLPOOL d8e7ca8444fe61e293947b347e31cd96110f1b25aa8a997cca9cf7f45cee44820d1bb2902dfd46b67c3f8c74bed2d78a37132ed8a91ad75eee2c152077551840
|
||||
AUX 041-0003-Take-into-account-lib64-dirs-when-dete.patch 2028 SHA256 2726bd4eea86017fb443ed1375408a64c01e1070702c14c349bcd0a5e276eacb SHA512 b71a9c884974b22389370ca3c72fad7dccb3ce3f80fcca230e47b68928bf5ed388707433d9093277bfc2a9d20f261d2abe1ecd639ebd147582bd6a6792cacfe4 WHIRLPOOL c02d50137b5a5d21c530a20e2e04c08dfd53b2c6ead6f4f976b10aaf2cb3f472590435ee9c1e619bfaa354c34a950b1b7bec41699c72903df566024f2a30a47d
|
||||
AUX 041-0004-Portability-fixes.patch 1960 SHA256 4fcae04bd5eb6ec378347d7d3774e1901326a49ceb291b28ff2ce3bcafc1be8f SHA512 89171c41769e71997897c90390c8667a26f171a9a049b5bffda3a8635c0c3e4feef56e0647624d89fbf22a115f35d0829e1ded9d813156111cc7d18ff6eacc1a WHIRLPOOL a23467d7dfa1ad4befd73b1333ee24f61ad2bdda247122debcfc0cd9185384dd82b3d64f885695a31cf5d2167ce81535075a145582a0e7b99de9095f689be645
|
||||
AUX 041-0005-base-dracut-lib.sh-remove-bashism.patch 811 SHA256 3c85b63ed28a5130ba7cfe4a544331099d54f53ef8ad9b77516ff392f1edc200 SHA512 f9853fb83783a5203a7c2ac8f7cf970e544d68ca484c5f5624c02bb0df45efc78003d711733bc08939f3abe9e6ecf683b3b7d5d6d91a855ac3bf70df729ab5c3 WHIRLPOOL d77da2940cda0371b5715fa48c5c55aab1824e2f326acccff055f1770e5b0422f78c84cafc5cb7e7161ed009c8f1bd8f50ce0e5c371cfde7fd9662ffe8e546e7
|
||||
AUX 043-0001-Revert-lvm-Don-t-activate-LVs-with-act.patch 1347 SHA256 8be08f3975b714250681c37bde7f790ca6de957f2fe89e38eafbd30c92f9693e SHA512 5a0f2805334327a9ae9f62505a22c90a766f17732beef1c44a5b7ea359b14d4f89b7dbfd440998ffbff88ee5824b6114f698d85a497c8d54a68e300f03721212 WHIRLPOOL 5125d59f5362fcb8b185aad2bf2fb4d74677f37a8033de7e3bea8bbd102b7064b8ccb7d25cd8c63286ec375471311922f3f1c8b8ae38b117771a5421678b5e37
|
||||
AUX 043-0002-Replace-echo-n-with-printf-in-code-wit.patch 9531 SHA256 fce63924f32d762e49eeff4fa26e2c2cb7764e36c50f94a8542613fd896c0cbf SHA512 dc3e1ad46d0cfc235a3b24b64dd10e0ef065efd172e9923c9a61d410b6e13924da9c973ef5c4fa070ac62f58368b8e759b760cb7b1e401d97290888c6d49d6bd WHIRLPOOL ec4a64ce62be26991bcc1032ca4e5705eed172aa826c91ac82afd88e68d71d212689f3e8b00e9b58e248bd1812918f1447c015a929154cf8340d509e7ac199c3
|
||||
AUX 043-0003-syncheck-Look-for-echo-n-usage-in-modu.patch 1181 SHA256 4498f7252974c46d4120b5fac6bd358df9340e94fdb3089e975b320a1662d0dc SHA512 a82bfafc5c66d625db4af7e801368eacd811eae394009d187dd28430ef2b1ed41a8409eac29479c8207639989b8d3be1e729583d715f2da55adc9cd468bbccdc WHIRLPOOL aad89f5519bb21aa3ca9acacf8780eb3704160a8e5600fa006d1d984f210f1410e393bade37b0b702881f4231a118906b594b9bf80c77feaaccf1e5616d7bb5c
|
||||
AUX 043-0004-dracut-initramfs-restore-make-mount-er.patch 1018 SHA256 1b51b6cc93a3404b4f2ea3e1006da8c974d0ebed6d952576d5444c69991b3b30 SHA512 e80b136dff5ad4a064d2da1013ecdb7ba6dec2dbe98c02c89ded50cc468aa37e13e97aea1f9688af92b41868140d3a5c5a6d4d23c87d9ea6d9ac5d65383f49f1 WHIRLPOOL a6515d01f4a4e5e9226eb3511c9dd7bfffd48479fd99072042f021359cd24300cbe7769defbd02cdeeff0318957c809ff80c53f0358d34941e83f2a6f5f90ef7
|
||||
DIST 034-0010-module-setup.sh-add-comments.patch.bz2 6424 SHA256 fbcb940c83e362cc93a78c5be28ffd7c794a331f992498e451d69c1830f054fa SHA512 e5e41b8696716c5284ea981ae85dbe688c5c31330e400c79f4ba46890939dffdd7744e4a85d27d074987a8db65114332171af0a5471338e3e4bed19d54edc6fd WHIRLPOOL c5d29ef2f20aa752e57180be35a2014c214a25e4e49d3f623d05cd6ef1debd2cec38d24453ecb0c004cdbb52239f0d541ddc9df065ab84fb7d62c30594704347
|
||||
DIST dracut-034.tar.bz2 277692 SHA256 48c7fd57e287d4f34dfff5b5ead14a4511926858f1e2ffaa40b762f257516d7f SHA512 ae06510668e63550d4d6b509b314c7668880387cfe696fc7f21cf04cc488be743440871dbd1fcf4e8314f9aa9e61ee3e78a42a75631123c420767677c6744e34 WHIRLPOOL 0412dea239fbd82d79e873869211ea31b7495dac74d7079e8aa52dd8d2484986fd0a0831aefffe29cfe5acfbf64fa01a9a1fa742192a28276a8671b663a69e13
|
||||
DIST dracut-040.tar.xz 263944 SHA256 b6e743353804b46e350177b9ecb9a8511df7e8c4ff9e0b4f3b4f72bc509c98a3 SHA512 6bc6a714572cc18c4cf9f9c1af4bc787287554ead1e39fbec8a1b8986585cf8c7c7ef476f87fc361f565eb344fe2594d63185ffe02cc5fa7cc3eaa03bcb4b72b WHIRLPOOL d8dbdbf6cb7705a0b7793f82a0323c49b4ac0dc3d61cf0073e3061f34af0b5c92dd21a7dc080f2a8d24d3eef3abc99df91f113675721267352f934f1319c66ba
|
||||
DIST dracut-041.tar.xz 268288 SHA256 8ece6c2240bf0e9283e5f717b65dfcd6830b3ef7f8d1c01b60014052f1063251 SHA512 358444588febfc482627eb5423b8a87b588ed3842ae814b9f88d8c5dfec28419f2aea92cd54c11c4949b9968d60d7e05ba9cfea78d26d2dc6f2a943a38b28dac WHIRLPOOL ab538fe1ffeb3d43185c6222a6e65af8c684b292be571e0571fdd69011f654c3093f3a2256f3003d5dbaf07d0a26f83d82055885bae1868738ad15dc74982e72
|
||||
DIST dracut-043.tar.xz 272744 SHA256 1484b558ed20330125aa04dcccab84da15c5689e19068285aa011f7177889cd1 SHA512 a36271e1ed4c1205a01bece7652095a8bfd722bcf7239a93baeb21e7e0a60fa86dd6657aa69b594241981056c87c6fe9d372f18ac045785122a9cafe8b0c31eb WHIRLPOOL d1efd59e2c41478e489d4707114b141e8bb0501c54209e364edc2060d3ffac7f2e1afd640b0812a452e7fbe7f9134e5e96436f0f1f2a54613d9468f9dca61a0c
|
||||
AUX 044-0001-base-dracut-lib.sh-dev_unit_name-guard-against-dev-b.patch 1027 SHA256 e9951ce3dbad9be05800bedcd1147c52917f15678182edf666f43dcdd2db212a SHA512 3d6a37d4f86b8a230cda1ed5dfbcc01edcf8a6be7109b4c0674627a07797db92d078c23426938a6324d93515b5db98e322e3aed2bbff650ffafd974e872e1cc5 WHIRLPOOL f79475fabe4f164be28008f10db3c78880de23c6251d3b5e020bf42f51c6c761d3ce0fbe301c4c7a923195ba5c80b715e60c9a3ae6ff0b510ffb0fb536efe960
|
||||
AUX 044-0002-systemd-initrd-add-initrd-root-device.target.patch 924 SHA256 a344e2fa36a75debe358db41219936410e06c9e575793b97bacf5f9b78e9b2df SHA512 443391ad3a70c3933d42129a298e12de007944c3141f8ec2785666ee5f66a24edc1eb5faa5c2016540aeb1fadb93139fce3b53b3960f7a5492aac2ff9bc95e70 WHIRLPOOL c2ab93fc268315090de28db6de6609e9de9a57508069cf661f5f2da46bb51fd8d4531b5b40dd336995c0063e8ad91f59411c29178b2cd3addbba98f6a0db18e8
|
||||
AUX 044-0003-50-dracut.install-use-bin-bash-shebang.patch 558 SHA256 57b653a41f3fd9cb6dd67cbb5525fc40bf765c377ce0a0f76f82c34a383400b1 SHA512 657685b27d3ffd326fd1976ccd89cbe4ab9122b63f2a6a03cae3bd54663bd1a26366552550ea50af671aa5a604b9ca08caf1bc689551e46f7d208c7d5e83730b WHIRLPOOL 6af2908f1c91898b0a0b2c570d46224965a75c38abeda2ef6560f5f1b2b969ad728ff31191fa07df0673011bd80c090f8dcb783e3094e8e43d50c5326004c9ee
|
||||
AUX 045-systemdutildir.patch 1665 SHA256 9a2a9e8a1486945f5639a25abca9c06c445de41dbdd261f30f2e7944c21772c4 SHA512 f576cd166e9ad03ffa8317dcffcd7c6f920ffa92251eaacc5c2a95e4ca88687bd1870c8f75ecf3b5fc81773f2d3e082dff647d6a313d183a6017fc79b7bc604b WHIRLPOOL a4494844ad2bc1d87f599b56b0d8799c3972c2c65b1b9e8d099180dd7d3126e2c74d21736071c0e59fdca08d799ebf5787a4601f3a94a7c903fa90ddbb5c2a2c
|
||||
AUX dracut-044-bash-4.4.patch 5036 SHA256 c443525f1e3f2e7459e4db00b4b88d54caa843183de5d4b7f4f5729f7755cec0 SHA512 68522464fb446175f967c8453e8427f961e97522661a22a7c302a90ff716ab75b0cfc32f568a06f1e1821ba7115d6d2f48b6ded9ed65b30806d4d505a0903279 WHIRLPOOL 3572714dc21226956a1b6567b91dd2210757f0ee50f926aaa09039a67603d36d42f17152187e6977a22b2e778e9ca91acd2420ec925784061b1b0f5f20373992
|
||||
AUX dracut-044-preserve-xattrs-when-copying.patch 2354 SHA256 e6e09c6b6946d512c08470f39045abc87e5fae6628be79a3c20bf38ee0c365fa SHA512 b15babf62a4ece46c8b55a2ac21c3284665da8c38c10fc1209c08605b778689cf80108b8baa0ce66eee2218d6975cc5b9401d8a70326ddb6f731c55373e52a02 WHIRLPOOL d13f561f51a931f706a8bf86ff4304c96951fe6807052421223042131bd35cb4afa8662b0cbfe0dfb9f41bf192bb7c44257a1bbec72d4368c352af9ea7ef3d8f
|
||||
DIST dracut-044.tar.xz 280004 SHA256 84b97c9b0120e9fde06c3b9cf2ede1c4632cccd8e085e980b9ec9c788655af05 SHA512 bc788076e425b223d98cf0e0b15ff57d75d423991d7a67fb564a2857c38d5c3a21d846d2ca4523f9d4b0128bb981d09b5c26031435c5fc5e30f53080bca19b3d WHIRLPOOL 684591df596fa902447e671adfaeeb8cdc469c257f756616e42747835b71be7caaac9c72bd4b1a5ba5728ec4332baaba1d265cddb1c30cbfa65cf4dce0690bc0
|
||||
EBUILD dracut-034-r4.ebuild 10339 SHA256 16a4918bb8322bd8f9ecc5546dc99113672f2480f604e755a2689e6dc2a21b67 SHA512 6f8314aff80ef511874cbf80322c07f4d9eb317e961a78c7ab2b85af008d0fc56699cefadea88b75079c7f044c440aeeba4a66927de2ede07ae810ebfa4d8d6a WHIRLPOOL 28df91aad2f902fab30f5948183b38b8f2a11235aaaf21183546c490ecaddfa0d6839321759a94cec7005a3ecff57f8c113204d1b1ea9168c204e12182d139da
|
||||
EBUILD dracut-040-r3.ebuild 7667 SHA256 c78de13dbe1da724e1f4bfd087fc1f4799057228f308a9c4f346fc4fbab44ccd SHA512 c9e97366b3f8dceef1df6aae47b09b3e22f3b167ec33b335a9cc21c5d27be0c72102dd1d25a9cb6f9b6cfccea53dc1a1f3e2acc3cfdb79b72d5de709d4451618 WHIRLPOOL a0fd42af2c429a488984577e0d9d0221321d81d080221a5e3306632680c908c90b3b96328756e019a624cc27706b067269cdaa36f462bdf8359da0a42b380357
|
||||
EBUILD dracut-041-r3.ebuild 7723 SHA256 06b66974c90e6e94b46e919ee42f1d7a347b023ba2d48bcb89db1322f0c1787b SHA512 9b1b3328bb0c580d891172f12f2fc55232840d517f5de145f65b00efab92d3879c9df2e794c2a8c21977dae14eecc368fd95b1047c79623b45dbbaf8d5cf4f06 WHIRLPOOL b06fffc8a9b6dd56435aeee1d0e56f611cd69e8b53cf4472a6a97ee235366f3995886a3693f6bcf9af148c1a62ce397e107ece973c24a84cb27f12aa4411878e
|
||||
EBUILD dracut-043-r2.ebuild 7731 SHA256 1f3c3e56cec5a22bcad76f27c3138a19391a7306d0aa90d65a26be911bf2a907 SHA512 ee41a2a1c67a4069b7985173738e3ef2768a1dfcb8755ccb601185ed991cc4198ac0b160a8c0e9d4ec3315a4ee3d18cd4c2c5dbafc700ed3e141c654d8b63650 WHIRLPOOL 842c634204458f590d03bd7fae155e1ab44d549f6b3f9310f3d2aec15d20ef0940c41c8e783464583be7eca484d562978ecfa68f2996970d8c336125379c4e3c
|
||||
EBUILD dracut-044.ebuild 7409 SHA256 f928f5344a2fab3d6815ddade8d846ea0706956de427f6651dc0ab8674473b7f SHA512 69d6399c02c45603cb52fe76aac0313d9a7f4ca8457618fa8a9a5d14e1ce9257c68543b5cf937178db6962c80d8e62cf62c204f9d7f97e87586a5e64ec0f18c4 WHIRLPOOL c3d8d0a14013ec3ced448f57ffe025340df581254f2d2753dce875726db27b381f0307dd3efa300ad9526167674c56d91b80fc9cc652e2eec5c8bf6eef7e2cca
|
||||
MISC ChangeLog 7356 SHA256 ac4113ab5c043c6ea74cf93d5ad41e9e081a2bb2bb31fd1a352f824980e1af8a SHA512 190356ee11d3bd58ce2aa54a9619baca08e1fe348df7d80341c8999d7c6feb8e18732186bbe2e914cf02062dbf8589c481ac95c99dabddfa2c3d6658a67e63ec WHIRLPOOL 820a130b821d47f6a6c4c1ebf8c0c40ccd0d8e6bb9082982f2820357af07d259714dbd6dba0fdcc1d0422cb82952283b7c14408460538cb51d4a48238427316b
|
||||
DIST dracut-045.tar.xz 292652 SHA256 ca9c7ea54d3efc8b57ac1427cc5fa4d66688f6cf9d3088f4c5e7ae7c7e84ebf8 SHA512 b57aab1f6fbdd5ad52a13a0eb99937b1abcd11507a2a3e6ec9bcb94e578cc32edc01a814ea2cef93158c27c17e3e40bcdd32a66457a20363f8136b8b546bbb4a WHIRLPOOL d9cdf32e4fb745b2598aa2f0504c943f5a069dddc17d5261d594b2fc33921306196386bc35156d5bf71983cc15be3b0cddd504d1b6a2042b45b5c5ae622b23b9
|
||||
EBUILD dracut-044-r1.ebuild 7688 SHA256 e51652455405c841b00e8fcc0e3f064a3d9a189e37bc1bc98a28fd18d7251de6 SHA512 e82388ff89b4a9309f2e38c8d4cae5db63765b423d1066b978d7eb2b7374f355af49b3962ec22e4ca1a37fe699ed3311c610565f1218d249189e4f28a5677067 WHIRLPOOL 22f0d0d887d7d2ede9c32bfc77c434ad278cc2a1c3b077e9e7a599fef3c85ab735170f0c2de898953d8ff97cb486d3bb559f23e696005a2f75fc9fa8102006e3
|
||||
EBUILD dracut-044-r3.ebuild 6939 SHA256 31bdc406d9a18851f2c244bfba04d29c1c2e8d2fb54efe449ac00c7875944658 SHA512 b49f4a6dea1b6c03b6422b7c4edd7e655a123ca7074ebe38d98bc5ae324060cb0dda3cecbb8dd8caae5209d16d767680aaf4ec740cf65af496545b50c41d7a28 WHIRLPOOL 93c981d0b134c33c28cc3afb64268bf0ba4e0e04cfb1b39103fd2ec0cfe4df55f8deb964e5a110a5decf959fe2824a3ccd0fe4dd73231d3a0b9416cd020ac8eb
|
||||
EBUILD dracut-045-r2.ebuild 4791 SHA256 f3199016e1db54f32541f194c23f9d6104672cc73bb0f86b8eee06a4c63f4142 SHA512 c3c3410d60d335073e0f3570e2f6fb85e6074101125311bad35370218deb5f5fd32163ed224e5e1f39a55b26d7c9e02569a45dfde72ddaa07081384b51e4cce3 WHIRLPOOL ef8e83610fa12fb7e0c948e4d14be582cbb2fbbce94fa5827c48a34d8d530661820a8dfdbcb81a2af2edc401b34ef11bb2be53d2f016cf65d6e6d6daa291a3b3
|
||||
MISC ChangeLog 8004 SHA256 11ded091b910b3c6807e344e4986675c50af2e5e0a2fdcdb352e086f5097e090 SHA512 dd8b1e996946fa47093440be61de1cb645a15fcf289a380226590ba541af8e4a47df33747491a25258a21599ab90c0402da548371de131d4f4cabf06965d0807 WHIRLPOOL da2a37d08cc7eb53eafd6282b635672df58db6ba88aa7dbc8e79f08db25a329245c84d4977937857b42ae9b3d84ad989ac40cf3dbbd96f3b30e2a34c36d9b40e
|
||||
MISC ChangeLog-2015 84625 SHA256 839b114233a8e918dfd787ff5a1f3a0743da7ee5320ff571aff4474ecb9ee45e SHA512 67588a45f9745381b08712b0bb8219d7101cd0c5a78b89be177658b18188a0a2c2185688e1e6239d44ad93345c7da34b71d4ce9a923122b2d62b1121abf0bdf6 WHIRLPOOL 51d19990f3bc47e4d43ee98fd48bc84cad89115e7f812469d25322e9c30efe3902e0007f3d9026464d471c201454e761c04770fbd1d32b545791cf28c67d22cb
|
||||
MISC metadata.xml 1011 SHA256 e7f344c89314f2306d61e41ba277b077819a08597d0107ad543e7e8562f3692b SHA512 4f14054921b6beacfee3b6a2d9b5e01856b1bba9a9def9099d6c1dfd907dbac8c73484f8470b9c7081ab9157c66459923f6a6781c1b610bfc9d93b86f22c753f WHIRLPOOL db5bc51a2c5c24ee786821e976b54c0dc9d317fa633ebf0a9a55b0a3497f4e851236d1516de9526bdc1d2c322f63b56c8fd19a6583bbdf119e4e9417e34570dc
|
||||
MISC metadata.xml 840 SHA256 8ef5aab36d95735b3b0b1cdba609ef3cd8e883ac38fb619c957fe5ae1e35bd6d SHA512 d347acc0a7c8b821804280f198aa28cbd4198a8f2d570c2725584b18b04125a684bed6adb48f5cb71fe1ef0e1c19320ad3dbff612dbf972f741b50b91fc388ba WHIRLPOOL 9edf380512d517d1eb6303a81379e8df8c342c3ab4501b150f2c23078185d09251903b4ea182a65c49caeda51ce21845ba34783875b7c8111883ff3855f0dbac
|
||||
|
||||
@ -1,333 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit bash-completion-r1 eutils linux-info multilib systemd
|
||||
|
||||
add_req_use_for() {
|
||||
local dep="$1"; shift
|
||||
local f
|
||||
|
||||
for f in "$@"; do
|
||||
REQUIRED_USE+="${f}? ( ${dep} )
|
||||
"
|
||||
done
|
||||
}
|
||||
|
||||
DESCRIPTION="Generic initramfs generation tool"
|
||||
HOMEPAGE="https://dracut.wiki.kernel.org"
|
||||
AIDECOE_DISTFILES="https://dev.gentoo.org/~aidecoe/distfiles"
|
||||
SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.bz2
|
||||
${AIDECOE_DISTFILES}/${CATEGORY}/${PN}/${PV}-0010-module-setup.sh-add-comments.patch.bz2"
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
|
||||
|
||||
REQUIRED_USE="
|
||||
dracut_modules_bootchart? ( !dracut_modules_systemd )
|
||||
dracut_modules_crypt-gpg? ( dracut_modules_crypt )
|
||||
dracut_modules_crypt-loop? ( dracut_modules_crypt )
|
||||
dracut_modules_livenet? ( dracut_modules_dmsquash-live )
|
||||
"
|
||||
COMMON_MODULES="
|
||||
dracut_modules_biosdevname
|
||||
dracut_modules_bootchart
|
||||
dracut_modules_btrfs
|
||||
dracut_modules_caps
|
||||
dracut_modules_crypt-gpg
|
||||
dracut_modules_crypt-loop
|
||||
dracut_modules_dash
|
||||
dracut_modules_gensplash
|
||||
dracut_modules_mdraid
|
||||
dracut_modules_multipath
|
||||
dracut_modules_plymouth
|
||||
dracut_modules_syslog
|
||||
dracut_modules_systemd
|
||||
"
|
||||
DM_MODULES="
|
||||
dracut_modules_crypt
|
||||
dracut_modules_dmraid
|
||||
dracut_modules_dmsquash-live
|
||||
dracut_modules_livenet
|
||||
dracut_modules_lvm
|
||||
"
|
||||
NETWORK_MODULES="
|
||||
dracut_modules_cifs
|
||||
dracut_modules_iscsi
|
||||
dracut_modules_livenet
|
||||
dracut_modules_nbd
|
||||
dracut_modules_nfs
|
||||
dracut_modules_ssh-client
|
||||
"
|
||||
add_req_use_for device-mapper ${DM_MODULES}
|
||||
add_req_use_for net ${NETWORK_MODULES}
|
||||
IUSE_DRACUT_MODULES="${COMMON_MODULES} ${DM_MODULES} ${NETWORK_MODULES}"
|
||||
IUSE="debug device-mapper net selinux ${IUSE_DRACUT_MODULES}"
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
CDEPEND="virtual/udev
|
||||
!>=sys-fs/udev-210
|
||||
!>=sys-apps/systemd-210
|
||||
dracut_modules_systemd? ( >=sys-apps/systemd-199 )
|
||||
selinux? ( sec-policy/selinux-dracut )
|
||||
"
|
||||
RDEPEND="${CDEPEND}
|
||||
app-arch/cpio
|
||||
>=app-shells/bash-4.0
|
||||
>=sys-apps/baselayout-1.12.14-r1
|
||||
>sys-apps/kmod-5[tools]
|
||||
|| ( >=sys-apps/sysvinit-2.87-r3 sys-apps/systemd[sysv-utils] sys-apps/systemd-sysv-utils )
|
||||
>=sys-apps/util-linux-2.21
|
||||
|
||||
debug? ( dev-util/strace )
|
||||
device-mapper? ( >=sys-fs/lvm2-2.02.33 )
|
||||
net? ( net-misc/curl >=net-misc/dhcp-4.2.4_p2-r1[client] sys-apps/iproute2 )
|
||||
selinux? ( sys-libs/libselinux sys-libs/libsepol )
|
||||
dracut_modules_biosdevname? ( sys-apps/biosdevname )
|
||||
dracut_modules_bootchart? ( app-admin/killproc app-benchmarks/bootchart2
|
||||
sys-process/acct )
|
||||
dracut_modules_btrfs? ( sys-fs/btrfs-progs )
|
||||
dracut_modules_caps? ( sys-libs/libcap )
|
||||
dracut_modules_cifs? ( net-fs/cifs-utils )
|
||||
dracut_modules_crypt? ( sys-fs/cryptsetup )
|
||||
dracut_modules_crypt-gpg? ( app-crypt/gnupg )
|
||||
dracut_modules_dash? ( >=app-shells/dash-0.5.4.11 )
|
||||
dracut_modules_dmraid? ( sys-fs/dmraid sys-fs/multipath-tools )
|
||||
dracut_modules_gensplash? ( media-gfx/splashutils )
|
||||
dracut_modules_iscsi? ( >=sys-block/open-iscsi-2.0.871.3 )
|
||||
dracut_modules_lvm? ( >=sys-fs/lvm2-2.02.33 )
|
||||
dracut_modules_mdraid? ( >=sys-fs/mdadm-3.2.6-r1 )
|
||||
dracut_modules_multipath? ( sys-fs/multipath-tools )
|
||||
dracut_modules_nbd? ( sys-block/nbd )
|
||||
dracut_modules_nfs? ( net-fs/nfs-utils net-nds/rpcbind )
|
||||
dracut_modules_plymouth? ( >=sys-boot/plymouth-0.8.3-r1 )
|
||||
dracut_modules_ssh-client? ( net-misc/openssh )
|
||||
dracut_modules_syslog? ( || ( app-admin/syslog-ng app-admin/rsyslog ) )
|
||||
"
|
||||
DEPEND="${CDEPEND}
|
||||
app-text/asciidoc
|
||||
>=dev-libs/libxslt-1.1.26
|
||||
app-text/docbook-xml-dtd:4.5
|
||||
>=app-text/docbook-xsl-stylesheets-1.75.2
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
|
||||
README.testsuite TODO )
|
||||
MY_LIBDIR=/usr/lib
|
||||
|
||||
#
|
||||
# Helper functions
|
||||
#
|
||||
|
||||
# Returns true if any of specified modules is enabled by USE flag and false
|
||||
# otherwise.
|
||||
# $1 = list of modules (which have corresponding USE flags of the same name)
|
||||
any_module() {
|
||||
local m modules=" $@ "
|
||||
|
||||
for m in ${modules}; do
|
||||
! use $m && modules=${modules/ $m / }
|
||||
done
|
||||
|
||||
shopt -s extglob
|
||||
modules=${modules%%+( )}
|
||||
shopt -u extglob
|
||||
|
||||
[[ ${modules} ]]
|
||||
}
|
||||
|
||||
# Removes module from modules.d.
|
||||
# $1 = module name
|
||||
# Module name can be specified without number prefix.
|
||||
rm_module() {
|
||||
local force m
|
||||
[[ $1 = -f ]] && force=-f
|
||||
|
||||
for m in $@; do
|
||||
if [[ $m =~ ^[0-9][0-9][^\ ]*$ ]]; then
|
||||
rm ${force} --interactive=never -r "${modules_dir}"/$m
|
||||
else
|
||||
rm ${force} --interactive=never -r "${modules_dir}"/[0-9][0-9]$m
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
#
|
||||
# ebuild functions
|
||||
#
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}/${PV}-0001-dracut.sh-do-not-bail-out-if-kernel-mo.patch"
|
||||
epatch "${FILESDIR}/${PV}-0002-dracut-functions.sh-support-for-altern.patch"
|
||||
epatch "${FILESDIR}/${PV}-0003-gentoo.conf-let-udevdir-be-handled-by-.patch"
|
||||
epatch "${FILESDIR}/${PV}-0004-Use-the-same-paths-in-dracut.sh-as-tho.patch"
|
||||
epatch "${FILESDIR}/${PV}-0005-Install-dracut-install-into-libexec-di.patch"
|
||||
epatch "${FILESDIR}/${PV}-0006-resume-fix-swap-detection-in-hostonly.patch"
|
||||
epatch "${FILESDIR}/${PV}-0007-dracut.sh-also-mkdir-run-lock-which-is.patch"
|
||||
epatch "${FILESDIR}/${PV}-0008-dracut.sh-no-need-to-make-subdirs-in-r.patch"
|
||||
epatch "${FILESDIR}/${PV}-0009-lvm-install-thin-utils-for-non-hostonl.patch"
|
||||
epatch "${DISTDIR}/${PV}-0010-module-setup.sh-add-comments.patch.bz2"
|
||||
epatch "${FILESDIR}/${PV}-0011-lvm-fix-thin-recognition.patch"
|
||||
epatch "${FILESDIR}/${PV}-0012-lvm-always-install-thin-utils-for-lvm.patch"
|
||||
epatch "${FILESDIR}/${PV}-0013-usrmount-always-install.patch"
|
||||
epatch "${FILESDIR}/${PV}-0014-udev-rules-add-eudev-rules.patch"
|
||||
|
||||
local libdirs="/$(get_libdir) /usr/$(get_libdir)"
|
||||
[[ $libdirs =~ /lib\ ]] || libdirs+=" /lib /usr/lib"
|
||||
einfo "Setting libdirs to \"${libdirs}\" ..."
|
||||
sed -e "3alibdirs=\"${libdirs}\"" \
|
||||
-i "${S}/dracut.conf.d/gentoo.conf.example" || die
|
||||
|
||||
local udevdir="$("$(tc-getPKG_CONFIG)" udev --variable=udevdir)"
|
||||
einfo "Setting udevdir to ${udevdir}..."
|
||||
sed -r -e "s|^(udevdir=).*$|\1${udevdir}|" \
|
||||
-i "${S}/dracut.conf.d/gentoo.conf.example" || die
|
||||
|
||||
if use dracut_modules_systemd; then
|
||||
local systemdutildir="$(systemd_get_utildir)"
|
||||
local systemdsystemunitdir="$(systemd_get_unitdir)"
|
||||
local systemdsystemconfdir="$("$(tc-getPKG_CONFIG)" systemd \
|
||||
--variable=systemdsystemconfdir)"
|
||||
[[ ${systemdsystemconfdir} ]] \
|
||||
|| systemdsystemconfdir=/etc/systemd/system
|
||||
einfo "Setting systemdutildir to ${systemdutildir} and ..."
|
||||
sed -e "5asystemdutildir=\"${systemdutildir}\"" \
|
||||
-i "${S}/dracut.conf.d/gentoo.conf.example" || die
|
||||
einfo "Setting systemdsystemunitdir to ${systemdsystemunitdir} and..."
|
||||
sed -e "6asystemdsystemunitdir=\"${systemdsystemunitdir}\"" \
|
||||
-i "${S}/dracut.conf.d/gentoo.conf.example" || die
|
||||
einfo "Setting systemdsystemconfdir to ${systemdsystemconfdir}..."
|
||||
sed -e "7asystemdsystemconfdir=\"${systemdsystemconfdir}\"" \
|
||||
-i "${S}/dracut.conf.d/gentoo.conf.example" || die
|
||||
fi
|
||||
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf="--libdir=${MY_LIBDIR}"
|
||||
myconf+=" --bashcompletiondir=$(get_bashcompdir)"
|
||||
|
||||
if use dracut_modules_systemd; then
|
||||
myconf+=" --systemdsystemunitdir='$(systemd_get_unitdir)'"
|
||||
fi
|
||||
|
||||
econf ${myconf}
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
tc-export CC
|
||||
emake doc install/dracut-install
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
local my_libdir="${MY_LIBDIR}"
|
||||
local dracutlibdir="${my_libdir#/}/dracut"
|
||||
|
||||
echo "DRACUT_VERSION=$PVR" > "${D%/}/${dracutlibdir}/dracut-version.sh"
|
||||
|
||||
insinto "${dracutlibdir}/dracut.conf.d/"
|
||||
newins dracut.conf.d/gentoo.conf.example gentoo.conf
|
||||
|
||||
insinto /etc/logrotate.d
|
||||
newins dracut.logrotate dracut
|
||||
|
||||
dodir /var/lib/dracut/overlay
|
||||
|
||||
dohtml dracut.html
|
||||
|
||||
#
|
||||
# Modules
|
||||
#
|
||||
local module
|
||||
modules_dir="${D%/}/${dracutlibdir}/modules.d"
|
||||
|
||||
# Remove modules not enabled by USE flags
|
||||
for module in ${IUSE_DRACUT_MODULES} ; do
|
||||
! use ${module} && rm_module -f ${module#dracut_modules_}
|
||||
done
|
||||
|
||||
# Those flags are specific, and even are corresponding to modules, they need
|
||||
# to be declared as regular USE flags.
|
||||
use debug || rm_module 95debug
|
||||
use selinux || rm_module 98selinux
|
||||
|
||||
# Following flags define set of helper modules which are base dependencies
|
||||
# for others and as so have no practical use, so remove these modules.
|
||||
use device-mapper || rm_module 90dm
|
||||
use net || rm_module 40network 45ifcfg 45url-lib
|
||||
|
||||
if use dracut_modules_systemd; then
|
||||
# With systemd following modules do not make sense
|
||||
rm_module 96securityfs 98selinux
|
||||
else
|
||||
# Without systemd following modules do not make sense
|
||||
rm_module 00systemd-bootchart
|
||||
fi
|
||||
|
||||
# Remove S/390 modules which are not tested at all
|
||||
rm_module 80cms 95dasd 95dasd_mod 95zfcp 95znet
|
||||
|
||||
# Remove modules which won't work for sure
|
||||
rm_module 95fcoe # no tools
|
||||
# fips module depends on masked app-crypt/hmaccalc
|
||||
rm_module 01fips 02fips-aesni
|
||||
|
||||
# Remove extra modules which go to future dracut-extras
|
||||
rm_module 05busybox 97masterkey 98ecryptfs 98integrity
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if linux-info_get_any_version && linux_config_exists; then
|
||||
ewarn ""
|
||||
ewarn "If the following test report contains a missing kernel"
|
||||
ewarn "configuration option, you should reconfigure and rebuild your"
|
||||
ewarn "kernel before booting image generated with this Dracut version."
|
||||
ewarn ""
|
||||
|
||||
local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
|
||||
|
||||
# Kernel configuration options descriptions:
|
||||
local desc_DEVTMPFS="Maintain a devtmpfs filesystem to mount at /dev"
|
||||
local desc_BLK_DEV_INITRD="Initial RAM filesystem and RAM disk "\
|
||||
"(initramfs/initrd) support"
|
||||
|
||||
local opt desc
|
||||
|
||||
# Generate ERROR_* variables for check_extra_config.
|
||||
for opt in ${CONFIG_CHECK}; do
|
||||
opt=${opt#\~}
|
||||
desc=desc_${opt}
|
||||
eval "local ERROR_${opt}='CONFIG_${opt}: \"${!desc}\"" \
|
||||
"is missing and REQUIRED'"
|
||||
done
|
||||
|
||||
check_extra_config
|
||||
echo
|
||||
else
|
||||
ewarn ""
|
||||
ewarn "Your kernel configuration couldn't be checked. Do you have"
|
||||
ewarn "/usr/src/linux/.config file there? Please check manually if"
|
||||
ewarn "following options are enabled:"
|
||||
ewarn ""
|
||||
ewarn " CONFIG_BLK_DEV_INITRD"
|
||||
ewarn " CONFIG_DEVTMPFS"
|
||||
ewarn ""
|
||||
fi
|
||||
|
||||
if use dracut_modules_crypt || use dracut_modules_dmraid || use \
|
||||
dracut_modules_mdraid || use dracut_modules_lvm; then
|
||||
|
||||
if ! [[ $(</proc/cmdline) =~ rd.auto[\ =] ]]; then
|
||||
ewarn "Autoassembly of special devices like cryptoLUKS, dmraid, "
|
||||
ewarn "mdraid or lvm is off for default as of >=dracut-024."
|
||||
ewarn "Use rd.auto option to turn it on."
|
||||
fi
|
||||
fi
|
||||
}
|
||||
@ -1,254 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit bash-completion-r1 eutils linux-info multilib systemd
|
||||
|
||||
DESCRIPTION="Generic initramfs generation tool"
|
||||
HOMEPAGE="https://dracut.wiki.kernel.org"
|
||||
SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.xz"
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
|
||||
IUSE="debug selinux systemd"
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
CDEPEND="virtual/udev
|
||||
systemd? ( >=sys-apps/systemd-199 )
|
||||
"
|
||||
RDEPEND="${CDEPEND}
|
||||
app-arch/cpio
|
||||
>=app-shells/bash-4.0
|
||||
>sys-apps/kmod-5[tools]
|
||||
|| ( >=sys-apps/sysvinit-2.87-r3 sys-apps/systemd[sysv-utils] sys-apps/systemd-sysv-utils )
|
||||
>=sys-apps/util-linux-2.21
|
||||
|
||||
debug? ( dev-util/strace )
|
||||
selinux? (
|
||||
sys-libs/libselinux
|
||||
sys-libs/libsepol
|
||||
sec-policy/selinux-dracut
|
||||
)
|
||||
"
|
||||
DEPEND="${CDEPEND}
|
||||
app-text/asciidoc
|
||||
>=dev-libs/libxslt-1.1.26
|
||||
app-text/docbook-xml-dtd:4.5
|
||||
>=app-text/docbook-xsl-stylesheets-1.75.2
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
|
||||
README.testsuite TODO )
|
||||
MY_LIBDIR=/usr/lib
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PV}-0001-dracut-functions.sh-support-for-altern.patch"
|
||||
"${FILESDIR}/${PV}-0002-gentoo.conf-let-udevdir-be-handled-by-.patch"
|
||||
"${FILESDIR}/${PV}-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch"
|
||||
"${FILESDIR}/${PV}-0005-NEWS-add-040-entry.patch"
|
||||
"${FILESDIR}/${PV}-0006-Don-t-pass-rsyncable-option-to-gzip-Ge.patch"
|
||||
"${FILESDIR}/${PV}-0007-Take-into-account-lib64-dirs-when-dete.patch"
|
||||
)
|
||||
QA_MULTILIB_PATHS="
|
||||
usr/lib/dracut/dracut-install
|
||||
usr/lib/dracut/skipcpio
|
||||
"
|
||||
|
||||
#
|
||||
# Helper functions
|
||||
#
|
||||
|
||||
# Removes module from modules.d.
|
||||
# $1 = module name
|
||||
# Module name can be specified without number prefix.
|
||||
rm_module() {
|
||||
local force m
|
||||
[[ $1 = -f ]] && force=-f
|
||||
|
||||
for m in $@; do
|
||||
if [[ $m =~ ^[0-9][0-9][^\ ]*$ ]]; then
|
||||
rm ${force} --interactive=never -r "${modules_dir}"/$m
|
||||
else
|
||||
rm ${force} --interactive=never -r "${modules_dir}"/[0-9][0-9]$m
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${PATCHES[@]}"
|
||||
|
||||
local libdirs="/$(get_libdir) /usr/$(get_libdir)"
|
||||
if [[ ${SYMLINK_LIB} = yes ]]; then
|
||||
# Preserve lib -> lib64 symlinks in initramfs
|
||||
[[ $libdirs =~ /lib\ ]] || libdirs+=" /lib /usr/lib"
|
||||
fi
|
||||
einfo "Setting libdirs to \"${libdirs}\" ..."
|
||||
sed -e "3alibdirs=\"${libdirs}\"" \
|
||||
-i "${S}/dracut.conf.d/gentoo.conf.example" || die
|
||||
|
||||
local udevdir="$("$(tc-getPKG_CONFIG)" udev --variable=udevdir)"
|
||||
einfo "Setting udevdir to ${udevdir}..."
|
||||
sed -r -e "s|^(udevdir=).*$|\1${udevdir}|" \
|
||||
-i "${S}/dracut.conf.d/gentoo.conf.example" || die
|
||||
|
||||
if use systemd; then
|
||||
local systemdutildir="$(systemd_get_utildir)"
|
||||
local systemdsystemunitdir="$(systemd_get_unitdir)"
|
||||
local systemdsystemconfdir="$("$(tc-getPKG_CONFIG)" systemd \
|
||||
--variable=systemdsystemconfdir)"
|
||||
[[ ${systemdsystemconfdir} ]] \
|
||||
|| systemdsystemconfdir=/etc/systemd/system
|
||||
einfo "Setting systemdutildir to ${systemdutildir} and ..."
|
||||
sed -e "5asystemdutildir=\"${systemdutildir}\"" \
|
||||
-i "${S}/dracut.conf.d/gentoo.conf.example" || die
|
||||
einfo "Setting systemdsystemunitdir to ${systemdsystemunitdir} and..."
|
||||
sed -e "6asystemdsystemunitdir=\"${systemdsystemunitdir}\"" \
|
||||
-i "${S}/dracut.conf.d/gentoo.conf.example" || die
|
||||
einfo "Setting systemdsystemconfdir to ${systemdsystemconfdir}..."
|
||||
sed -e "7asystemdsystemconfdir=\"${systemdsystemconfdir}\"" \
|
||||
-i "${S}/dracut.conf.d/gentoo.conf.example" || die
|
||||
else
|
||||
local systemdutildir="/lib/systemd"
|
||||
einfo "Setting systemdutildir for standalone udev to" \
|
||||
"${systemdutildir}..."
|
||||
sed -e "5asystemdutildir=\"${systemdutildir}\"" \
|
||||
-i "${S}/dracut.conf.d/gentoo.conf.example" || die
|
||||
fi
|
||||
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf="--libdir=${MY_LIBDIR}"
|
||||
myconf+=" --bashcompletiondir=$(get_bashcompdir)"
|
||||
|
||||
if use systemd; then
|
||||
myconf+=" --systemdsystemunitdir='$(systemd_get_unitdir)'"
|
||||
fi
|
||||
|
||||
econf ${myconf}
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
tc-export CC
|
||||
emake doc install/dracut-install skipcpio/skipcpio
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
local my_libdir="${MY_LIBDIR}"
|
||||
local dracutlibdir="${my_libdir#/}/dracut"
|
||||
|
||||
echo "DRACUT_VERSION=$PVR" > "${D%/}/${dracutlibdir}/dracut-version.sh"
|
||||
|
||||
insinto "${dracutlibdir}/dracut.conf.d/"
|
||||
newins dracut.conf.d/gentoo.conf.example gentoo.conf
|
||||
|
||||
insinto /etc/logrotate.d
|
||||
newins dracut.logrotate dracut
|
||||
|
||||
dodir /var/lib/dracut/overlay
|
||||
|
||||
dohtml dracut.html
|
||||
|
||||
#
|
||||
# Modules
|
||||
#
|
||||
local module
|
||||
modules_dir="${D%/}/${dracutlibdir}/modules.d"
|
||||
|
||||
use debug || rm_module 95debug
|
||||
use selinux || rm_module 98selinux
|
||||
|
||||
if use systemd; then
|
||||
# With systemd following modules do not make sense
|
||||
rm_module 96securityfs 97masterkey 98integrity
|
||||
else
|
||||
rm_module 98systemd
|
||||
# Without systemd following modules do not make sense
|
||||
rm_module 00systemd-bootchart
|
||||
fi
|
||||
|
||||
# Remove modules which won't work for sure
|
||||
rm_module 95fcoe # no tools
|
||||
# fips module depends on masked app-crypt/hmaccalc
|
||||
rm_module 01fips 02fips-aesni
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if linux-info_get_any_version && linux_config_exists; then
|
||||
ewarn ""
|
||||
ewarn "If the following test report contains a missing kernel"
|
||||
ewarn "configuration option, you should reconfigure and rebuild your"
|
||||
ewarn "kernel before booting image generated with this Dracut version."
|
||||
ewarn ""
|
||||
|
||||
local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
|
||||
|
||||
# Kernel configuration options descriptions:
|
||||
local desc_DEVTMPFS="Maintain a devtmpfs filesystem to mount at /dev"
|
||||
local desc_BLK_DEV_INITRD="Initial RAM filesystem and RAM disk "\
|
||||
"(initramfs/initrd) support"
|
||||
|
||||
local opt desc
|
||||
|
||||
# Generate ERROR_* variables for check_extra_config.
|
||||
for opt in ${CONFIG_CHECK}; do
|
||||
opt=${opt#\~}
|
||||
desc=desc_${opt}
|
||||
eval "local ERROR_${opt}='CONFIG_${opt}: \"${!desc}\"" \
|
||||
"is missing and REQUIRED'"
|
||||
done
|
||||
|
||||
check_extra_config
|
||||
echo
|
||||
else
|
||||
ewarn ""
|
||||
ewarn "Your kernel configuration couldn't be checked. Do you have"
|
||||
ewarn "/usr/src/linux/.config file there? Please check manually if"
|
||||
ewarn "following options are enabled:"
|
||||
ewarn ""
|
||||
ewarn " CONFIG_BLK_DEV_INITRD"
|
||||
ewarn " CONFIG_DEVTMPFS"
|
||||
ewarn ""
|
||||
fi
|
||||
|
||||
elog "To get additional features, a number of optional runtime"
|
||||
elog "dependencies may be installed:"
|
||||
elog ""
|
||||
optfeature "Networking support" net-misc/curl "net-misc/dhcp[client]" \
|
||||
sys-apps/iproute2
|
||||
optfeature \
|
||||
"Measure performance of the boot process for later visualisation" \
|
||||
app-benchmarks/bootchart2 app-admin/killproc sys-process/acct
|
||||
optfeature "Scan for Btrfs on block devices" sys-fs/btrfs-progs
|
||||
optfeature "Load kernel modules and drop this privilege for real init" \
|
||||
sys-libs/libcap
|
||||
optfeature "Support CIFS" net-fs/cifs-utils
|
||||
optfeature "Decrypt devices encrypted with cryptsetup/LUKS" \
|
||||
"sys-fs/cryptsetup[-static-libs]"
|
||||
optfeature "Support for GPG-encrypted keys for crypt module" \
|
||||
app-crypt/gnupg
|
||||
optfeature \
|
||||
"Allows use of dash instead of default bash (on your own risk)" \
|
||||
app-shells/dash
|
||||
optfeature "Framebuffer splash (media-gfx/splashutils)" \
|
||||
media-gfx/splashutils
|
||||
optfeature "Support iSCSI" sys-block/open-iscsi
|
||||
optfeature "Support Logical Volume Manager" sys-fs/lvm2
|
||||
optfeature "Support MD devices, also known as software RAID devices" \
|
||||
sys-fs/mdadm
|
||||
optfeature "Support Device Mapper multipathing" sys-fs/multipath-tools
|
||||
optfeature "Plymouth boot splash" '>=sys-boot/plymouth-0.8.5-r5'
|
||||
optfeature "Support network block devices" sys-block/nbd
|
||||
optfeature "Support NFS" net-fs/nfs-utils net-nds/rpcbind
|
||||
optfeature \
|
||||
"Install ssh and scp along with config files and specified keys" \
|
||||
net-misc/openssh
|
||||
optfeature "Enable logging with syslog-ng or rsyslog" app-admin/syslog-ng \
|
||||
app-admin/rsyslog
|
||||
}
|
||||
@ -1,6 +1,5 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
@ -11,7 +10,7 @@ HOMEPAGE="https://dracut.wiki.kernel.org"
|
||||
SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.xz"
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
|
||||
KEYWORDS="alpha amd64 ~arm ia64 ppc ~ppc64 sparc x86"
|
||||
IUSE="debug selinux systemd"
|
||||
|
||||
RESTRICT="test"
|
||||
@ -36,7 +35,7 @@ RDEPEND="${CDEPEND}
|
||||
sys-libs/libsepol
|
||||
sec-policy/selinux-dracut
|
||||
)
|
||||
"
|
||||
!>=app-shells/bash-4.4"
|
||||
DEPEND="${CDEPEND}
|
||||
app-text/asciidoc
|
||||
>=dev-libs/libxslt-1.1.26
|
||||
@ -53,6 +52,12 @@ QA_MULTILIB_PATHS="
|
||||
usr/lib/dracut/skipcpio
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/044-0001-base-dracut-lib.sh-dev_unit_name-guard-against-dev-b.patch
|
||||
"${FILESDIR}"/044-0002-systemd-initrd-add-initrd-root-device.target.patch
|
||||
"${FILESDIR}"/044-0003-50-dracut.install-use-bin-bash-shebang.patch
|
||||
)
|
||||
|
||||
#
|
||||
# Helper functions
|
||||
#
|
||||
@ -112,18 +117,22 @@ src_prepare() {
|
||||
-i "${S}/dracut.conf.d/gentoo.conf.example" || die
|
||||
fi
|
||||
|
||||
epatch "${PATCHES[@]}"
|
||||
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf="--libdir=${MY_LIBDIR}"
|
||||
myconf+=" --bashcompletiondir=$(get_bashcompdir)"
|
||||
local myconf=(
|
||||
--libdir="${MY_LIBDIR}"
|
||||
--bashcompletiondir="$(get_bashcompdir)"
|
||||
)
|
||||
|
||||
if use systemd; then
|
||||
myconf+=" --systemdsystemunitdir='$(systemd_get_unitdir)'"
|
||||
myconf+=( --systemdsystemunitdir="$(systemd_get_unitdir)" )
|
||||
fi
|
||||
|
||||
econf ${myconf}
|
||||
econf "${myconf[@]}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
@ -1,10 +1,9 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=4
|
||||
EAPI=6
|
||||
|
||||
inherit bash-completion-r1 eutils linux-info multilib systemd
|
||||
inherit bash-completion-r1 linux-info toolchain-funcs systemd
|
||||
|
||||
DESCRIPTION="Generic initramfs generation tool"
|
||||
HOMEPAGE="https://dracut.wiki.kernel.org"
|
||||
@ -17,7 +16,10 @@ IUSE="debug selinux systemd"
|
||||
RESTRICT="test"
|
||||
|
||||
CDEPEND="virtual/udev
|
||||
systemd? ( >=sys-apps/systemd-199 )
|
||||
systemd? (
|
||||
>=sys-apps/systemd-199
|
||||
virtual/pkgconfig
|
||||
)
|
||||
"
|
||||
RDEPEND="${CDEPEND}
|
||||
app-arch/cpio
|
||||
@ -48,17 +50,19 @@ DEPEND="${CDEPEND}
|
||||
DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
|
||||
README.testsuite TODO )
|
||||
MY_LIBDIR=/usr/lib
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PV}-0001-Revert-lvm-Don-t-activate-LVs-with-act.patch"
|
||||
"${FILESDIR}/${PV}-0002-Replace-echo-n-with-printf-in-code-wit.patch"
|
||||
"${FILESDIR}/${PV}-0003-syncheck-Look-for-echo-n-usage-in-modu.patch"
|
||||
"${FILESDIR}/${PV}-0004-dracut-initramfs-restore-make-mount-er.patch"
|
||||
)
|
||||
QA_MULTILIB_PATHS="
|
||||
usr/lib/dracut/dracut-install
|
||||
usr/lib/dracut/skipcpio
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/044-0001-base-dracut-lib.sh-dev_unit_name-guard-against-dev-b.patch
|
||||
"${FILESDIR}"/044-0002-systemd-initrd-add-initrd-root-device.target.patch
|
||||
"${FILESDIR}"/044-0003-50-dracut.install-use-bin-bash-shebang.patch
|
||||
"${FILESDIR}"/dracut-044-bash-4.4.patch
|
||||
"${FILESDIR}"/dracut-044-preserve-xattrs-when-copying.patch
|
||||
)
|
||||
|
||||
#
|
||||
# Helper functions
|
||||
#
|
||||
@ -80,8 +84,6 @@ rm_module() {
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${PATCHES[@]}"
|
||||
|
||||
local libdirs="/$(get_libdir) /usr/$(get_libdir)"
|
||||
if [[ ${SYMLINK_LIB} = yes ]]; then
|
||||
# Preserve lib -> lib64 symlinks in initramfs
|
||||
@ -96,23 +98,7 @@ src_prepare() {
|
||||
sed -r -e "s|^(udevdir=).*$|\1${udevdir}|" \
|
||||
-i "${S}/dracut.conf.d/gentoo.conf.example" || die
|
||||
|
||||
if use systemd; then
|
||||
local systemdutildir="$(systemd_get_utildir)"
|
||||
local systemdsystemunitdir="$(systemd_get_unitdir)"
|
||||
local systemdsystemconfdir="$("$(tc-getPKG_CONFIG)" systemd \
|
||||
--variable=systemdsystemconfdir)"
|
||||
[[ ${systemdsystemconfdir} ]] \
|
||||
|| systemdsystemconfdir=/etc/systemd/system
|
||||
einfo "Setting systemdutildir to ${systemdutildir} and ..."
|
||||
sed -e "5asystemdutildir=\"${systemdutildir}\"" \
|
||||
-i "${S}/dracut.conf.d/gentoo.conf.example" || die
|
||||
einfo "Setting systemdsystemunitdir to ${systemdsystemunitdir} and..."
|
||||
sed -e "6asystemdsystemunitdir=\"${systemdsystemunitdir}\"" \
|
||||
-i "${S}/dracut.conf.d/gentoo.conf.example" || die
|
||||
einfo "Setting systemdsystemconfdir to ${systemdsystemconfdir}..."
|
||||
sed -e "7asystemdsystemconfdir=\"${systemdsystemconfdir}\"" \
|
||||
-i "${S}/dracut.conf.d/gentoo.conf.example" || die
|
||||
else
|
||||
if ! use systemd; then
|
||||
local systemdutildir="/lib/systemd"
|
||||
einfo "Setting systemdutildir for standalone udev to" \
|
||||
"${systemdutildir}..."
|
||||
@ -120,18 +106,20 @@ src_prepare() {
|
||||
-i "${S}/dracut.conf.d/gentoo.conf.example" || die
|
||||
fi
|
||||
|
||||
epatch_user
|
||||
default
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf="--libdir=${MY_LIBDIR}"
|
||||
myconf+=" --bashcompletiondir=$(get_bashcompdir)"
|
||||
local myconf=(
|
||||
--libdir="${MY_LIBDIR}"
|
||||
--bashcompletiondir="$(get_bashcompdir)"
|
||||
)
|
||||
|
||||
if use systemd; then
|
||||
myconf+=" --systemdsystemunitdir='$(systemd_get_unitdir)'"
|
||||
myconf+=( --systemdsystemunitdir="$(systemd_get_systemunitdir)" )
|
||||
fi
|
||||
|
||||
econf ${myconf}
|
||||
econf "${myconf[@]}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
@ -155,7 +143,7 @@ src_install() {
|
||||
|
||||
dodir /var/lib/dracut/overlay
|
||||
|
||||
dohtml dracut.html
|
||||
dodoc dracut.html
|
||||
|
||||
if ! use systemd; then
|
||||
# Scripts in kernel/install.d are systemd-specific
|
||||
@ -1,10 +1,9 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=4
|
||||
EAPI=6
|
||||
|
||||
inherit bash-completion-r1 eutils linux-info multilib systemd
|
||||
inherit bash-completion-r1 linux-info toolchain-funcs systemd
|
||||
|
||||
DESCRIPTION="Generic initramfs generation tool"
|
||||
HOMEPAGE="https://dracut.wiki.kernel.org"
|
||||
@ -12,22 +11,23 @@ SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.xz"
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
|
||||
IUSE="debug selinux systemd"
|
||||
IUSE="debug selinux"
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
CDEPEND="virtual/udev
|
||||
systemd? ( >=sys-apps/systemd-199 )
|
||||
virtual/pkgconfig
|
||||
>=sys-apps/kmod-15[tools]
|
||||
"
|
||||
RDEPEND="${CDEPEND}
|
||||
app-arch/cpio
|
||||
>=app-shells/bash-4.0
|
||||
>sys-apps/kmod-5[tools]
|
||||
>=app-shells/bash-4.0:0
|
||||
|| (
|
||||
>=sys-apps/sysvinit-2.87-r3
|
||||
sys-apps/systemd[sysv-utils]
|
||||
sys-apps/systemd-sysv-utils
|
||||
)
|
||||
sys-apps/coreutils[xattr(-)]
|
||||
>=sys-apps/util-linux-2.21
|
||||
|
||||
debug? ( dev-util/strace )
|
||||
@ -36,155 +36,60 @@ RDEPEND="${CDEPEND}
|
||||
sys-libs/libsepol
|
||||
sec-policy/selinux-dracut
|
||||
)
|
||||
!net-analyzer/arping
|
||||
"
|
||||
DEPEND="${CDEPEND}
|
||||
app-text/asciidoc
|
||||
>=dev-libs/libxslt-1.1.26
|
||||
app-text/docbook-xml-dtd:4.5
|
||||
>=app-text/docbook-xsl-stylesheets-1.75.2
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
|
||||
README.testsuite TODO )
|
||||
MY_LIBDIR=/usr/lib
|
||||
|
||||
QA_MULTILIB_PATHS="usr/lib/dracut/.*"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PV}-0001-Use-the-same-paths-in-dracut.sh-as-tho.patch"
|
||||
"${FILESDIR}/${PV}-0002-Install-dracut-install-and-skipcpio-in.patch"
|
||||
"${FILESDIR}/${PV}-0003-Take-into-account-lib64-dirs-when-dete.patch"
|
||||
"${FILESDIR}/${PV}-0004-Portability-fixes.patch"
|
||||
"${FILESDIR}/${PV}-0005-base-dracut-lib.sh-remove-bashism.patch"
|
||||
"${FILESDIR}/045-systemdutildir.patch"
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
local myconf=(
|
||||
--prefix="${EPREFIX}/usr"
|
||||
--sysconfdir="${EPREFIX}/etc"
|
||||
--bashcompletiondir="$(get_bashcompdir)"
|
||||
--systemdsystemunitdir="$(systemd_get_systemunitdir)"
|
||||
)
|
||||
QA_MULTILIB_PATHS="
|
||||
usr/lib/dracut/dracut-install
|
||||
usr/lib/dracut/skipcpio
|
||||
"
|
||||
|
||||
#
|
||||
# Helper functions
|
||||
#
|
||||
tc-export CC PKG_CONFIG
|
||||
|
||||
# Removes module from modules.d.
|
||||
# $1 = module name
|
||||
# Module name can be specified without number prefix.
|
||||
rm_module() {
|
||||
local force m
|
||||
[[ $1 = -f ]] && force=-f
|
||||
|
||||
for m in $@; do
|
||||
if [[ $m =~ ^[0-9][0-9][^\ ]*$ ]]; then
|
||||
rm ${force} --interactive=never -r "${modules_dir}"/$m
|
||||
else
|
||||
rm ${force} --interactive=never -r "${modules_dir}"/[0-9][0-9]$m
|
||||
fi
|
||||
done
|
||||
echo ./configure "${myconf[@]}"
|
||||
./configure "${myconf[@]}" || die
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${PATCHES[@]}"
|
||||
src_install() {
|
||||
default
|
||||
|
||||
local dracutlibdir="usr/lib/dracut"
|
||||
|
||||
local libdirs="/$(get_libdir) /usr/$(get_libdir)"
|
||||
if [[ ${SYMLINK_LIB} = yes ]]; then
|
||||
# Preserve lib -> lib64 symlinks in initramfs
|
||||
[[ $libdirs =~ /lib\ ]] || libdirs+=" /lib /usr/lib"
|
||||
fi
|
||||
|
||||
einfo "Setting libdirs to \"${libdirs}\" ..."
|
||||
sed -e "3alibdirs=\"${libdirs}\"" \
|
||||
-i "${S}/dracut.conf.d/gentoo.conf.example" || die
|
||||
|
||||
local udevdir="$("$(tc-getPKG_CONFIG)" udev --variable=udevdir)"
|
||||
einfo "Setting udevdir to ${udevdir}..."
|
||||
sed -r -e "s|^(udevdir=).*$|\1${udevdir}|" \
|
||||
-i "${S}/dracut.conf.d/gentoo.conf.example" || die
|
||||
|
||||
if use systemd; then
|
||||
local systemdutildir="$(systemd_get_utildir)"
|
||||
local systemdsystemunitdir="$(systemd_get_unitdir)"
|
||||
local systemdsystemconfdir="$("$(tc-getPKG_CONFIG)" systemd \
|
||||
--variable=systemdsystemconfdir)"
|
||||
[[ ${systemdsystemconfdir} ]] \
|
||||
|| systemdsystemconfdir=/etc/systemd/system
|
||||
einfo "Setting systemdutildir to ${systemdutildir} and ..."
|
||||
sed -e "5asystemdutildir=\"${systemdutildir}\"" \
|
||||
-i "${S}/dracut.conf.d/gentoo.conf.example" || die
|
||||
einfo "Setting systemdsystemunitdir to ${systemdsystemunitdir} and..."
|
||||
sed -e "6asystemdsystemunitdir=\"${systemdsystemunitdir}\"" \
|
||||
-i "${S}/dracut.conf.d/gentoo.conf.example" || die
|
||||
einfo "Setting systemdsystemconfdir to ${systemdsystemconfdir}..."
|
||||
sed -e "7asystemdsystemconfdir=\"${systemdsystemconfdir}\"" \
|
||||
-i "${S}/dracut.conf.d/gentoo.conf.example" || die
|
||||
else
|
||||
local systemdutildir="/lib/systemd"
|
||||
einfo "Setting systemdutildir for standalone udev to" \
|
||||
"${systemdutildir}..."
|
||||
sed -e "5asystemdutildir=\"${systemdutildir}\"" \
|
||||
-i "${S}/dracut.conf.d/gentoo.conf.example" || die
|
||||
fi
|
||||
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf="--libdir=${MY_LIBDIR}"
|
||||
myconf+=" --bashcompletiondir=$(get_bashcompdir)"
|
||||
|
||||
if use systemd; then
|
||||
myconf+=" --systemdsystemunitdir='$(systemd_get_unitdir)'"
|
||||
fi
|
||||
|
||||
econf ${myconf}
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
tc-export CC
|
||||
emake doc install/dracut-install skipcpio/skipcpio
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
local my_libdir="${MY_LIBDIR}"
|
||||
local dracutlibdir="${my_libdir#/}/dracut"
|
||||
|
||||
echo "DRACUT_VERSION=$PVR" > "${D%/}/${dracutlibdir}/dracut-version.sh"
|
||||
|
||||
insinto "${dracutlibdir}/dracut.conf.d/"
|
||||
newins dracut.conf.d/gentoo.conf.example gentoo.conf
|
||||
echo "libdirs=\"${libdirs}\"" > "${T}/gentoo.conf"
|
||||
insinto "${dracutlibdir}/dracut.conf.d"
|
||||
doins "${T}/gentoo.conf"
|
||||
|
||||
insinto /etc/logrotate.d
|
||||
newins dracut.logrotate dracut
|
||||
|
||||
dodir /var/lib/dracut/overlay
|
||||
|
||||
dohtml dracut.html
|
||||
|
||||
if ! use systemd; then
|
||||
# Scripts in kernel/install.d are systemd-specific
|
||||
rm -r "${D%/}/${my_libdir}/kernel" || die
|
||||
fi
|
||||
|
||||
#
|
||||
# Modules
|
||||
#
|
||||
local module
|
||||
modules_dir="${D%/}/${dracutlibdir}/modules.d"
|
||||
|
||||
use debug || rm_module 95debug
|
||||
use selinux || rm_module 98selinux
|
||||
|
||||
if use systemd; then
|
||||
# With systemd following modules do not make sense
|
||||
rm_module 96securityfs 97masterkey 98integrity
|
||||
else
|
||||
rm_module 98systemd
|
||||
# Without systemd following modules do not make sense
|
||||
rm_module 00systemd-bootchart
|
||||
fi
|
||||
|
||||
# Remove modules which won't work for sure
|
||||
rm_module 95fcoe # no tools
|
||||
# fips module depends on masked app-crypt/hmaccalc
|
||||
rm_module 01fips 02fips-aesni
|
||||
dodoc dracut.html
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
@ -229,7 +134,7 @@ pkg_postinst() {
|
||||
elog "dependencies may be installed:"
|
||||
elog ""
|
||||
optfeature "Networking support" net-misc/curl "net-misc/dhcp[client]" \
|
||||
sys-apps/iproute2
|
||||
sys-apps/iproute2 "net-misc/iputils[arping]"
|
||||
optfeature \
|
||||
"Measure performance of the boot process for later visualisation" \
|
||||
app-benchmarks/bootchart2 app-admin/killproc sys-process/acct
|
||||
@ -1,42 +0,0 @@
|
||||
From 45e5079d4be0ac1a977bc41dcda423fcfa3280fc Mon Sep 17 00:00:00 2001
|
||||
From: Harald Hoyer <harald@redhat.com>
|
||||
Date: Tue, 8 Oct 2013 15:03:40 +0200
|
||||
Subject: [PATCH 1/5] dracut.sh: do not bail out, if kernel modules dir is
|
||||
missing
|
||||
|
||||
and only print a warning message
|
||||
---
|
||||
dracut.sh | 11 ++++++-----
|
||||
1 file changed, 6 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/dracut.sh b/dracut.sh
|
||||
index e135dfc..d9533dd 100755
|
||||
--- a/dracut.sh
|
||||
+++ b/dracut.sh
|
||||
@@ -496,17 +496,18 @@ if [[ $regenerate_all == "yes" ]]; then
|
||||
((ret+=$?))
|
||||
done
|
||||
exit $ret
|
||||
-elif [[ $kernel ]]; then
|
||||
- if ! [[ -d /lib/modules/$kernel ]] && [[ $no_kernel != yes ]]; then
|
||||
- printf -- "Kernel version $kernel has no modules in /lib/modules/$kernel\n" >&2
|
||||
- exit 1
|
||||
- fi
|
||||
fi
|
||||
|
||||
if ! [[ $kernel ]]; then
|
||||
kernel=$(uname -r)
|
||||
fi
|
||||
|
||||
+if [[ $kernel ]]; then
|
||||
+ if ! [[ -d /lib/modules/$kernel ]] && [[ $no_kernel != yes ]]; then
|
||||
+ printf -- "Kernel version $kernel has no module directory /lib/modules/$kernel\n" >&2
|
||||
+ fi
|
||||
+fi
|
||||
+
|
||||
if ! [[ $outfile ]]; then
|
||||
[[ -f /etc/machine-id ]] && read MACHINE_ID < /etc/machine-id
|
||||
|
||||
--
|
||||
1.8.3.2
|
||||
|
||||
@ -1,41 +0,0 @@
|
||||
From c5a2f35eb2a90d8787d127b44cb6b5e0536d16ce Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
|
||||
Date: Sun, 6 Jan 2013 13:35:01 +0100
|
||||
Subject: [PATCH 2/5] dracut-functions.sh: support for alternative udev dirs -
|
||||
udevaltdirs
|
||||
|
||||
It is required for Gentoo which moves udev from / to /usr and supports
|
||||
both /lib/udev and /usr/lib/udev for compatibility with other packages.
|
||||
|
||||
Credits go to Alexander Tsoy <alexander@tsoy.me>.
|
||||
|
||||
Conflicts:
|
||||
dracut-functions.sh
|
||||
---
|
||||
dracut-functions.sh | 10 ++++++++++
|
||||
1 file changed, 10 insertions(+)
|
||||
|
||||
diff --git a/dracut-functions.sh b/dracut-functions.sh
|
||||
index 45e0911..c1cbdeb 100755
|
||||
--- a/dracut-functions.sh
|
||||
+++ b/dracut-functions.sh
|
||||
@@ -872,6 +872,16 @@ inst_rules() {
|
||||
inst_dir "$_target"
|
||||
for _rule in "$@"; do
|
||||
if [ "${_rule#/}" = "$_rule" ]; then
|
||||
+ for r in ${udevaltdirs}; do
|
||||
+ [[ "$r" = "${udevdir}" ]] && continue
|
||||
+ if [[ -e $r/rules.d/$_rule ]]; then
|
||||
+ _found="$r/rules.d/$_rule"
|
||||
+ inst_rule_programs "$_found"
|
||||
+ inst_rule_group_owner "$_found"
|
||||
+ inst_rule_initqueue "$_found"
|
||||
+ inst_simple "$_found" "${udevdir}/rules.d/${_found##*/}"
|
||||
+ fi
|
||||
+ done
|
||||
for r in ${udevdir}/rules.d ${hostonly:+/etc/udev/rules.d}; do
|
||||
if [[ -e $r/$_rule ]]; then
|
||||
_found="$r/$_rule"
|
||||
--
|
||||
1.8.3.2
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
From 29ade4d78b7609877659aa5938b3fba2954ce415 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
|
||||
Date: Sun, 16 Dec 2012 20:02:48 +0100
|
||||
Subject: [PATCH 3/5] gentoo.conf: let udevdir= be handled by pkg-config and
|
||||
use udevaltdirs
|
||||
|
||||
To avoid need of rebuild after udev update/downgrade let udevdir= be set
|
||||
dynamically with pkg-config. Use udevaltdirs to search for rules both
|
||||
in old and new locations.
|
||||
---
|
||||
dracut.conf.d/gentoo.conf.example | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dracut.conf.d/gentoo.conf.example b/dracut.conf.d/gentoo.conf.example
|
||||
index 26e7314..f9617f0 100644
|
||||
--- a/dracut.conf.d/gentoo.conf.example
|
||||
+++ b/dracut.conf.d/gentoo.conf.example
|
||||
@@ -1,7 +1,8 @@
|
||||
# /etc/dracut.conf.d/gentoo.conf
|
||||
# dracut config file customized for Gentoo Base System release 2
|
||||
|
||||
-udevdir=/lib/udev
|
||||
+udevdir=
|
||||
+udevaltdirs="/lib/udev /usr/lib/udev"
|
||||
ro_mnt=yes
|
||||
|
||||
#
|
||||
--
|
||||
1.8.3.2
|
||||
|
||||
@ -1,74 +0,0 @@
|
||||
From 6660721bd34b7a25026ffc6a6df4cdfdc8742ed3 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
|
||||
Date: Wed, 2 Oct 2013 22:37:09 +0200
|
||||
Subject: [PATCH 4/5] Use the same paths in dracut.sh as those set with
|
||||
configure script
|
||||
|
||||
Makefile alters destination main dracut script and sets dracutbasedir to
|
||||
the value of pkglibdir set in configure.
|
||||
---
|
||||
Makefile | 3 +++
|
||||
dracut.sh | 9 ++++-----
|
||||
2 files changed, 7 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 124a41b..ea504f5 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -91,6 +91,9 @@ install: dracut-version.sh
|
||||
mkdir -p $(DESTDIR)$(pkglibdir)/modules.d
|
||||
mkdir -p $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man7 $(DESTDIR)$(mandir)/man8
|
||||
install -m 0755 dracut.sh $(DESTDIR)$(bindir)/dracut
|
||||
+ sed -r \
|
||||
+ -e "s|^(pkglibdir)=.*|\1=$(pkglibdir)|" \
|
||||
+ -i $(DESTDIR)$(bindir)/dracut
|
||||
install -m 0755 dracut-catimages.sh $(DESTDIR)$(bindir)/dracut-catimages
|
||||
install -m 0755 mkinitrd-dracut.sh $(DESTDIR)$(bindir)/mkinitrd
|
||||
install -m 0755 lsinitrd.sh $(DESTDIR)$(bindir)/lsinitrd
|
||||
diff --git a/dracut.sh b/dracut.sh
|
||||
index d9533dd..cf18c81 100755
|
||||
--- a/dracut.sh
|
||||
+++ b/dracut.sh
|
||||
@@ -26,10 +26,13 @@
|
||||
# store for logging
|
||||
dracut_args=( "$@" )
|
||||
|
||||
+# base dirs
|
||||
+pkglibdir=/usr/lib/dracut
|
||||
+dracutbasedir="$pkglibdir"
|
||||
+
|
||||
set -o pipefail
|
||||
|
||||
usage() {
|
||||
- [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
|
||||
if [[ -f $dracutbasedir/dracut-version.sh ]]; then
|
||||
. $dracutbasedir/dracut-version.sh
|
||||
fi
|
||||
@@ -54,7 +57,6 @@ EOF
|
||||
}
|
||||
|
||||
long_usage() {
|
||||
- [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
|
||||
if [[ -f $dracutbasedir/dracut-version.sh ]]; then
|
||||
. $dracutbasedir/dracut-version.sh
|
||||
fi
|
||||
@@ -549,8 +551,6 @@ export DRACUT_LOG_LEVEL=warning
|
||||
debug=yes
|
||||
}
|
||||
|
||||
-[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
|
||||
-
|
||||
# if we were not passed a config file, try the default one
|
||||
if [[ ! -f $conffile ]]; then
|
||||
if [[ $allowlocal ]]; then
|
||||
@@ -669,7 +669,6 @@ stdloglvl=$((stdloglvl + verbosity_mod_l))
|
||||
[[ $use_fstab_l ]] && use_fstab=$use_fstab_l
|
||||
[[ $mdadmconf_l ]] && mdadmconf=$mdadmconf_l
|
||||
[[ $lvmconf_l ]] && lvmconf=$lvmconf_l
|
||||
-[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
|
||||
[[ $fw_dir ]] || fw_dir="/lib/firmware/updates /lib/firmware"
|
||||
[[ $tmpdir_l ]] && tmpdir="$tmpdir_l"
|
||||
[[ $tmpdir ]] || tmpdir=/var/tmp
|
||||
--
|
||||
1.8.3.2
|
||||
|
||||
@ -1,81 +0,0 @@
|
||||
From 80dbe6dfbdb2cd3475006e210fe057dceb81ddf2 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
|
||||
Date: Wed, 2 Oct 2013 22:40:43 +0200
|
||||
Subject: [PATCH 5/5] Install dracut-install into libexec dir instead of lib
|
||||
dir
|
||||
|
||||
dracut-install script is the only thing ABI specific atm.
|
||||
|
||||
See https://bugs.gentoo.org/show_bug.cgi?id=485218 for details on the
|
||||
problem.
|
||||
---
|
||||
Makefile | 4 +++-
|
||||
configure | 1 +
|
||||
dracut-functions.sh | 4 ++++
|
||||
dracut.sh | 1 +
|
||||
4 files changed, 9 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index ea504f5..e004a79 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -92,6 +92,7 @@ install: dracut-version.sh
|
||||
mkdir -p $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man7 $(DESTDIR)$(mandir)/man8
|
||||
install -m 0755 dracut.sh $(DESTDIR)$(bindir)/dracut
|
||||
sed -r \
|
||||
+ -e "s|^(libexecdir)=.*|\1=$(libexecdir)|" \
|
||||
-e "s|^(pkglibdir)=.*|\1=$(pkglibdir)|" \
|
||||
-i $(DESTDIR)$(bindir)/dracut
|
||||
install -m 0755 dracut-catimages.sh $(DESTDIR)$(bindir)/dracut-catimages
|
||||
@@ -135,7 +136,8 @@ endif
|
||||
done \
|
||||
fi
|
||||
if [ -f install/dracut-install ]; then \
|
||||
- install -m 0755 install/dracut-install $(DESTDIR)$(pkglibdir)/dracut-install; \
|
||||
+ mkdir -p $(DESTDIR)$(libexecdir); \
|
||||
+ install -m 0755 install/dracut-install $(DESTDIR)$(libexecdir)/dracut-install; \
|
||||
fi
|
||||
mkdir -p $(DESTDIR)${prefix}/lib/kernel/install.d
|
||||
install -m 0755 50-dracut.install $(DESTDIR)${prefix}/lib/kernel/install.d/50-dracut.install
|
||||
diff --git a/configure b/configure
|
||||
index 19b5e1f..d2ffc2c 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -61,6 +61,7 @@ sbindir ?= ${sbindir:-${prefix}/sbin}
|
||||
mandir ?= ${mandir:-${prefix}/share/man}
|
||||
enable_documentation ?= ${enable_documentation:-yes}
|
||||
bindir ?= ${bindir:-${prefix}/bin}
|
||||
+libexecdir ?= ${libexecdir:-${prefix}/libexec}
|
||||
EOF
|
||||
|
||||
{
|
||||
diff --git a/dracut-functions.sh b/dracut-functions.sh
|
||||
index c1cbdeb..72b7f1b 100755
|
||||
--- a/dracut-functions.sh
|
||||
+++ b/dracut-functions.sh
|
||||
@@ -694,6 +694,10 @@ if ! [[ $DRACUT_INSTALL ]]; then
|
||||
DRACUT_INSTALL=$(find_binary dracut-install)
|
||||
fi
|
||||
|
||||
+if ! [[ $DRACUT_INSTALL ]] && [[ -x $libexecdir/dracut-install ]]; then
|
||||
+ DRACUT_INSTALL=$libexecdir/dracut-install
|
||||
+fi
|
||||
+
|
||||
if ! [[ $DRACUT_INSTALL ]] && [[ -x $dracutbasedir/dracut-install ]]; then
|
||||
DRACUT_INSTALL=$dracutbasedir/dracut-install
|
||||
fi
|
||||
diff --git a/dracut.sh b/dracut.sh
|
||||
index cf18c81..e28b929 100755
|
||||
--- a/dracut.sh
|
||||
+++ b/dracut.sh
|
||||
@@ -27,6 +27,7 @@
|
||||
dracut_args=( "$@" )
|
||||
|
||||
# base dirs
|
||||
+libexecdir=/usr/libexec
|
||||
pkglibdir=/usr/lib/dracut
|
||||
dracutbasedir="$pkglibdir"
|
||||
|
||||
--
|
||||
1.8.3.2
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
From 0c89bcc27516803d68444488ede3d513ba982039 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Tsoy <alexander@tsoy.me>
|
||||
Date: Wed, 9 Oct 2013 06:39:46 +0400
|
||||
Subject: [PATCH 6/6] resume: fix swap detection in hostonly
|
||||
|
||||
Check for other possible fs types. This fixes swap detection when using
|
||||
TuxOnIce kernel.
|
||||
|
||||
Note that parse-resume.sh generate udev rules with support for
|
||||
ID_FS_TYPE=suspend, but we do not include it here, because it is
|
||||
libvolume_id thing and host_fs_types is populated using blkid.
|
||||
---
|
||||
modules.d/95resume/module-setup.sh | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/modules.d/95resume/module-setup.sh b/modules.d/95resume/module-setup.sh
|
||||
index 518ebf0..a1ddb46 100755
|
||||
--- a/modules.d/95resume/module-setup.sh
|
||||
+++ b/modules.d/95resume/module-setup.sh
|
||||
@@ -6,7 +6,7 @@ check() {
|
||||
# No point trying to support resume, if no swap partition exist
|
||||
[[ $hostonly ]] || [[ $mount_needs ]] && {
|
||||
for fs in "${host_fs_types[@]}"; do
|
||||
- [[ $fs = swap ]] && return 0
|
||||
+ [[ $fs =~ ^(swap|swsuspend|swsupend)$ ]] && return 0
|
||||
done
|
||||
return 255
|
||||
}
|
||||
--
|
||||
1.8.3.2
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
From be723725cd6ea1c41b52c1bff5a569eb8cd0c76d Mon Sep 17 00:00:00 2001
|
||||
From: Harald Hoyer <harald@redhat.com>
|
||||
Date: Wed, 16 Oct 2013 11:31:54 +0200
|
||||
Subject: [PATCH 07/12] dracut.sh: also mkdir /run/lock, which is copied to
|
||||
|
||||
---
|
||||
dracut.sh | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dracut.sh b/dracut.sh
|
||||
index e28b929..309aa7d 100755
|
||||
--- a/dracut.sh
|
||||
+++ b/dracut.sh
|
||||
@@ -1081,7 +1081,7 @@ if [[ $kernel_only != yes ]]; then
|
||||
fi
|
||||
done
|
||||
|
||||
- for d in dev proc sys sysroot root run run/lock run/initramfs; do
|
||||
+ for d in dev proc sys sysroot root run run/log run/lock run/initramfs; do
|
||||
if [ -L "/$d" ]; then
|
||||
inst_symlink "/$d"
|
||||
else
|
||||
--
|
||||
1.8.4.3
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
From 34712f015f13221b653a1ed2ee75804f06a22357 Mon Sep 17 00:00:00 2001
|
||||
From: Harald Hoyer <harald@redhat.com>
|
||||
Date: Wed, 16 Oct 2013 11:39:17 +0200
|
||||
Subject: [PATCH 08/12] dracut.sh: no need to make subdirs in run
|
||||
|
||||
---
|
||||
dracut.sh | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dracut.sh b/dracut.sh
|
||||
index 309aa7d..4f58eed 100755
|
||||
--- a/dracut.sh
|
||||
+++ b/dracut.sh
|
||||
@@ -1081,7 +1081,7 @@ if [[ $kernel_only != yes ]]; then
|
||||
fi
|
||||
done
|
||||
|
||||
- for d in dev proc sys sysroot root run run/log run/lock run/initramfs; do
|
||||
+ for d in dev proc sys sysroot root run; do
|
||||
if [ -L "/$d" ]; then
|
||||
inst_symlink "/$d"
|
||||
else
|
||||
--
|
||||
1.8.4.3
|
||||
|
||||
@ -1,41 +0,0 @@
|
||||
From bd3303000b32cb500b2d769c6852784a807cee47 Mon Sep 17 00:00:00 2001
|
||||
From: Harald Hoyer <harald@redhat.com>
|
||||
Date: Tue, 8 Oct 2013 10:30:00 +0200
|
||||
Subject: [PATCH 09/12] lvm: install thin utils for non-hostonly
|
||||
|
||||
---
|
||||
modules.d/90lvm/module-setup.sh | 18 +++++++++++-------
|
||||
1 file changed, 11 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh
|
||||
index f98ffff..514addc 100755
|
||||
--- a/modules.d/90lvm/module-setup.sh
|
||||
+++ b/modules.d/90lvm/module-setup.sh
|
||||
@@ -52,13 +52,17 @@ install() {
|
||||
|
||||
inst lvm
|
||||
|
||||
- get_host_lvs | while read line; do
|
||||
- printf "%s" " rd.lvm.lv=$line"
|
||||
- if ! [[ $_needthin ]]; then
|
||||
- [[ "$(lvs --noheadings -o segtype ${line%%/*} 2>/dev/null)" == *thin* ]] && _needthin=1
|
||||
- fi
|
||||
- done >> "${initdir}/etc/cmdline.d/90lvm.conf"
|
||||
- echo >> "${initdir}/etc/cmdline.d/90lvm.conf"
|
||||
+ if [[ $hostonly ]]; then
|
||||
+ get_host_lvs | while read line; do
|
||||
+ printf "%s" " rd.lvm.lv=$line"
|
||||
+ if ! [[ $_needthin ]]; then
|
||||
+ [[ "$(lvs --noheadings -o segtype ${line%%/*} 2>/dev/null)" == *thin* ]] && _needthin=1
|
||||
+ fi
|
||||
+ done >> "${initdir}/etc/cmdline.d/90lvm.conf"
|
||||
+ echo >> "${initdir}/etc/cmdline.d/90lvm.conf"
|
||||
+ else
|
||||
+ _needthin=1
|
||||
+ fi
|
||||
|
||||
inst_rules "$moddir/64-lvm.rules"
|
||||
|
||||
--
|
||||
1.8.4.3
|
||||
|
||||
@ -1,40 +0,0 @@
|
||||
From a70dff7f103b27d5b7016e13a64c7710c61dc96e Mon Sep 17 00:00:00 2001
|
||||
From: Harald Hoyer <harald@redhat.com>
|
||||
Date: Wed, 16 Oct 2013 11:30:08 +0200
|
||||
Subject: [PATCH 11/12] lvm: fix thin recognition
|
||||
|
||||
The global var setting was happening in a pipe and did not have an
|
||||
effect.
|
||||
|
||||
Use <<<$() instead.
|
||||
|
||||
< <() cannot be used, because dracut is called in chroot's environments,
|
||||
where /dev/fd does not point to /proc/self/fd, but bash wants
|
||||
/dev/fd/<num> for this construct.
|
||||
---
|
||||
modules.d/90lvm/module-setup.sh | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh
|
||||
index f8b598d..cbdf4a2 100755
|
||||
--- a/modules.d/90lvm/module-setup.sh
|
||||
+++ b/modules.d/90lvm/module-setup.sh
|
||||
@@ -57,12 +57,13 @@ install() {
|
||||
inst lvm
|
||||
|
||||
if [[ $hostonly ]]; then
|
||||
- get_host_lvs | while read line; do
|
||||
+ while read line; do
|
||||
+ [[ -n "$line" ]] || continue
|
||||
printf "%s" " rd.lvm.lv=$line"
|
||||
if ! [[ $_needthin ]]; then
|
||||
[[ "$(lvs --noheadings -o segtype ${line%%/*} 2>/dev/null)" == *thin* ]] && _needthin=1
|
||||
fi
|
||||
- done >> "${initdir}/etc/cmdline.d/90lvm.conf"
|
||||
+ done <<<$(get_host_lvs) >> "${initdir}/etc/cmdline.d/90lvm.conf"
|
||||
echo >> "${initdir}/etc/cmdline.d/90lvm.conf"
|
||||
else
|
||||
_needthin=1
|
||||
--
|
||||
1.8.4.3
|
||||
|
||||
@ -1,79 +0,0 @@
|
||||
From 615071016ecfa223b2744fc17e137de780167115 Mon Sep 17 00:00:00 2001
|
||||
From: Harald Hoyer <harald@redhat.com>
|
||||
Date: Mon, 21 Oct 2013 09:09:26 +0200
|
||||
Subject: [PATCH 12/12] lvm: always install thin utils for lvm
|
||||
|
||||
---
|
||||
modules.d/90lvm/module-setup.sh | 33 +++++++--------------------------
|
||||
1 file changed, 7 insertions(+), 26 deletions(-)
|
||||
|
||||
diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh
|
||||
index cbdf4a2..87374da 100755
|
||||
--- a/modules.d/90lvm/module-setup.sh
|
||||
+++ b/modules.d/90lvm/module-setup.sh
|
||||
@@ -24,7 +24,8 @@ depends() {
|
||||
return 0
|
||||
}
|
||||
|
||||
-get_host_lvs() {
|
||||
+# called by dracut
|
||||
+cmdline() {
|
||||
local _activated
|
||||
declare -A _activated
|
||||
|
||||
@@ -37,37 +38,20 @@ get_host_lvs() {
|
||||
eval $(dmsetup splitname --nameprefixes --noheadings --rows "$dev" 2>/dev/null)
|
||||
[[ ${DM_VG_NAME} ]] && [[ ${DM_LV_NAME} ]] || return 1
|
||||
if ! [[ ${_activated[${DM_VG_NAME}/${DM_LV_NAME}]} ]]; then
|
||||
- printf "%s\n" "${DM_VG_NAME}/${DM_LV_NAME} "
|
||||
+ printf " rd.lvm.lv=%s\n" "${DM_VG_NAME}/${DM_LV_NAME} "
|
||||
_activated["${DM_VG_NAME}/${DM_LV_NAME}"]=1
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
# called by dracut
|
||||
-cmdline() {
|
||||
- get_host_lvs | while read line; do
|
||||
- printf " rd.lvm.lv=$line"
|
||||
- done
|
||||
-}
|
||||
-
|
||||
-# called by dracut
|
||||
install() {
|
||||
- local _i _needthin
|
||||
+ local _i
|
||||
|
||||
inst lvm
|
||||
|
||||
- if [[ $hostonly ]]; then
|
||||
- while read line; do
|
||||
- [[ -n "$line" ]] || continue
|
||||
- printf "%s" " rd.lvm.lv=$line"
|
||||
- if ! [[ $_needthin ]]; then
|
||||
- [[ "$(lvs --noheadings -o segtype ${line%%/*} 2>/dev/null)" == *thin* ]] && _needthin=1
|
||||
- fi
|
||||
- done <<<$(get_host_lvs) >> "${initdir}/etc/cmdline.d/90lvm.conf"
|
||||
- echo >> "${initdir}/etc/cmdline.d/90lvm.conf"
|
||||
- else
|
||||
- _needthin=1
|
||||
- fi
|
||||
+ cmdline >> "${initdir}/etc/cmdline.d/90lvm.conf"
|
||||
+ echo >> "${initdir}/etc/cmdline.d/90lvm.conf"
|
||||
|
||||
inst_rules "$moddir/64-lvm.rules"
|
||||
|
||||
@@ -103,9 +87,6 @@ install() {
|
||||
|
||||
inst_libdir_file "libdevmapper-event-lvm*.so"
|
||||
|
||||
- if [[ $_needthin ]]; then
|
||||
- inst_multiple -o thin_dump thin_restore thin_check thin_repair
|
||||
- fi
|
||||
-
|
||||
+ inst_multiple -o thin_dump thin_restore thin_check thin_repair
|
||||
}
|
||||
|
||||
--
|
||||
1.8.4.3
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
From ffbe30d1e1e9fb09136bfc2d29a3cc65292b5690 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Tsoy <alexander@tsoy.me>
|
||||
Date: Thu, 21 Nov 2013 20:33:38 +0400
|
||||
Subject: [PATCH 13/13] usrmount: always install
|
||||
|
||||
/usr should be mounted by initramfs even if /sbin/init lives in /
|
||||
|
||||
Conflicts:
|
||||
modules.d/98usrmount/module-setup.sh
|
||||
---
|
||||
modules.d/98usrmount/module-setup.sh | 3 ---
|
||||
1 file changed, 3 deletions(-)
|
||||
|
||||
diff --git a/modules.d/98usrmount/module-setup.sh b/modules.d/98usrmount/module-setup.sh
|
||||
index 1af789f..31a6229 100755
|
||||
--- a/modules.d/98usrmount/module-setup.sh
|
||||
+++ b/modules.d/98usrmount/module-setup.sh
|
||||
@@ -4,10 +4,7 @@
|
||||
|
||||
# called by dracut
|
||||
check() {
|
||||
- local _init
|
||||
[[ $mount_needs ]] && return 1
|
||||
- _init=$(readlink -f /sbin/init)
|
||||
- [[ "$init" == "${init##/usr}" ]] && return 255
|
||||
return 0
|
||||
}
|
||||
|
||||
--
|
||||
1.8.4.4
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
From 29f735ac0e54421d1518b8d0f730523ebb7e6d5a Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Tsoy <alexander@tsoy.me>
|
||||
Date: Wed, 25 Dec 2013 14:00:26 +0400
|
||||
Subject: [PATCH] udev-rules: add eudev rules
|
||||
|
||||
eudev configured with "--enable-modules --disable-libkmod" installs
|
||||
80-drivers-modprobe.rules instead of 80-drivers.rules
|
||||
|
||||
https://bugs.gentoo.org/show_bug.cgi?id=494188
|
||||
---
|
||||
modules.d/95udev-rules/module-setup.sh | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/modules.d/95udev-rules/module-setup.sh b/modules.d/95udev-rules/module-setup.sh
|
||||
index 88c3da2..ebc4447 100755
|
||||
--- a/modules.d/95udev-rules/module-setup.sh
|
||||
+++ b/modules.d/95udev-rules/module-setup.sh
|
||||
@@ -39,6 +39,8 @@ install() {
|
||||
prepare_udev_rules 59-persistent-storage.rules 61-persistent-storage.rules
|
||||
# debian udev rules
|
||||
inst_rules 91-permissions.rules
|
||||
+ # eudev rules
|
||||
+ inst_rules 80-drivers-modprobe.rules
|
||||
|
||||
{
|
||||
for i in cdrom tape dialout floppy; do
|
||||
--
|
||||
1.8.3.2
|
||||
|
||||
@ -1,41 +0,0 @@
|
||||
From ed2f8d6145ef12084af882575091a7d44a3e47c1 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
|
||||
Date: Sun, 6 Jan 2013 13:35:01 +0100
|
||||
Subject: [PATCH 1/4] dracut-functions.sh: support for alternative udev dirs -
|
||||
udevaltdirs
|
||||
|
||||
It is required for Gentoo which moves udev from / to /usr and supports
|
||||
both /lib/udev and /usr/lib/udev for compatibility with other packages.
|
||||
|
||||
Credits go to Alexander Tsoy <alexander@tsoy.me>.
|
||||
|
||||
Conflicts:
|
||||
dracut-functions.sh
|
||||
---
|
||||
dracut-functions.sh | 10 ++++++++++
|
||||
1 file changed, 10 insertions(+)
|
||||
|
||||
diff --git a/dracut-functions.sh b/dracut-functions.sh
|
||||
index 1bcc3b4..72afce2 100755
|
||||
--- a/dracut-functions.sh
|
||||
+++ b/dracut-functions.sh
|
||||
@@ -943,6 +943,16 @@ inst_rules() {
|
||||
inst_dir "$_target"
|
||||
for _rule in "$@"; do
|
||||
if [ "${_rule#/}" = "$_rule" ]; then
|
||||
+ for r in ${udevaltdirs}; do
|
||||
+ [[ "$r" = "${udevdir}" ]] && continue
|
||||
+ if [[ -e $r/rules.d/$_rule ]]; then
|
||||
+ _found="$r/rules.d/$_rule"
|
||||
+ inst_rule_programs "$_found"
|
||||
+ inst_rule_group_owner "$_found"
|
||||
+ inst_rule_initqueue "$_found"
|
||||
+ inst_simple "$_found" "${udevdir}/rules.d/${_found##*/}"
|
||||
+ fi
|
||||
+ done
|
||||
for r in ${udevdir}/rules.d ${hostonly:+/etc/udev/rules.d}; do
|
||||
if [[ -e $r/$_rule ]]; then
|
||||
_found="$r/$_rule"
|
||||
--
|
||||
2.1.3
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
From a562cb9ad84784cb4ba7679a2fc3a269d31a4ca3 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
|
||||
Date: Sun, 16 Dec 2012 20:02:48 +0100
|
||||
Subject: [PATCH 2/4] gentoo.conf: let udevdir= be handled by pkg-config and
|
||||
use udevaltdirs
|
||||
|
||||
To avoid need of rebuild after udev update/downgrade let udevdir= be set
|
||||
dynamically with pkg-config. Use udevaltdirs to search for rules both
|
||||
in old and new locations.
|
||||
---
|
||||
dracut.conf.d/gentoo.conf.example | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dracut.conf.d/gentoo.conf.example b/dracut.conf.d/gentoo.conf.example
|
||||
index 26e7314..f9617f0 100644
|
||||
--- a/dracut.conf.d/gentoo.conf.example
|
||||
+++ b/dracut.conf.d/gentoo.conf.example
|
||||
@@ -1,7 +1,8 @@
|
||||
# /etc/dracut.conf.d/gentoo.conf
|
||||
# dracut config file customized for Gentoo Base System release 2
|
||||
|
||||
-udevdir=/lib/udev
|
||||
+udevdir=
|
||||
+udevaltdirs="/lib/udev /usr/lib/udev"
|
||||
ro_mnt=yes
|
||||
|
||||
#
|
||||
--
|
||||
2.1.3
|
||||
|
||||
@ -1,74 +0,0 @@
|
||||
From 5a1de9053d27feeb283253554033e7ad25c9aa31 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
|
||||
Date: Wed, 2 Oct 2013 22:37:09 +0200
|
||||
Subject: [PATCH 3/4] Use the same paths in dracut.sh as those set with
|
||||
configure script
|
||||
|
||||
Makefile alters destination main dracut script and sets dracutbasedir to
|
||||
the value of pkglibdir set in configure.
|
||||
---
|
||||
Makefile | 3 +++
|
||||
dracut.sh | 9 ++++-----
|
||||
2 files changed, 7 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 7127368..a4c35e5 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -103,6 +103,9 @@ install: dracut-version.sh
|
||||
mkdir -p $(DESTDIR)$(pkglibdir)/modules.d
|
||||
mkdir -p $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man7 $(DESTDIR)$(mandir)/man8
|
||||
install -m 0755 dracut.sh $(DESTDIR)$(bindir)/dracut
|
||||
+ sed -r \
|
||||
+ -e "s|^(pkglibdir)=.*|\1=$(pkglibdir)|" \
|
||||
+ -i $(DESTDIR)$(bindir)/dracut
|
||||
install -m 0755 dracut-catimages.sh $(DESTDIR)$(bindir)/dracut-catimages
|
||||
install -m 0755 mkinitrd-dracut.sh $(DESTDIR)$(bindir)/mkinitrd
|
||||
install -m 0755 lsinitrd.sh $(DESTDIR)$(bindir)/lsinitrd
|
||||
diff --git a/dracut.sh b/dracut.sh
|
||||
index 1c7e208..ea30a7b 100755
|
||||
--- a/dracut.sh
|
||||
+++ b/dracut.sh
|
||||
@@ -24,10 +24,13 @@
|
||||
# store for logging
|
||||
dracut_args=( "$@" )
|
||||
|
||||
+# base dirs
|
||||
+pkglibdir=/usr/lib/dracut
|
||||
+dracutbasedir="$pkglibdir"
|
||||
+
|
||||
set -o pipefail
|
||||
|
||||
usage() {
|
||||
- [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
|
||||
if [[ -f $dracutbasedir/dracut-version.sh ]]; then
|
||||
. $dracutbasedir/dracut-version.sh
|
||||
fi
|
||||
@@ -52,7 +55,6 @@ EOF
|
||||
}
|
||||
|
||||
long_usage() {
|
||||
- [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
|
||||
if [[ -f $dracutbasedir/dracut-version.sh ]]; then
|
||||
. $dracutbasedir/dracut-version.sh
|
||||
fi
|
||||
@@ -656,8 +658,6 @@ export DRACUT_LOG_LEVEL=warning
|
||||
debug=yes
|
||||
}
|
||||
|
||||
-[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
|
||||
-
|
||||
# if we were not passed a config file, try the default one
|
||||
if [[ ! -f $conffile ]]; then
|
||||
if [[ $allowlocal ]]; then
|
||||
@@ -798,7 +798,6 @@ stdloglvl=$((stdloglvl + verbosity_mod_l))
|
||||
[[ $use_fstab_l ]] && use_fstab=$use_fstab_l
|
||||
[[ $mdadmconf_l ]] && mdadmconf=$mdadmconf_l
|
||||
[[ $lvmconf_l ]] && lvmconf=$lvmconf_l
|
||||
-[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
|
||||
[[ $fw_dir ]] || fw_dir="/lib/firmware/updates /lib/firmware"
|
||||
[[ $tmpdir_l ]] && tmpdir="$tmpdir_l"
|
||||
[[ $tmpdir ]] || tmpdir=/var/tmp
|
||||
--
|
||||
2.1.3
|
||||
|
||||
@ -1,81 +0,0 @@
|
||||
From ed9375739c3f7e48f6e1c3037c5a589c49d78613 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
|
||||
Date: Wed, 2 Oct 2013 22:40:43 +0200
|
||||
Subject: [PATCH 4/4] Install dracut-install into libexec dir instead of lib
|
||||
dir
|
||||
|
||||
dracut-install script is the only thing ABI specific atm.
|
||||
|
||||
See https://bugs.gentoo.org/show_bug.cgi?id=485218 for details on the
|
||||
problem.
|
||||
---
|
||||
Makefile | 4 +++-
|
||||
configure | 1 +
|
||||
dracut-functions.sh | 4 ++++
|
||||
dracut.sh | 1 +
|
||||
4 files changed, 9 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index a4c35e5..af61faf 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -104,6 +104,7 @@ install: dracut-version.sh
|
||||
mkdir -p $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man7 $(DESTDIR)$(mandir)/man8
|
||||
install -m 0755 dracut.sh $(DESTDIR)$(bindir)/dracut
|
||||
sed -r \
|
||||
+ -e "s|^(libexecdir)=.*|\1=$(libexecdir)|" \
|
||||
-e "s|^(pkglibdir)=.*|\1=$(pkglibdir)|" \
|
||||
-i $(DESTDIR)$(bindir)/dracut
|
||||
install -m 0755 dracut-catimages.sh $(DESTDIR)$(bindir)/dracut-catimages
|
||||
@@ -147,7 +148,8 @@ endif
|
||||
done \
|
||||
fi
|
||||
if [ -f install/dracut-install ]; then \
|
||||
- install -m 0755 install/dracut-install $(DESTDIR)$(pkglibdir)/dracut-install; \
|
||||
+ mkdir -p $(DESTDIR)$(libexecdir); \
|
||||
+ install -m 0755 install/dracut-install $(DESTDIR)$(libexecdir)/dracut-install; \
|
||||
fi
|
||||
if [ -f skipcpio/skipcpio ]; then \
|
||||
install -m 0755 skipcpio/skipcpio $(DESTDIR)$(pkglibdir)/skipcpio; \
|
||||
diff --git a/configure b/configure
|
||||
index 0bd3d2d..17370de 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -59,6 +59,7 @@ sbindir ?= ${sbindir:-${prefix}/sbin}
|
||||
mandir ?= ${mandir:-${prefix}/share/man}
|
||||
enable_documentation ?= ${enable_documentation:-yes}
|
||||
bindir ?= ${bindir:-${prefix}/bin}
|
||||
+libexecdir ?= ${libexecdir:-${prefix}/libexec}
|
||||
EOF
|
||||
|
||||
{
|
||||
diff --git a/dracut-functions.sh b/dracut-functions.sh
|
||||
index 72afce2..1d85315 100755
|
||||
--- a/dracut-functions.sh
|
||||
+++ b/dracut-functions.sh
|
||||
@@ -741,6 +741,10 @@ if ! [[ $DRACUT_INSTALL ]]; then
|
||||
DRACUT_INSTALL=$(find_binary dracut-install)
|
||||
fi
|
||||
|
||||
+if ! [[ $DRACUT_INSTALL ]] && [[ -x $libexecdir/dracut-install ]]; then
|
||||
+ DRACUT_INSTALL=$libexecdir/dracut-install
|
||||
+fi
|
||||
+
|
||||
if ! [[ $DRACUT_INSTALL ]] && [[ -x $dracutbasedir/dracut-install ]]; then
|
||||
DRACUT_INSTALL=$dracutbasedir/dracut-install
|
||||
fi
|
||||
diff --git a/dracut.sh b/dracut.sh
|
||||
index ea30a7b..08f27eb 100755
|
||||
--- a/dracut.sh
|
||||
+++ b/dracut.sh
|
||||
@@ -25,6 +25,7 @@
|
||||
dracut_args=( "$@" )
|
||||
|
||||
# base dirs
|
||||
+libexecdir=/usr/libexec
|
||||
pkglibdir=/usr/lib/dracut
|
||||
dracutbasedir="$pkglibdir"
|
||||
|
||||
--
|
||||
2.1.3
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
From 36c91220234af69a96cd95e575b47f0a3ec4c645 Mon Sep 17 00:00:00 2001
|
||||
From: Harald Hoyer <harald@redhat.com>
|
||||
Date: Fri, 24 Oct 2014 14:41:29 +0200
|
||||
Subject: [PATCH 5/5] NEWS: add 040 entry
|
||||
|
||||
---
|
||||
NEWS | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/NEWS b/NEWS
|
||||
index 1b79da1..da44068 100644
|
||||
--- a/NEWS
|
||||
+++ b/NEWS
|
||||
@@ -1,3 +1,8 @@
|
||||
+dracut-040
|
||||
+==========
|
||||
+- fixed dracut module dependency checks
|
||||
+- fixed test suite
|
||||
+
|
||||
dracut-039
|
||||
==========
|
||||
- DRACUT_PATH can now be used to specify the PATH used by dracut
|
||||
--
|
||||
2.1.3
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
From ff57ba111c03957d4a68459efd91322c24223861 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
|
||||
Date: Sat, 1 Nov 2014 22:25:07 +0100
|
||||
Subject: [PATCH 6/6] Don't pass --rsyncable option to gzip - Gentoo gzip
|
||||
doesn't support it
|
||||
|
||||
---
|
||||
dracut.sh | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dracut.sh b/dracut.sh
|
||||
index 08f27eb..17be895 100755
|
||||
--- a/dracut.sh
|
||||
+++ b/dracut.sh
|
||||
@@ -822,7 +822,7 @@ case $compress in
|
||||
bzip2) compress="bzip2 -9";;
|
||||
lzma) compress="lzma -9 -T0";;
|
||||
xz) compress="xz --check=crc32 --lzma2=dict=1MiB -T0";;
|
||||
- gzip) compress="gzip -n -9 --rsyncable"; command -v pigz > /dev/null 2>&1 && compress="pigz -9 -n -T -R";;
|
||||
+ gzip) compress="gzip -n -9"; command -v pigz > /dev/null 2>&1 && compress="pigz -9 -n -T -R";;
|
||||
lzo) compress="lzop -9";;
|
||||
lz4) compress="lz4 -l -9";;
|
||||
esac
|
||||
--
|
||||
2.1.3
|
||||
|
||||
@ -1,44 +0,0 @@
|
||||
From 25efd305dace3275c661e0a7dfbaef42b4cbc6d7 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
|
||||
Date: Sun, 11 Jan 2015 15:10:39 +0100
|
||||
Subject: [PATCH 7/7] Take into account lib64 dirs when detecting version,
|
||||
modules and params
|
||||
|
||||
---
|
||||
lsinitrd.sh | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/lsinitrd.sh b/lsinitrd.sh
|
||||
index 4f12c2c..dc1f88f 100755
|
||||
--- a/lsinitrd.sh
|
||||
+++ b/lsinitrd.sh
|
||||
@@ -124,7 +124,7 @@ extract_files()
|
||||
list_modules()
|
||||
{
|
||||
echo "dracut modules:"
|
||||
- $CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib/dracut/modules.txt' 'usr/lib/dracut/modules.txt' 2>/dev/null
|
||||
+ $CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib64/dracut/modules.txt' 'lib/dracut/modules.txt' 'usr/lib/dracut/modules.txt' 2>/dev/null
|
||||
((ret+=$?))
|
||||
}
|
||||
|
||||
@@ -217,7 +217,7 @@ ret=0
|
||||
if (( ${#filenames[@]} > 0 )); then
|
||||
extract_files
|
||||
else
|
||||
- version=$($CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib/dracut/dracut-*' 'usr/lib/dracut/dracut-*' 2>/dev/null)
|
||||
+ version=$($CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib64/dracut/dracut-*' 'lib/dracut/dracut-*' 'usr/lib/dracut/dracut-*' 2>/dev/null)
|
||||
((ret+=$?))
|
||||
echo "Version: $version"
|
||||
echo
|
||||
@@ -226,7 +226,7 @@ else
|
||||
echo "========================================================================"
|
||||
else
|
||||
echo -n "Arguments: "
|
||||
- $CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib/dracut/build-parameter.txt' 'usr/lib/dracut/build-parameter.txt' 2>/dev/null
|
||||
+ $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
|
||||
echo
|
||||
list_modules
|
||||
list_files
|
||||
--
|
||||
2.2.1
|
||||
|
||||
@ -1,74 +0,0 @@
|
||||
From 89334439113c0ea8196ac5e9e188e6a1bbebe267 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
|
||||
Date: Wed, 2 Oct 2013 22:37:09 +0200
|
||||
Subject: [PATCH 1/4] Use the same paths in dracut.sh as those set with
|
||||
configure script
|
||||
|
||||
Makefile alters destination main dracut script and sets dracutbasedir to
|
||||
the value of pkglibdir set in configure.
|
||||
---
|
||||
Makefile | 3 +++
|
||||
dracut.sh | 9 ++++-----
|
||||
2 files changed, 7 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 41ae274..41968b0 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -103,6 +103,9 @@ install: dracut-version.sh
|
||||
mkdir -p $(DESTDIR)$(pkglibdir)/modules.d
|
||||
mkdir -p $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man7 $(DESTDIR)$(mandir)/man8
|
||||
install -m 0755 dracut.sh $(DESTDIR)$(bindir)/dracut
|
||||
+ sed -r \
|
||||
+ -e "s|^(pkglibdir)=.*|\1=$(pkglibdir)|" \
|
||||
+ -i $(DESTDIR)$(bindir)/dracut
|
||||
install -m 0755 dracut-catimages.sh $(DESTDIR)$(bindir)/dracut-catimages
|
||||
install -m 0755 mkinitrd-dracut.sh $(DESTDIR)$(bindir)/mkinitrd
|
||||
install -m 0755 lsinitrd.sh $(DESTDIR)$(bindir)/lsinitrd
|
||||
diff --git a/dracut.sh b/dracut.sh
|
||||
index 5e2feba..89a711e 100755
|
||||
--- a/dracut.sh
|
||||
+++ b/dracut.sh
|
||||
@@ -24,10 +24,13 @@
|
||||
# store for logging
|
||||
dracut_args=( "$@" )
|
||||
|
||||
+# base dirs
|
||||
+pkglibdir=/usr/lib/dracut
|
||||
+dracutbasedir="$pkglibdir"
|
||||
+
|
||||
set -o pipefail
|
||||
|
||||
usage() {
|
||||
- [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
|
||||
if [[ -f $dracutbasedir/dracut-version.sh ]]; then
|
||||
. $dracutbasedir/dracut-version.sh
|
||||
fi
|
||||
@@ -52,7 +55,6 @@ EOF
|
||||
}
|
||||
|
||||
long_usage() {
|
||||
- [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
|
||||
if [[ -f $dracutbasedir/dracut-version.sh ]]; then
|
||||
. $dracutbasedir/dracut-version.sh
|
||||
fi
|
||||
@@ -666,8 +668,6 @@ export DRACUT_LOG_LEVEL=warning
|
||||
debug=yes
|
||||
}
|
||||
|
||||
-[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
|
||||
-
|
||||
# if we were not passed a config file, try the default one
|
||||
if [[ ! -f $conffile ]]; then
|
||||
if [[ $allowlocal ]]; then
|
||||
@@ -808,7 +808,6 @@ stdloglvl=$((stdloglvl + verbosity_mod_l))
|
||||
[[ $use_fstab_l ]] && use_fstab=$use_fstab_l
|
||||
[[ $mdadmconf_l ]] && mdadmconf=$mdadmconf_l
|
||||
[[ $lvmconf_l ]] && lvmconf=$lvmconf_l
|
||||
-[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
|
||||
[[ $fw_dir ]] || fw_dir="/lib/firmware/updates /lib/firmware"
|
||||
[[ $tmpdir_l ]] && tmpdir="$tmpdir_l"
|
||||
[[ $tmpdir ]] || tmpdir=/var/tmp
|
||||
--
|
||||
2.3.3
|
||||
|
||||
@ -1,125 +0,0 @@
|
||||
From 7d8dadfdb2d59ac60c6a579f602e13ac7c743e39 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
|
||||
Date: Wed, 2 Oct 2013 22:40:43 +0200
|
||||
Subject: [PATCH 2/4] Install dracut-install and skipcpio into libexec dir
|
||||
instead of lib dir
|
||||
|
||||
dracut-install and skipcpio are the only ABI specific things atm.
|
||||
|
||||
See https://bugs.gentoo.org/show_bug.cgi?id=485218 for details on the
|
||||
problem.
|
||||
---
|
||||
Makefile | 7 +++++--
|
||||
configure | 1 +
|
||||
dracut-functions.sh | 4 ++++
|
||||
dracut-initramfs-restore.sh | 4 ++--
|
||||
dracut.sh | 1 +
|
||||
lsinitrd.sh | 4 ++--
|
||||
6 files changed, 15 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 41968b0..bb007d1 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -104,6 +104,7 @@ install: dracut-version.sh
|
||||
mkdir -p $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man7 $(DESTDIR)$(mandir)/man8
|
||||
install -m 0755 dracut.sh $(DESTDIR)$(bindir)/dracut
|
||||
sed -r \
|
||||
+ -e "s|^(libexecdir)=.*|\1=$(libexecdir)|" \
|
||||
-e "s|^(pkglibdir)=.*|\1=$(pkglibdir)|" \
|
||||
-i $(DESTDIR)$(bindir)/dracut
|
||||
install -m 0755 dracut-catimages.sh $(DESTDIR)$(bindir)/dracut-catimages
|
||||
@@ -147,10 +148,12 @@ endif
|
||||
done \
|
||||
fi
|
||||
if [ -f install/dracut-install ]; then \
|
||||
- install -m 0755 install/dracut-install $(DESTDIR)$(pkglibdir)/dracut-install; \
|
||||
+ mkdir -p $(DESTDIR)$(libexecdir)/dracut; \
|
||||
+ install -m 0755 install/dracut-install $(DESTDIR)$(libexecdir)/dracut/dracut-install; \
|
||||
fi
|
||||
if [ -f skipcpio/skipcpio ]; then \
|
||||
- install -m 0755 skipcpio/skipcpio $(DESTDIR)$(pkglibdir)/skipcpio; \
|
||||
+ mkdir -p $(DESTDIR)$(libexecdir)/dracut; \
|
||||
+ install -m 0755 skipcpio/skipcpio $(DESTDIR)$(libexecdir)/dracut/skipcpio; \
|
||||
fi
|
||||
mkdir -p $(DESTDIR)${prefix}/lib/kernel/install.d
|
||||
install -m 0755 50-dracut.install $(DESTDIR)${prefix}/lib/kernel/install.d/50-dracut.install
|
||||
diff --git a/configure b/configure
|
||||
index 0bd3d2d..17370de 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -59,6 +59,7 @@ sbindir ?= ${sbindir:-${prefix}/sbin}
|
||||
mandir ?= ${mandir:-${prefix}/share/man}
|
||||
enable_documentation ?= ${enable_documentation:-yes}
|
||||
bindir ?= ${bindir:-${prefix}/bin}
|
||||
+libexecdir ?= ${libexecdir:-${prefix}/libexec}
|
||||
EOF
|
||||
|
||||
{
|
||||
diff --git a/dracut-functions.sh b/dracut-functions.sh
|
||||
index 37ddca2..953acd1 100755
|
||||
--- a/dracut-functions.sh
|
||||
+++ b/dracut-functions.sh
|
||||
@@ -733,6 +733,10 @@ if ! [[ $DRACUT_INSTALL ]]; then
|
||||
DRACUT_INSTALL=$(find_binary dracut-install)
|
||||
fi
|
||||
|
||||
+if ! [[ $DRACUT_INSTALL ]] && [[ -x $dracutlibexecdir/dracut-install ]]; then
|
||||
+ DRACUT_INSTALL=$dracutlibexecdir/dracut-install
|
||||
+fi
|
||||
+
|
||||
if ! [[ $DRACUT_INSTALL ]] && [[ -x $dracutbasedir/dracut-install ]]; then
|
||||
DRACUT_INSTALL=$dracutbasedir/dracut-install
|
||||
elif ! [[ $DRACUT_INSTALL ]] && [[ -x $dracutbasedir/install/dracut-install ]]; then
|
||||
diff --git a/dracut-initramfs-restore.sh b/dracut-initramfs-restore.sh
|
||||
index 8b9b80f..8dd358e 100644
|
||||
--- a/dracut-initramfs-restore.sh
|
||||
+++ b/dracut-initramfs-restore.sh
|
||||
@@ -8,8 +8,8 @@ set -e
|
||||
|
||||
KERNEL_VERSION="$(uname -r)"
|
||||
|
||||
-[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
|
||||
-SKIP="$dracutbasedir/skipcpio"
|
||||
+[[ $dracutlibexecdir ]] || dracutlibexecdir=/usr/libexec/dracut
|
||||
+SKIP="$dracutlibexecdir/skipcpio"
|
||||
[[ -x $SKIP ]] || SKIP=cat
|
||||
|
||||
[[ -f /etc/machine-id ]] && read MACHINE_ID < /etc/machine-id
|
||||
diff --git a/dracut.sh b/dracut.sh
|
||||
index 89a711e..9cfeef1 100755
|
||||
--- a/dracut.sh
|
||||
+++ b/dracut.sh
|
||||
@@ -25,6 +25,7 @@
|
||||
dracut_args=( "$@" )
|
||||
|
||||
# base dirs
|
||||
+dracutlibexecdir=/usr/libexec/dracut
|
||||
pkglibdir=/usr/lib/dracut
|
||||
dracutbasedir="$pkglibdir"
|
||||
|
||||
diff --git a/lsinitrd.sh b/lsinitrd.sh
|
||||
index 4f12c2c..2ed6e56 100755
|
||||
--- a/lsinitrd.sh
|
||||
+++ b/lsinitrd.sh
|
||||
@@ -33,7 +33,7 @@ usage()
|
||||
}
|
||||
|
||||
|
||||
-[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
|
||||
+[[ $dracutlibexecdir ]] || dracutlibexecdir=/usr/libexec/dracut
|
||||
|
||||
sorted=0
|
||||
modules=0
|
||||
@@ -158,7 +158,7 @@ case $bin in
|
||||
echo "Early CPIO image"
|
||||
list_files
|
||||
fi
|
||||
- SKIP="$dracutbasedir/skipcpio"
|
||||
+ SKIP="$dracutlibexecdir/skipcpio"
|
||||
if ! [[ -x $SKIP ]]; then
|
||||
echo
|
||||
echo "'$SKIP' not found, cannot display remaining contents!" >&2
|
||||
--
|
||||
2.3.3
|
||||
|
||||
@ -1,60 +0,0 @@
|
||||
From acfd4d98e821dbaa9ae68dde82fb8843fbf5de59 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
|
||||
Date: Sun, 11 Jan 2015 15:10:39 +0100
|
||||
Subject: [PATCH 3/4] Take into account lib64 dirs when detecting version,
|
||||
modules and params
|
||||
|
||||
---
|
||||
lsinitrd.sh | 15 ++++++++++++---
|
||||
1 file changed, 12 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/lsinitrd.sh b/lsinitrd.sh
|
||||
index 2ed6e56..0355c87 100755
|
||||
--- a/lsinitrd.sh
|
||||
+++ b/lsinitrd.sh
|
||||
@@ -108,6 +108,12 @@ if ! [[ -f "$image" ]]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
+dracutlibdirs() {
|
||||
+ for d in lib64/dracut lib/dracut usr/lib64/dracut usr/lib/dracut; do
|
||||
+ echo "$d/$1"
|
||||
+ done
|
||||
+}
|
||||
+
|
||||
extract_files()
|
||||
{
|
||||
(( ${#filenames[@]} == 1 )) && nofileinfo=1
|
||||
@@ -124,7 +130,8 @@ extract_files()
|
||||
list_modules()
|
||||
{
|
||||
echo "dracut modules:"
|
||||
- $CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib/dracut/modules.txt' 'usr/lib/dracut/modules.txt' 2>/dev/null
|
||||
+ $CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- \
|
||||
+ $(dracutlibdirs modules.txt) 2>/dev/null
|
||||
((ret+=$?))
|
||||
}
|
||||
|
||||
@@ -217,7 +224,8 @@ ret=0
|
||||
if (( ${#filenames[@]} > 0 )); then
|
||||
extract_files
|
||||
else
|
||||
- version=$($CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib/dracut/dracut-*' 'usr/lib/dracut/dracut-*' 2>/dev/null)
|
||||
+ version=$($CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- \
|
||||
+ $(dracutlibdirs 'dracut-*') 2>/dev/null)
|
||||
((ret+=$?))
|
||||
echo "Version: $version"
|
||||
echo
|
||||
@@ -226,7 +234,8 @@ else
|
||||
echo "========================================================================"
|
||||
else
|
||||
echo -n "Arguments: "
|
||||
- $CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib/dracut/build-parameter.txt' 'usr/lib/dracut/build-parameter.txt' 2>/dev/null
|
||||
+ $CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- \
|
||||
+ $(dracutlibdirs build-parameter.txt) 2>/dev/null
|
||||
echo
|
||||
list_modules
|
||||
list_files
|
||||
--
|
||||
2.3.3
|
||||
|
||||
@ -1,63 +0,0 @@
|
||||
From 82f7e46c8fdb2bb41b7b26916e463add7af70a94 Mon Sep 17 00:00:00 2001
|
||||
From: xtraeme <xtraeme@voidlinux.eu>
|
||||
Date: Tue, 2 Jun 2015 11:11:21 +0200
|
||||
Subject: [PATCH 5/5] Portability fixes:
|
||||
|
||||
- Use uid_t not __uid_t.
|
||||
- Define _GNU_SOURCE for cpu_set_t and others.
|
||||
- Include string.h for strncmp().
|
||||
- Detect musl's ldd error message.
|
||||
---
|
||||
install/dracut-install.c | 7 ++++++-
|
||||
install/util.h | 3 +++
|
||||
2 files changed, 9 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/install/dracut-install.c b/install/dracut-install.c
|
||||
index 201f181..0ff5c49 100644
|
||||
--- a/install/dracut-install.c
|
||||
+++ b/install/dracut-install.c
|
||||
@@ -222,7 +222,7 @@ static int cp(const char *src, const char *dst)
|
||||
if (ret == 0) {
|
||||
struct timeval tv[2];
|
||||
if (fchown(dest_desc, sb.st_uid, sb.st_gid) != 0)
|
||||
- if(fchown(dest_desc, (__uid_t) - 1, sb.st_gid) != 0)
|
||||
+ if(fchown(dest_desc, (uid_t) - 1, sb.st_gid) != 0)
|
||||
log_error("Failed to chown %s: %m", dst);
|
||||
tv[0].tv_sec = sb.st_atime;
|
||||
tv[0].tv_usec = 0;
|
||||
@@ -388,6 +388,11 @@ static int resolve_deps(const char *src)
|
||||
break;
|
||||
}
|
||||
|
||||
+ /* musl ldd */
|
||||
+ if (strstr(buf, "Not a valid dynamic program"))
|
||||
+ break;
|
||||
+
|
||||
+ /* glibc */
|
||||
if (strstr(buf, "not a dynamic executable"))
|
||||
break;
|
||||
|
||||
diff --git a/install/util.h b/install/util.h
|
||||
index cc7b988..2ad3254 100644
|
||||
--- a/install/util.h
|
||||
+++ b/install/util.h
|
||||
@@ -20,6 +20,8 @@
|
||||
along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
||||
***/
|
||||
|
||||
+#define _GNU_SOURCE
|
||||
+
|
||||
#include <inttypes.h>
|
||||
#include <time.h>
|
||||
#include <sys/time.h>
|
||||
@@ -27,6 +29,7 @@
|
||||
#include <stdbool.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
+#include <string.h>
|
||||
#include <signal.h>
|
||||
#include <sched.h>
|
||||
#include <limits.h>
|
||||
--
|
||||
2.4.1
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
From 7ab0852f24a803ea2c9b0d8e1ce45d13cdd25320 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Tsoy <alexander@tsoy.me>
|
||||
Date: Tue, 24 Feb 2015 22:28:24 +0300
|
||||
Subject: [PATCH 5/5] base/dracut-lib.sh: remove bashism
|
||||
|
||||
---
|
||||
modules.d/99base/dracut-lib.sh | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
|
||||
index 5c1504f..c1a22b6 100755
|
||||
--- a/modules.d/99base/dracut-lib.sh
|
||||
+++ b/modules.d/99base/dracut-lib.sh
|
||||
@@ -886,7 +886,9 @@ dev_unit_name()
|
||||
dev="${dev##/}"
|
||||
dev="$(str_replace "$dev" '\' '\x5c')"
|
||||
dev="$(str_replace "$dev" '-' '\x2d')"
|
||||
- dev=${dev/#\./\\x2e}
|
||||
+ if [ "${dev##.}" != "$dev" ]; then
|
||||
+ dev="\x2e${dev##.}"
|
||||
+ fi
|
||||
dev="$(str_replace "$dev" '/' '-')"
|
||||
|
||||
printf -- "%s" "$dev"
|
||||
--
|
||||
2.4.1
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
From 7c782700a82e6f8b1cb665075e14eaf9d4f70867 Mon Sep 17 00:00:00 2001
|
||||
From: Fabian Deutsch <fabiand@fedoraproject.org>
|
||||
Date: Thu, 25 Jun 2015 11:17:59 +0200
|
||||
Subject: [PATCH] Revert "lvm: Don't activate LVs with activationskip set"
|
||||
|
||||
This reverts commit cfa365a32d47388c8476064b23d7d4684f1e591b.
|
||||
|
||||
The logic in commit cfa365a was added to prevent (odl) lvms from
|
||||
activating snapshots which should not be activated.
|
||||
Newer lvms however do this automatically (not enabling an LV if the
|
||||
the 'k' attribute set), thus we can revert the previous commit.
|
||||
---
|
||||
modules.d/90lvm/lvm_scan.sh | 4 ----
|
||||
1 file changed, 4 deletions(-)
|
||||
|
||||
diff --git a/modules.d/90lvm/lvm_scan.sh b/modules.d/90lvm/lvm_scan.sh
|
||||
index ce46e14..7495644 100755
|
||||
--- a/modules.d/90lvm/lvm_scan.sh
|
||||
+++ b/modules.d/90lvm/lvm_scan.sh
|
||||
@@ -106,10 +106,6 @@ if [ -n "$LVS" ] ; then
|
||||
info "Scanning devices $lvmdevs for LVM logical volumes $LVS"
|
||||
lvm lvscan --ignorelockingfailure 2>&1 | vinfo
|
||||
for LV in $LVS; do
|
||||
- if [ "x$(lvm lvs --noheadings --select "lv_attr =~ k" $LV | wc -l)" = "x0" ]; then
|
||||
- info "Skipping activation of '$LV' because activationskip is set."
|
||||
- continue
|
||||
- fi
|
||||
if [ -z "$sysinit" ]; then
|
||||
lvm lvchange --yes -ay --ignorelockingfailure $nopoll --ignoremonitoring $LV 2>&1 | vinfo
|
||||
else
|
||||
--
|
||||
2.4.5
|
||||
|
||||
@ -1,275 +0,0 @@
|
||||
From 15f330fe1afe9ac8870461faad55b7d63e791aca Mon Sep 17 00:00:00 2001
|
||||
From: Mike Gilbert <floppym@gentoo.org>
|
||||
Date: Tue, 14 Jul 2015 22:22:14 -0400
|
||||
Subject: [PATCH 2/3] Replace echo -n with printf in code with a /bin/sh
|
||||
shebang
|
||||
|
||||
POSIX does not mandate that echo support the -n parameter.
|
||||
printf has more well-defined behavior.
|
||||
---
|
||||
modules.d/04watchdog/watchdog-stop.sh | 2 +-
|
||||
modules.d/40network/net-lib.sh | 2 +-
|
||||
modules.d/45ifcfg/write-ifcfg.sh | 2 +-
|
||||
modules.d/90lvm/lvm_scan.sh | 4 ++--
|
||||
modules.d/95fcoe/fcoe-up.sh | 2 +-
|
||||
modules.d/98usrmount/mount-usr.sh | 2 +-
|
||||
modules.d/99base/dracut-lib.sh | 6 +++---
|
||||
modules.d/99base/init.sh | 2 +-
|
||||
test/TEST-10-RAID/create-root.sh | 2 +-
|
||||
test/TEST-10-RAID/cryptroot-ask.sh | 2 +-
|
||||
test/TEST-12-RAID-DEG/create-root.sh | 2 +-
|
||||
test/TEST-12-RAID-DEG/cryptroot-ask.sh | 2 +-
|
||||
test/TEST-13-ENC-RAID-LVM/create-root.sh | 2 +-
|
||||
test/TEST-13-ENC-RAID-LVM/cryptroot-ask.sh | 2 +-
|
||||
test/TEST-14-IMSM/cryptroot-ask.sh | 2 +-
|
||||
test/TEST-20-NFS/client-init.sh | 2 +-
|
||||
test/TEST-40-NBD/create-root.sh | 2 +-
|
||||
test/TEST-40-NBD/cryptroot-ask.sh | 2 +-
|
||||
18 files changed, 21 insertions(+), 21 deletions(-)
|
||||
|
||||
diff --git a/modules.d/04watchdog/watchdog-stop.sh b/modules.d/04watchdog/watchdog-stop.sh
|
||||
index 91d45d6..921f969 100755
|
||||
--- a/modules.d/04watchdog/watchdog-stop.sh
|
||||
+++ b/modules.d/04watchdog/watchdog-stop.sh
|
||||
@@ -1,2 +1,2 @@
|
||||
#!/bin/sh
|
||||
-[ -c /dev/watchdog ] && echo -n 'V' > /dev/watchdog
|
||||
+[ -c /dev/watchdog ] && printf 'V' > /dev/watchdog
|
||||
diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh
|
||||
index a09cdaf..6c739e8 100755
|
||||
--- a/modules.d/40network/net-lib.sh
|
||||
+++ b/modules.d/40network/net-lib.sh
|
||||
@@ -189,7 +189,7 @@ set_ifname() {
|
||||
fix_bootif() {
|
||||
local macaddr=${1}
|
||||
local IFS='-'
|
||||
- macaddr=$(for i in ${macaddr} ; do echo -n $i:; done)
|
||||
+ macaddr=$(printf '%s:' ${macaddr})
|
||||
macaddr=${macaddr%:}
|
||||
# strip hardware type field from pxelinux
|
||||
[ -n "${macaddr%??:??:??:??:??:??}" ] && macaddr=${macaddr#??:}
|
||||
diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh
|
||||
index fa7db27..251d684 100755
|
||||
--- a/modules.d/45ifcfg/write-ifcfg.sh
|
||||
+++ b/modules.d/45ifcfg/write-ifcfg.sh
|
||||
@@ -48,7 +48,7 @@ print_s390() {
|
||||
for i in /sys/class/net/$_netif/device/cdev[0-9]*; do
|
||||
[ -e $i ] || continue
|
||||
channel=$(readlink -f $i)
|
||||
- echo -n "${channel##*/},"
|
||||
+ printf '%s' "${channel##*/},"
|
||||
done
|
||||
})
|
||||
[ -n "$SUBCHANNELS" ] || return 1
|
||||
diff --git a/modules.d/90lvm/lvm_scan.sh b/modules.d/90lvm/lvm_scan.sh
|
||||
index 7495644..ead28aa 100755
|
||||
--- a/modules.d/90lvm/lvm_scan.sh
|
||||
+++ b/modules.d/90lvm/lvm_scan.sh
|
||||
@@ -15,14 +15,14 @@ SNAPSIZE=$(getargs rd.lvm.snapsize -d rd_LVM_SNAPSIZE=)
|
||||
lvmdevs=$(
|
||||
for f in /tmp/.lvm_scan-*; do
|
||||
[ -e "$f" ] || continue
|
||||
- echo -n "${f##/tmp/.lvm_scan-} "
|
||||
+ printf '%s' "${f##/tmp/.lvm_scan-} "
|
||||
done
|
||||
)
|
||||
|
||||
if [ ! -e /etc/lvm/lvm.conf ]; then
|
||||
{
|
||||
echo 'devices {';
|
||||
- echo -n ' filter = [ '
|
||||
+ printf ' filter = [ '
|
||||
for dev in $lvmdevs; do
|
||||
printf '"a|^/dev/%s$|", ' $dev;
|
||||
done;
|
||||
diff --git a/modules.d/95fcoe/fcoe-up.sh b/modules.d/95fcoe/fcoe-up.sh
|
||||
index 43a0ad5..950e4b6 100755
|
||||
--- a/modules.d/95fcoe/fcoe-up.sh
|
||||
+++ b/modules.d/95fcoe/fcoe-up.sh
|
||||
@@ -64,7 +64,7 @@ elif [ "$netdriver" = "bnx2x" ]; then
|
||||
sleep 3
|
||||
fipvlan "$netif" -c -s
|
||||
else
|
||||
- echo -n "$netif" > /sys/module/fcoe/parameters/create
|
||||
+ printf '%s' "$netif" > /sys/module/fcoe/parameters/create
|
||||
fi
|
||||
|
||||
need_shutdown
|
||||
diff --git a/modules.d/98usrmount/mount-usr.sh b/modules.d/98usrmount/mount-usr.sh
|
||||
index c29610f..d1a629c 100755
|
||||
--- a/modules.d/98usrmount/mount-usr.sh
|
||||
+++ b/modules.d/98usrmount/mount-usr.sh
|
||||
@@ -12,7 +12,7 @@ filtersubvol() {
|
||||
while [ $# -gt 0 ]; do
|
||||
case $1 in
|
||||
subvol\=*) :;;
|
||||
- *) echo -n "${1}," ;;
|
||||
+ *) printf '%s' "${1}," ;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
|
||||
index 08110cc..7a3c58c 100755
|
||||
--- a/modules.d/99base/dracut-lib.sh
|
||||
+++ b/modules.d/99base/dracut-lib.sh
|
||||
@@ -298,7 +298,7 @@ _dogetargs() {
|
||||
fi
|
||||
done
|
||||
if [ -n "$_found" ]; then
|
||||
- [ $# -gt 0 ] && echo -n "$@"
|
||||
+ [ $# -gt 0 ] && printf '%s' "$*"
|
||||
return 0
|
||||
fi
|
||||
return 1;
|
||||
@@ -329,9 +329,9 @@ getargs() {
|
||||
done
|
||||
if [ -n "$_gfound" ]; then
|
||||
if [ $# -gt 0 ]; then
|
||||
- echo -n "$@"
|
||||
+ printf '%s' "$*"
|
||||
else
|
||||
- echo -n 1
|
||||
+ printf 1
|
||||
fi
|
||||
debug_on
|
||||
return 0
|
||||
diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh
|
||||
index f96dbb5..a59e8ea 100755
|
||||
--- a/modules.d/99base/init.sh
|
||||
+++ b/modules.d/99base/init.sh
|
||||
@@ -253,7 +253,7 @@ while :; do
|
||||
done
|
||||
|
||||
{
|
||||
- echo -n "Mounted root filesystem "
|
||||
+ printf "Mounted root filesystem "
|
||||
while read dev mp rest || [ -n "$dev" ]; do [ "$mp" = "$NEWROOT" ] && echo $dev; done < /proc/mounts
|
||||
} | vinfo
|
||||
|
||||
diff --git a/test/TEST-10-RAID/create-root.sh b/test/TEST-10-RAID/create-root.sh
|
||||
index a7e56a5..7b5f2a7 100755
|
||||
--- a/test/TEST-10-RAID/create-root.sh
|
||||
+++ b/test/TEST-10-RAID/create-root.sh
|
||||
@@ -18,7 +18,7 @@ mdadm --create /dev/md0 --run --auto=yes --level=5 --raid-devices=3 /dev/sda2 /d
|
||||
# randomly.
|
||||
mdadm -W /dev/md0
|
||||
set -e
|
||||
-echo -n test >keyfile
|
||||
+printf test >keyfile
|
||||
cryptsetup -q luksFormat /dev/md0 /keyfile
|
||||
echo "The passphrase is test"
|
||||
cryptsetup luksOpen /dev/md0 dracut_crypt_test </keyfile
|
||||
diff --git a/test/TEST-10-RAID/cryptroot-ask.sh b/test/TEST-10-RAID/cryptroot-ask.sh
|
||||
index 407d067..c39eff6 100755
|
||||
--- a/test/TEST-10-RAID/cryptroot-ask.sh
|
||||
+++ b/test/TEST-10-RAID/cryptroot-ask.sh
|
||||
@@ -1,5 +1,5 @@
|
||||
#!/bin/sh
|
||||
|
||||
[ -b "/dev/mapper/$2" ] && exit 0
|
||||
-echo -n test >/keyfile
|
||||
+printf test >/keyfile
|
||||
/sbin/cryptsetup luksOpen "$1" "$2" </keyfile
|
||||
diff --git a/test/TEST-12-RAID-DEG/create-root.sh b/test/TEST-12-RAID-DEG/create-root.sh
|
||||
index 7b9a171..3299aa6 100755
|
||||
--- a/test/TEST-12-RAID-DEG/create-root.sh
|
||||
+++ b/test/TEST-12-RAID-DEG/create-root.sh
|
||||
@@ -20,7 +20,7 @@ mdadm --create /dev/md0 --run --auto=yes --level=5 --raid-devices=3 /dev/sdb /de
|
||||
# wait for the array to finish initailizing, otherwise this sometimes fails
|
||||
# randomly.
|
||||
mdadm -W /dev/md0
|
||||
-echo -n test >keyfile
|
||||
+printf test >keyfile
|
||||
cryptsetup -q luksFormat /dev/md0 /keyfile
|
||||
echo "The passphrase is test"
|
||||
set -e
|
||||
diff --git a/test/TEST-12-RAID-DEG/cryptroot-ask.sh b/test/TEST-12-RAID-DEG/cryptroot-ask.sh
|
||||
index db27c5b..78ed7f5 100755
|
||||
--- a/test/TEST-12-RAID-DEG/cryptroot-ask.sh
|
||||
+++ b/test/TEST-12-RAID-DEG/cryptroot-ask.sh
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/bin/sh
|
||||
|
||||
[ -b /dev/mapper/$2 ] && exit 0
|
||||
-echo -n test >/keyfile
|
||||
+printf test >/keyfile
|
||||
/sbin/cryptsetup luksOpen $1 $2 </keyfile
|
||||
|
||||
diff --git a/test/TEST-13-ENC-RAID-LVM/create-root.sh b/test/TEST-13-ENC-RAID-LVM/create-root.sh
|
||||
index e74fe7f..72bc765 100755
|
||||
--- a/test/TEST-13-ENC-RAID-LVM/create-root.sh
|
||||
+++ b/test/TEST-13-ENC-RAID-LVM/create-root.sh
|
||||
@@ -14,7 +14,7 @@ sfdisk /dev/sda <<EOF
|
||||
,25M
|
||||
EOF
|
||||
udevadm settle
|
||||
-echo -n test >keyfile
|
||||
+printf test >keyfile
|
||||
cryptsetup -q luksFormat /dev/sda2 /keyfile
|
||||
cryptsetup -q luksFormat /dev/sda3 /keyfile
|
||||
cryptsetup -q luksFormat /dev/sda4 /keyfile
|
||||
diff --git a/test/TEST-13-ENC-RAID-LVM/cryptroot-ask.sh b/test/TEST-13-ENC-RAID-LVM/cryptroot-ask.sh
|
||||
index db27c5b..78ed7f5 100755
|
||||
--- a/test/TEST-13-ENC-RAID-LVM/cryptroot-ask.sh
|
||||
+++ b/test/TEST-13-ENC-RAID-LVM/cryptroot-ask.sh
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/bin/sh
|
||||
|
||||
[ -b /dev/mapper/$2 ] && exit 0
|
||||
-echo -n test >/keyfile
|
||||
+printf test >/keyfile
|
||||
/sbin/cryptsetup luksOpen $1 $2 </keyfile
|
||||
|
||||
diff --git a/test/TEST-14-IMSM/cryptroot-ask.sh b/test/TEST-14-IMSM/cryptroot-ask.sh
|
||||
index db27c5b..78ed7f5 100755
|
||||
--- a/test/TEST-14-IMSM/cryptroot-ask.sh
|
||||
+++ b/test/TEST-14-IMSM/cryptroot-ask.sh
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/bin/sh
|
||||
|
||||
[ -b /dev/mapper/$2 ] && exit 0
|
||||
-echo -n test >/keyfile
|
||||
+printf test >/keyfile
|
||||
/sbin/cryptsetup luksOpen $1 $2 </keyfile
|
||||
|
||||
diff --git a/test/TEST-20-NFS/client-init.sh b/test/TEST-20-NFS/client-init.sh
|
||||
index 2311981..a443289 100755
|
||||
--- a/test/TEST-20-NFS/client-init.sh
|
||||
+++ b/test/TEST-20-NFS/client-init.sh
|
||||
@@ -8,7 +8,7 @@ strstr() { [ "${1##*"$2"*}" != "$1" ]; }
|
||||
|
||||
stty sane
|
||||
if strstr "$CMDLINE" "rd.shell"; then
|
||||
- [ -c /dev/watchdog ] && echo -n 'V' > /dev/watchdog
|
||||
+ [ -c /dev/watchdog ] && printf 'V' > /dev/watchdog
|
||||
strstr "$(setsid --help)" "control" && CTTY="-c"
|
||||
setsid $CTTY sh -i
|
||||
fi
|
||||
diff --git a/test/TEST-40-NBD/create-root.sh b/test/TEST-40-NBD/create-root.sh
|
||||
index 391279e..20d0eff 100755
|
||||
--- a/test/TEST-40-NBD/create-root.sh
|
||||
+++ b/test/TEST-40-NBD/create-root.sh
|
||||
@@ -5,7 +5,7 @@ for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
|
||||
done
|
||||
rm -f -- /etc/lvm/lvm.conf
|
||||
udevadm control --reload
|
||||
-echo -n test >keyfile
|
||||
+printf test >keyfile
|
||||
cryptsetup -q luksFormat /dev/sdb /keyfile
|
||||
echo "The passphrase is test"
|
||||
cryptsetup luksOpen /dev/sdb dracut_crypt_test </keyfile && \
|
||||
diff --git a/test/TEST-40-NBD/cryptroot-ask.sh b/test/TEST-40-NBD/cryptroot-ask.sh
|
||||
index db27c5b..78ed7f5 100755
|
||||
--- a/test/TEST-40-NBD/cryptroot-ask.sh
|
||||
+++ b/test/TEST-40-NBD/cryptroot-ask.sh
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/bin/sh
|
||||
|
||||
[ -b /dev/mapper/$2 ] && exit 0
|
||||
-echo -n test >/keyfile
|
||||
+printf test >/keyfile
|
||||
/sbin/cryptsetup luksOpen $1 $2 </keyfile
|
||||
|
||||
--
|
||||
2.5.0
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
From 4e17745f9786bfe21d5419c2e0eeff8c5667e747 Mon Sep 17 00:00:00 2001
|
||||
From: Mike Gilbert <floppym@gentoo.org>
|
||||
Date: Tue, 14 Jul 2015 11:12:16 -0400
|
||||
Subject: [PATCH 3/3] syncheck: Look for 'echo -n' usage in modules
|
||||
|
||||
---
|
||||
Makefile | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 0af5d0f..16c6d2a 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -211,7 +211,8 @@ syncheck:
|
||||
[ "$${i##*/}" = "module-setup.sh" ] && continue; \
|
||||
read line < "$$i"; [ "$${line#*bash*}" != "$$line" ] && continue; \
|
||||
[ $$V ] && echo "posix syntax check: $$i"; bash --posix -n "$$i" ; ret=$$(($$ret+$$?)); \
|
||||
- [ $$V ] && echo "checking for [[: $$i"; if grep -Fq '[[ ' "$$i" ; then ret=$$(($$ret+1)); echo "$$i contains [["; fi \
|
||||
+ [ $$V ] && echo "checking for [[: $$i"; if grep -Fq '[[ ' "$$i" ; then ret=$$(($$ret+1)); echo "$$i contains [["; fi; \
|
||||
+ [ $$V ] && echo "checking for echo -n: $$i"; if grep -Fq 'echo -n ' "$$i" ; then ret=$$(($$ret+1)); echo "$$i contains echo -n"; fi \
|
||||
done;exit $$ret
|
||||
@ret=0;for i in *.sh mkinitrd-dracut.sh modules.d/*/*.sh \
|
||||
modules.d/*/module-setup.sh; do \
|
||||
--
|
||||
2.5.0
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
From a18c8fdc9cb3eb917e9a7a30466839c33131cc8a Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Tsoy <alexander@tsoy.me>
|
||||
Date: Tue, 28 Jul 2015 14:55:59 +0300
|
||||
Subject: [PATCH 4/4] dracut-initramfs-restore: make mount error nonfatal
|
||||
|
||||
Script enables errexit option (set -e). So if /boot is not a mount point
|
||||
or is already mounted, then script dies after unsuccessful mount
|
||||
command. Fix this by always returning successful result.
|
||||
---
|
||||
dracut-initramfs-restore.sh | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dracut-initramfs-restore.sh b/dracut-initramfs-restore.sh
|
||||
index 0e6a1a8..0c41a59 100644
|
||||
--- a/dracut-initramfs-restore.sh
|
||||
+++ b/dracut-initramfs-restore.sh
|
||||
@@ -14,7 +14,7 @@ SKIP="$dracutbasedir/skipcpio"
|
||||
|
||||
[[ -f /etc/machine-id ]] && read MACHINE_ID < /etc/machine-id
|
||||
|
||||
-mount -o ro /boot &>/dev/null
|
||||
+mount -o ro /boot &>/dev/null || true
|
||||
|
||||
if [[ $MACHINE_ID ]] && [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]] ; then
|
||||
IMG="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd"
|
||||
--
|
||||
2.5.0
|
||||
|
||||
@ -0,0 +1,32 @@
|
||||
From c41df7e1db1adc51399ab2c22f251b15eb2065b1 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Tsoy <alexander@tsoy.me>
|
||||
Date: Tue, 5 Jan 2016 22:11:57 +0300
|
||||
Subject: [PATCH] base/dracut-lib.sh:dev_unit_name() guard against $dev
|
||||
beginning with "-"
|
||||
|
||||
crypt/parse-crypt.sh generate initqueue job which always call
|
||||
dev_unit_name() with an argument beginning with "-". This results
|
||||
in the following error:
|
||||
|
||||
dracut-initqueue[307]: + systemd-escape -p -cfb4aa43-2f02-4c6b-a313-60ea99288087
|
||||
dracut-initqueue[307]: systemd-escape: invalid option -- 'c'
|
||||
---
|
||||
modules.d/99base/dracut-lib.sh | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
|
||||
index ad03394..0a0b1b9 100755
|
||||
--- a/modules.d/99base/dracut-lib.sh
|
||||
+++ b/modules.d/99base/dracut-lib.sh
|
||||
@@ -874,7 +874,7 @@ dev_unit_name()
|
||||
local dev="$1"
|
||||
|
||||
if command -v systemd-escape >/dev/null; then
|
||||
- systemd-escape -p "$dev"
|
||||
+ systemd-escape -p -- "$dev"
|
||||
return
|
||||
fi
|
||||
|
||||
--
|
||||
2.10.2
|
||||
|
||||
@ -0,0 +1,24 @@
|
||||
From d4efc0aeeecc470d9a267b7f3c130f472488905c Mon Sep 17 00:00:00 2001
|
||||
From: Harald Hoyer <harald@redhat.com>
|
||||
Date: Wed, 25 May 2016 15:06:29 +0200
|
||||
Subject: [PATCH] systemd-initrd: add initrd-root-device.target
|
||||
|
||||
---
|
||||
modules.d/01systemd-initrd/module-setup.sh | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/modules.d/01systemd-initrd/module-setup.sh b/modules.d/01systemd-initrd/module-setup.sh
|
||||
index fb6a9ea..c1ccd2a 100755
|
||||
--- a/modules.d/01systemd-initrd/module-setup.sh
|
||||
+++ b/modules.d/01systemd-initrd/module-setup.sh
|
||||
@@ -28,6 +28,7 @@ install() {
|
||||
inst_multiple -o \
|
||||
$systemdsystemunitdir/initrd.target \
|
||||
$systemdsystemunitdir/initrd-fs.target \
|
||||
+ $systemdsystemunitdir/initrd-root-device.target \
|
||||
$systemdsystemunitdir/initrd-root-fs.target \
|
||||
$systemdsystemunitdir/initrd-switch-root.target \
|
||||
$systemdsystemunitdir/initrd-switch-root.service \
|
||||
--
|
||||
2.10.2
|
||||
|
||||
@ -0,0 +1,23 @@
|
||||
From 69395a528aed99ec04b16c14ebacf4c2e10afd26 Mon Sep 17 00:00:00 2001
|
||||
From: Mike Gilbert <floppym@gentoo.org>
|
||||
Date: Fri, 4 Nov 2016 13:09:28 -0400
|
||||
Subject: [PATCH] 50-dracut.install: use /bin/bash shebang
|
||||
|
||||
This script utilizes several bash-specific constructs.
|
||||
---
|
||||
50-dracut.install | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/50-dracut.install b/50-dracut.install
|
||||
index 7d081d5..54c71d4 100755
|
||||
--- a/50-dracut.install
|
||||
+++ b/50-dracut.install
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/sh
|
||||
+#!/bin/bash
|
||||
|
||||
COMMAND="$1"
|
||||
KERNEL_VERSION="$2"
|
||||
--
|
||||
2.10.2
|
||||
|
||||
45
sdk_container/src/third_party/portage-stable/sys-kernel/dracut/files/045-systemdutildir.patch
vendored
Normal file
45
sdk_container/src/third_party/portage-stable/sys-kernel/dracut/files/045-systemdutildir.patch
vendored
Normal file
@ -0,0 +1,45 @@
|
||||
From ed5cc98864c28eab2c4cb45ec0f67450699aaaa8 Mon Sep 17 00:00:00 2001
|
||||
From: Mike Gilbert <floppym@gentoo.org>
|
||||
Date: Mon, 3 Jul 2017 22:39:42 -0400
|
||||
Subject: [PATCH] dracut.sh: improve udevdir and systemdutildir fallback logic
|
||||
|
||||
Check for a common binary in systemdutildir. This resolves an issue on
|
||||
split-usr systems, where it is common to have both /lib/systemd[/system]
|
||||
and /usr/lib/systemd[/user] present.
|
||||
|
||||
Check for systemd-udevd specifically, since some distros (Gentoo) allow
|
||||
udev to be installed without the rest of the systemd stack.
|
||||
|
||||
Similar logic is applied to udevdir simply for consistency.
|
||||
---
|
||||
dracut.sh | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/dracut.sh b/dracut.sh
|
||||
index 64d94201..67c12a72 100755
|
||||
--- a/dracut.sh
|
||||
+++ b/dracut.sh
|
||||
@@ -1266,16 +1266,16 @@ done
|
||||
[[ -d $udevdir ]] \
|
||||
|| udevdir="$(pkg-config udev --variable=udevdir 2>/dev/null)"
|
||||
if ! [[ -d "$udevdir" ]]; then
|
||||
- [[ ! -h /lib ]] && [[ -d /lib/udev ]] && udevdir=/lib/udev
|
||||
- [[ -d /usr/lib/udev ]] && udevdir=/usr/lib/udev
|
||||
+ [[ -e /lib/udev/collect ]] && udevdir=/lib/udev
|
||||
+ [[ -e /usr/lib/udev/collect ]] && udevdir=/usr/lib/udev
|
||||
fi
|
||||
|
||||
[[ -d $systemdutildir ]] \
|
||||
|| systemdutildir=$(pkg-config systemd --variable=systemdutildir 2>/dev/null)
|
||||
|
||||
if ! [[ -d "$systemdutildir" ]]; then
|
||||
- [[ ! -h /lib ]] && [[ -d /lib/systemd ]] && systemdutildir=/lib/systemd
|
||||
- [[ -d /usr/lib/systemd ]] && systemdutildir=/usr/lib/systemd
|
||||
+ [[ -e /lib/systemd/systemd-udevd ]] && systemdutildir=/lib/systemd
|
||||
+ [[ -e /usr/lib/systemd/systemd-udevd ]] && systemdutildir=/usr/lib/systemd
|
||||
fi
|
||||
|
||||
[[ -d $systemdsystemunitdir ]] \
|
||||
--
|
||||
2.13.2
|
||||
|
||||
80
sdk_container/src/third_party/portage-stable/sys-kernel/dracut/files/dracut-044-bash-4.4.patch
vendored
Normal file
80
sdk_container/src/third_party/portage-stable/sys-kernel/dracut/files/dracut-044-bash-4.4.patch
vendored
Normal file
@ -0,0 +1,80 @@
|
||||
diff -urN dracut-044.orig/modules.d/50drm/module-setup.sh dracut-044/modules.d/50drm/module-setup.sh
|
||||
--- dracut-044.orig/modules.d/50drm/module-setup.sh 2015-11-25 16:22:28.000000000 +0300
|
||||
+++ dracut-044/modules.d/50drm/module-setup.sh 2016-09-28 02:50:08.914967926 +0300
|
||||
@@ -24,9 +24,9 @@
|
||||
local _fname _fcont
|
||||
while read _fname || [ -n "$_fname" ]; do
|
||||
case "$_fname" in
|
||||
- *.ko) _fcont="$(< $_fname)" ;;
|
||||
- *.ko.gz) _fcont="$(gzip -dc $_fname)" ;;
|
||||
- *.ko.xz) _fcont="$(xz -dc $_fname)" ;;
|
||||
+ *.ko) _fcont="$(< $_fname tr -d \\0)" ;;
|
||||
+ *.ko.gz) _fcont="$(gzip -dc $_fname | tr -d \\0)" ;;
|
||||
+ *.ko.xz) _fcont="$(xz -dc $_fname | tr -d \\0)" ;;
|
||||
esac
|
||||
[[ $_fcont =~ $_drm_drivers
|
||||
&& ! $_fcont =~ iw_handler_get_spy ]] \
|
||||
diff -urN dracut-044.orig/modules.d/90kernel-modules/module-setup.sh dracut-044/modules.d/90kernel-modules/module-setup.sh
|
||||
--- dracut-044.orig/modules.d/90kernel-modules/module-setup.sh 2015-11-25 16:22:28.000000000 +0300
|
||||
+++ dracut-044/modules.d/90kernel-modules/module-setup.sh 2016-09-28 02:49:11.725390294 +0300
|
||||
@@ -10,9 +10,9 @@
|
||||
function bmf1() {
|
||||
local _f
|
||||
while read _f || [ -n "$_f" ]; do case "$_f" in
|
||||
- *.ko) [[ $(< $_f) =~ $_blockfuncs ]] && echo "$_f" ;;
|
||||
- *.ko.gz) [[ $(gzip -dc <$_f) =~ $_blockfuncs ]] && echo "$_f" ;;
|
||||
- *.ko.xz) [[ $(xz -dc <$_f) =~ $_blockfuncs ]] && echo "$_f" ;;
|
||||
+ *.ko) [[ $(< $_f tr -d \\0) =~ $_blockfuncs ]] && echo "$_f" ;;
|
||||
+ *.ko.gz) [[ $(gzip -dc <$_f | tr -d \\0) =~ $_blockfuncs ]] && echo "$_f" ;;
|
||||
+ *.ko.xz) [[ $(xz -dc <$_f | tr -d \\0) =~ $_blockfuncs ]] && echo "$_f" ;;
|
||||
esac
|
||||
done
|
||||
return 0
|
||||
diff -urN dracut-044.orig/modules.d/90kernel-network-modules/module-setup.sh dracut-044/modules.d/90kernel-network-modules/module-setup.sh
|
||||
--- dracut-044.orig/modules.d/90kernel-network-modules/module-setup.sh 2015-11-25 16:22:28.000000000 +0300
|
||||
+++ dracut-044/modules.d/90kernel-network-modules/module-setup.sh 2016-09-28 02:51:08.202422231 +0300
|
||||
@@ -26,9 +26,9 @@
|
||||
while read _fname; do
|
||||
[[ $_fname =~ $_unwanted_drivers ]] && continue
|
||||
case "$_fname" in
|
||||
- *.ko) _fcont="$(< $_fname)" ;;
|
||||
- *.ko.gz) _fcont="$(gzip -dc $_fname)" ;;
|
||||
- *.ko.xz) _fcont="$(xz -dc $_fname)" ;;
|
||||
+ *.ko) _fcont="$(< $_fname tr -d \\0)" ;;
|
||||
+ *.ko.gz) _fcont="$(gzip -dc $_fname | tr -d \\0)" ;;
|
||||
+ *.ko.xz) _fcont="$(xz -dc $_fname | tr -d \\0)" ;;
|
||||
esac
|
||||
[[ $_fcont =~ $_net_drivers
|
||||
&& ! $_fcont =~ iw_handler_get_spy ]] \
|
||||
diff -urN dracut-044.orig/modules.d/90multipath/module-setup.sh dracut-044/modules.d/90multipath/module-setup.sh
|
||||
--- dracut-044.orig/modules.d/90multipath/module-setup.sh 2015-11-25 16:22:28.000000000 +0300
|
||||
+++ dracut-044/modules.d/90multipath/module-setup.sh 2016-09-28 02:49:11.726390235 +0300
|
||||
@@ -58,9 +58,9 @@
|
||||
local _f
|
||||
while read _f || [ -n "$_f" ]; do
|
||||
case "$_f" in
|
||||
- *.ko) [[ $(< $_f) =~ $_funcs ]] && echo "$_f" ;;
|
||||
- *.ko.gz) [[ $(gzip -dc <$_f) =~ $_funcs ]] && echo "$_f" ;;
|
||||
- *.ko.xz) [[ $(xz -dc <$_f) =~ $_funcs ]] && echo "$_f" ;;
|
||||
+ *.ko) [[ $(< $_f tr -d \\0) =~ $_funcs ]] && echo "$_f" ;;
|
||||
+ *.ko.gz) [[ $(gzip -dc <$_f | tr -d \\0) =~ $_funcs ]] && echo "$_f" ;;
|
||||
+ *.ko.xz) [[ $(xz -dc <$_f | tr -d \\0) =~ $_funcs ]] && echo "$_f" ;;
|
||||
esac
|
||||
done
|
||||
return 0
|
||||
diff -urN dracut-044.orig/modules.d/95iscsi/module-setup.sh dracut-044/modules.d/95iscsi/module-setup.sh
|
||||
--- dracut-044.orig/modules.d/95iscsi/module-setup.sh 2015-11-25 16:22:28.000000000 +0300
|
||||
+++ dracut-044/modules.d/95iscsi/module-setup.sh 2016-09-28 02:49:11.726390235 +0300
|
||||
@@ -168,9 +168,9 @@
|
||||
local _f
|
||||
while read _f || [ -n "$_f" ]; do
|
||||
case "$_f" in
|
||||
- *.ko) [[ $(< $_f) =~ $_funcs ]] && echo "$_f" ;;
|
||||
- *.ko.gz) [[ $(gzip -dc <$_f) =~ $_funcs ]] && echo "$_f" ;;
|
||||
- *.ko.xz) [[ $(xz -dc <$_f) =~ $_funcs ]] && echo "$_f" ;;
|
||||
+ *.ko) [[ $(< $_f tr -d \\0) =~ $_funcs ]] && echo "$_f" ;;
|
||||
+ *.ko.gz) [[ $(gzip -dc <$_f | tr -d \\0) =~ $_funcs ]] && echo "$_f" ;;
|
||||
+ *.ko.xz) [[ $(xz -dc <$_f | tr -d \\0) =~ $_funcs ]] && echo "$_f" ;;
|
||||
esac
|
||||
done
|
||||
return 0
|
||||
@ -0,0 +1,51 @@
|
||||
From 61c761bc2c35fb244d46fbbde97161f5927071dc Mon Sep 17 00:00:00 2001
|
||||
From: Stefan Berger <stefanb@us.ibm.com>
|
||||
Date: Tue, 25 Oct 2016 15:09:49 -0400
|
||||
Subject: [PATCH] dracut-install: preserve extended attributes when copying
|
||||
files
|
||||
|
||||
Preserve extended attributes when copying files using dracut-install.
|
||||
|
||||
The copying of extended attributes avoids file execution denials when
|
||||
the Linux Integrity Measurement's Appraisal mode is active. In that mode
|
||||
executables need their file signatures copied. In particular, this patch
|
||||
solves the problem that dependent libaries are not included in the
|
||||
initramfs since the copied programs could not be executed due to missing
|
||||
signatures. The following audit record shows the type of failure that
|
||||
is now prevented:
|
||||
|
||||
type=INTEGRITY_DATA msg=audit(1477409025.492:30065): pid=922 uid=0
|
||||
auid=4294967295 ses=4294967295
|
||||
subj=unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c1023
|
||||
op="appraise_data" cause="IMA-signature-required"
|
||||
comm="ld-linux-x86-64"
|
||||
name="/var/tmp/dracut.R6ySa4/initramfs/usr/bin/journalctl"
|
||||
dev="dm-0" ino=37136 res=0
|
||||
|
||||
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
|
||||
---
|
||||
install/dracut-install.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/install/dracut-install.c b/install/dracut-install.c
|
||||
index fe30bba..c0f1c17 100644
|
||||
--- a/install/dracut-install.c
|
||||
+++ b/install/dracut-install.c
|
||||
@@ -294,7 +294,7 @@ static int cp(const char *src, const char *dst)
|
||||
normal_copy:
|
||||
pid = fork();
|
||||
if (pid == 0) {
|
||||
- execlp("cp", "cp", "--reflink=auto", "--sparse=auto", "--preserve=mode,timestamps", "-fL", src, dst,
|
||||
+ execlp("cp", "cp", "--reflink=auto", "--sparse=auto", "--preserve=mode,timestamps,xattr", "-fL", src, dst,
|
||||
NULL);
|
||||
_exit(EXIT_FAILURE);
|
||||
}
|
||||
@@ -302,7 +302,7 @@ static int cp(const char *src, const char *dst)
|
||||
while (waitpid(pid, &ret, 0) < 0) {
|
||||
if (errno != EINTR) {
|
||||
ret = -1;
|
||||
- log_error("Failed: cp --reflink=auto --sparse=auto --preserve=mode,timestamps -fL %s %s", src,
|
||||
+ log_error("Failed: cp --reflink=auto --sparse=auto --preserve=mode,timestamps,xattr -fL %s %s", src,
|
||||
dst);
|
||||
break;
|
||||
}
|
||||
@ -13,14 +13,13 @@
|
||||
<email>aidecoe@gentoo.org</email>
|
||||
<name>Amadeusz Żołnowski</name>
|
||||
</maintainer>
|
||||
<maintainer type="person">
|
||||
<email>floppym@gentoo.org</email>
|
||||
<name>Mike Gilbert</name>
|
||||
</maintainer>
|
||||
<use>
|
||||
<flag name="debug">Module installing additional tools like strace, file
|
||||
editor, ssh and more</flag>
|
||||
<flag name="device-mapper">Set of helper modules providing support for
|
||||
device mapper. You need to enable this only if emerge says
|
||||
so.</flag>
|
||||
<flag name="net">Set of helper modules providing networking support. You
|
||||
need to enable this only if emerge says so.</flag>
|
||||
</use>
|
||||
<longdescription lang="en">
|
||||
Generic, modular initramfs generation tool that can be used across various
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user