From 95e8d4e249681ac94eae64d889b6082c6cedf5c8 Mon Sep 17 00:00:00 2001 From: Amadeusz Żołnowski Date: Tue, 2 Apr 2013 12:22:29 +0000 Subject: Version bump. Dracut 027 depends on virtual/udev now and no longer needs CONFIG_MODULES in kernel. Following changes relates to systemd module only: - at least systemd-199 is required - systemd-bootchart module replaces bootchart module - selinux module is removed if systemd module is installed, because systemd handles selinux setup; the same is for securityfs NEWS ~~~~ (from announcement on mailing list) dracut-027 ========== - dracut now has bash-completion - require bash version 4 - systemd module now requires systemd >= 199 - dracut makes use of native systemd initrd units - added hooks for new-kernel-pkg and kernel-install - hostonly is now default for fedora - comply with the BootLoaderSpec paths http://www.freedesktop.org/wiki/Specifications/BootLoaderSpec - added rescue module - host_fs_types is now a hashmap - new dracut argument "--regenerate-all" - new dracut argument "--noimageifnotneeded" - new man page dracut.bootup - install all host filesystem drivers - use -D_FILE_OFFSET_BITS=64 to build dracut-install Package-Manager: portage-2.1.11.59/cvs/Linux x86_64 Manifest-Sign-Key: 0xF0134531E1DBFAB5 --- .../dracut/files/027-0000-fix-version-print.patch | 13 ++++++++ ...01-dracut-functions.sh-support-for-altern.patch | 37 ++++++++++++++++++++++ ...02-gentoo.conf-let-udevdir-be-handled-by-.patch | 30 ++++++++++++++++++ 3 files changed, 80 insertions(+) create mode 100644 sys-kernel/dracut/files/027-0000-fix-version-print.patch create mode 100644 sys-kernel/dracut/files/027-0001-dracut-functions.sh-support-for-altern.patch create mode 100644 sys-kernel/dracut/files/027-0002-gentoo.conf-let-udevdir-be-handled-by-.patch (limited to 'sys-kernel/dracut/files') diff --git a/sys-kernel/dracut/files/027-0000-fix-version-print.patch b/sys-kernel/dracut/files/027-0000-fix-version-print.patch new file mode 100644 index 000000000000..3607fb24552c --- /dev/null +++ b/sys-kernel/dracut/files/027-0000-fix-version-print.patch @@ -0,0 +1,13 @@ +diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh +index b441a27..410201a 100755 +--- a/modules.d/99base/init.sh ++++ b/modules.d/99base/init.sh +@@ -104,7 +104,7 @@ else + fi + + [ -f /etc/initrd-release ] && . /etc/initrd-release +-[ -n "$VERSION" ] && info "dracut-$VERSION" ++[ -n "$VERSION_ID" ] && info "$NAME-$VERSION_ID" + + source_conf /etc/conf.d + diff --git a/sys-kernel/dracut/files/027-0001-dracut-functions.sh-support-for-altern.patch b/sys-kernel/dracut/files/027-0001-dracut-functions.sh-support-for-altern.patch new file mode 100644 index 000000000000..ca079ad40d65 --- /dev/null +++ b/sys-kernel/dracut/files/027-0001-dracut-functions.sh-support-for-altern.patch @@ -0,0 +1,37 @@ +From 3688462730a97d4cc5644dab87aadf147d8c72f0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= +Date: Sun, 6 Jan 2013 13:35:01 +0100 +Subject: [PATCH 1/2] 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 . +--- + dracut-functions.sh | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/dracut-functions.sh b/dracut-functions.sh +index eba7412..d888f4c 100755 +--- a/dracut-functions.sh ++++ b/dracut-functions.sh +@@ -961,6 +961,15 @@ inst_rules() { + inst_dir "$_target" + for _rule in "$@"; do + if [ "${_rule#/}" = "$_rule" ]; then ++ for r in ${udevaltdirs}; do ++ [[ "$r" = "${udevdir}" ]] && continue ++ if [[ -f $r/rules.d/$_rule ]]; then ++ _found="$r/rules.d/$_rule" ++ inst_rule_programs "$_found" ++ inst_rule_group_owner "$_found" ++ inst_simple "$_found" "${udevdir}/rules.d/${_found##*/}" ++ fi ++ done + for r in ${udevdir}/rules.d /etc/udev/rules.d; do + if [[ -f $r/$_rule ]]; then + _found="$r/$_rule" +-- +1.8.1.5 + diff --git a/sys-kernel/dracut/files/027-0002-gentoo.conf-let-udevdir-be-handled-by-.patch b/sys-kernel/dracut/files/027-0002-gentoo.conf-let-udevdir-be-handled-by-.patch new file mode 100644 index 000000000000..d110afa83966 --- /dev/null +++ b/sys-kernel/dracut/files/027-0002-gentoo.conf-let-udevdir-be-handled-by-.patch @@ -0,0 +1,30 @@ +From 624a97d4e2b548889b5f758ed6a908a1495b44be Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= +Date: Sun, 16 Dec 2012 20:02:48 +0100 +Subject: [PATCH 2/2] 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 1361a30..b78e5c6 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.1.5 + -- cgit v1.2.3-65-gdbad