aidecoe 14/07/18 07:54:18
Added:
038-0001-dracut-functions.sh-support-for-altern.patch
038-0005-modsign-do-not-hardcode-path-to-keyctl.patch
038-0004-Install-dracut-install-into-libexec-di.patch
038-0002-gentoo.conf-let-udevdir-be-handled-by-.patch
038-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch
Log:
Version bump.
NEWS
~~~~
- "rd.cmdline=ask" will ask the user on the console to enter additional
kernel command line parameters
- "rd.hostonly=0" removes all "hostonly" added custom files, which is useful
in combination with "rd.auto" or other specific parameters, if you want to
boot on the same hardware, but the compiled in configuration does not match
your setup anymore
- inst* functions and dracut-install now accept the "-H" flag, which logs all
installed files to /lib/dracut/hostonly-files. This is used to remove those
files, if rd.hostonly is given on the kernel command line
- strstr now only does literal string match, please use strglob and strglobin
for globs
- fixed unpacking of the microcode image on shutdown
- added systemd-gpt-auto-generator
- fcoe: wait for lldpad to be ready
- network: handle "ip=dhcp6"
- network: DCHPv6: set valid_lft and preferred_lft
- dm: support dm-cache
- fstab: do not mount and fsck from fstab if using systemd
- break at switch_root only for bare rd.break and not for any rd.break=...
- nbd: make use of "--systemd-mark", otherwise it gets killed on switch_root
- fcoe-uefi: fixed cmdline parameter generation
- iscsi: deprecate "ip=ibft", use "rd.iscsi.ibft[=1]" from now on
- "lsinitrd -m" now only lists the dracut modules of the image
- a lot of small bugfixes
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key
F0134531E1DBFAB5)
Revision Changes Path
1.1
sys-kernel/dracut/files/038-0001-dracut-functions.sh-support-for-altern.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/038-0001-dracut-functions.sh-support-for-altern.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/038-0001-dracut-functions.sh-support-for-altern.patch?rev=1.1&content-type=text/plain
Index: 038-0001-dracut-functions.sh-support-for-altern.patch
===================================================================
>From 5ade0eafee011a55c408ab315c33e7fb76220ce7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <[email protected]>
Date: Sun, 6 Jan 2013 13:35:01 +0100
Subject: [PATCH 1/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 <[email protected]>.
Conflicts:
dracut-functions.sh
---
dracut-functions.sh | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/dracut-functions.sh b/dracut-functions.sh
index d30e835..70444b8 100755
--- a/dracut-functions.sh
+++ b/dracut-functions.sh
@@ -928,6 +928,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.0.0
1.1
sys-kernel/dracut/files/038-0005-modsign-do-not-hardcode-path-to-keyctl.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/038-0005-modsign-do-not-hardcode-path-to-keyctl.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/038-0005-modsign-do-not-hardcode-path-to-keyctl.patch?rev=1.1&content-type=text/plain
Index: 038-0005-modsign-do-not-hardcode-path-to-keyctl.patch
===================================================================
>From 461a523086f2077908bebda6467e6b6d20caba78 Mon Sep 17 00:00:00 2001
From: Alexander Tsoy <[email protected]>
Date: Mon, 31 Mar 2014 17:56:13 +0400
Subject: [PATCH 5/5] modsign: do not hardcode path to keyctl
https://bugs.gentoo.org/show_bug.cgi?id=506094
---
modules.d/03modsign/module-setup.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules.d/03modsign/module-setup.sh
b/modules.d/03modsign/module-setup.sh
index 09285d3..cc0e241 100755
--- a/modules.d/03modsign/module-setup.sh
+++ b/modules.d/03modsign/module-setup.sh
@@ -29,7 +29,7 @@ depends() {
# called by dracut
install() {
inst_dir /lib/modules/keys
- inst_binary /usr/bin/keyctl
+ inst_binary keyctl
inst_hook pre-trigger 01 "$moddir/load-modsign-keys.sh"
--
2.0.0
1.1
sys-kernel/dracut/files/038-0004-Install-dracut-install-into-libexec-di.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/038-0004-Install-dracut-install-into-libexec-di.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/038-0004-Install-dracut-install-into-libexec-di.patch?rev=1.1&content-type=text/plain
Index: 038-0004-Install-dracut-install-into-libexec-di.patch
===================================================================
>From bd2d9c293c93701944b164da6a616febc35a5db7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <[email protected]>
Date: Wed, 2 Oct 2013 22:40:43 +0200
Subject: [PATCH 4/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 842f6b1..1872896 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 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 70444b8..aa0949d 100755
--- a/dracut-functions.sh
+++ b/dracut-functions.sh
@@ -744,6 +744,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 3764d3d..cfb2c33 100755
--- a/dracut.sh
+++ b/dracut.sh
@@ -27,6 +27,7 @@
dracut_args=( "$@" )
# base dirs
+libexecdir=/usr/libexec
pkglibdir=/usr/lib/dracut
dracutbasedir="$pkglibdir"
--
2.0.0
1.1
sys-kernel/dracut/files/038-0002-gentoo.conf-let-udevdir-be-handled-by-.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/038-0002-gentoo.conf-let-udevdir-be-handled-by-.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/038-0002-gentoo.conf-let-udevdir-be-handled-by-.patch?rev=1.1&content-type=text/plain
Index: 038-0002-gentoo.conf-let-udevdir-be-handled-by-.patch
===================================================================
>From 0c135381d80a391bc57e07b60204ef4699287891 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <[email protected]>
Date: Sun, 16 Dec 2012 20:02:48 +0100
Subject: [PATCH 2/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
#
--
2.0.0
1.1
sys-kernel/dracut/files/038-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/038-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/038-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch?rev=1.1&content-type=text/plain
Index: 038-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch
===================================================================
>From 5825d40138f3738a8b70559af6f6f16927068959 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <[email protected]>
Date: Wed, 2 Oct 2013 22:37:09 +0200
Subject: [PATCH 3/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 7383309..842f6b1 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 c6da411..3764d3d 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
@@ -652,8 +654,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
@@ -774,7 +774,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.0.0
