* [gentoo-commits] gentoo-x86 commit in sys-kernel/dracut/files: 025-0005-Mount-proc-before-including-dracut-lib.patch 025-0001-dracut-functions.sh-support-for-altern.patch 025-0003-rootfs-block-mount-root.sh-fixup-for-8.patch 025-0004-dracut.sh-reverting-return-value-chang.patch 025-0002-gentoo.conf-let-udevdir-be-handled-by-.patch
@ 2013-03-09 20:06 Amadeusz Zolnowski (aidecoe)
0 siblings, 0 replies; only message in thread
From: Amadeusz Zolnowski (aidecoe) @ 2013-03-09 20:06 UTC (permalink / raw
To: gentoo-commits
aidecoe 13/03/09 20:06:40
Added:
025-0005-Mount-proc-before-including-dracut-lib.patch
025-0001-dracut-functions.sh-support-for-altern.patch
025-0003-rootfs-block-mount-root.sh-fixup-for-8.patch
025-0004-dracut.sh-reverting-return-value-chang.patch
025-0002-gentoo.conf-let-udevdir-be-handled-by-.patch
Log:
Version bump.
NEWS
~~~~
- do not strip signed kernel modules
- add sosreport script and generate /run/initramfs/sosreport.txt
- make short uuid specification for allow-discards work
- turn off RateLimit for the systemd journal
- fixed MAC address assignment
- add systemd checkisomd5 service
- splitout drm kernel modules from plymouth module
- add 'swapoff' to initramfs to fix shutdown/reboot
- add team device support
- add pre-shutdown hook
- kill all processes in shutdown and report remaining ones
- "--device" changed to "--add-device" and "add_device=" added for conf files
- add memory usage trace to different hook points
- cope with optional field #7 in /proc/self/mountinfo
- lots of small bugfixes
(Portage version: 2.1.11.52/cvs/Linux x86_64, signed Manifest commit with key F0134531E1DBFAB5)
Revision Changes Path
1.1 sys-kernel/dracut/files/025-0005-Mount-proc-before-including-dracut-lib.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/025-0005-Mount-proc-before-including-dracut-lib.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/025-0005-Mount-proc-before-including-dracut-lib.patch?rev=1.1&content-type=text/plain
Index: 025-0005-Mount-proc-before-including-dracut-lib.patch
===================================================================
From 8ad40b5d5f3f036f38eb328cb35e8d0f8a1b3df2 Mon Sep 17 00:00:00 2001
From: Colin Guthrie <colin@mageia.org>
Date: Sat, 26 Jan 2013 18:13:28 +0000
Subject: [PATCH 5/5] Mount /proc before including dracut-lib.sh.
When dracut-lib.sh is sourced it checks the command line (when not using systemd)
as part of the check_quiet() call.
Therefore mount /proc earlier in init.
Avoids the error:
init: 77: /lib/dracut-lib.sh: /proc/cmdline: No such file or directory
---
modules.d/99base/init.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh
index 0259053..37b5996 100755
--- a/modules.d/99base/init.sh
+++ b/modules.d/99base/init.sh
@@ -17,9 +17,6 @@ OLDPATH=$PATH
PATH=/usr/sbin:/usr/bin:/sbin:/bin
export PATH
-RD_DEBUG=""
-. /lib/dracut-lib.sh
-
# mount some important things
[ ! -d /proc/self ] && \
mount -t proc -o nosuid,noexec,nodev proc /proc >/dev/null
@@ -37,6 +34,9 @@ if [ "$?" != "0" ]; then
exit 1
fi
+RD_DEBUG=""
+. /lib/dracut-lib.sh
+
if [ -x /lib/systemd/systemd-timestamp ]; then
RD_TIMESTAMP=$(/lib/systemd/systemd-timestamp)
else
--
1.8.1.4
1.1 sys-kernel/dracut/files/025-0001-dracut-functions.sh-support-for-altern.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/025-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/025-0001-dracut-functions.sh-support-for-altern.patch?rev=1.1&content-type=text/plain
Index: 025-0001-dracut-functions.sh-support-for-altern.patch
===================================================================
From fcb28882b1eaaa20ad9d831857ecf176dd0e3006 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/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>.
---
dracut-functions.sh | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/dracut-functions.sh b/dracut-functions.sh
index e23db76..812ea2b 100755
--- a/dracut-functions.sh
+++ b/dracut-functions.sh
@@ -941,6 +941,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.4
1.1 sys-kernel/dracut/files/025-0003-rootfs-block-mount-root.sh-fixup-for-8.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/025-0003-rootfs-block-mount-root.sh-fixup-for-8.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/025-0003-rootfs-block-mount-root.sh-fixup-for-8.patch?rev=1.1&content-type=text/plain
Index: 025-0003-rootfs-block-mount-root.sh-fixup-for-8.patch
===================================================================
From 6cf23a82629409c25d5d36ca71a02171075705ab Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Wed, 23 Jan 2013 16:23:07 +0100
Subject: [PATCH 3/5] rootfs-block/mount-root.sh: fixup for 8b6bf0ef5
not only fix the warning message, but the real mount arguments, too
---
modules.d/95rootfs-block/mount-root.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/modules.d/95rootfs-block/mount-root.sh b/modules.d/95rootfs-block/mount-root.sh
index 54d5012..c7626c3 100755
--- a/modules.d/95rootfs-block/mount-root.sh
+++ b/modules.d/95rootfs-block/mount-root.sh
@@ -26,9 +26,10 @@ mount_root() {
fi
_rflags_ro="$rflags,ro"
+ _rflags_ro="${_rflags_ro##,}"
while ! mount -t ${rootfs} -o "$_rflags_ro" "${root#block:}" "$NEWROOT"; do
- warn "Failed to mount -t ${rootfs} -o ${_rflags_ro##,} ${root#block:} $NEWROOT"
+ warn "Failed to mount -t ${rootfs} -o $_rflags_ro ${root#block:} $NEWROOT"
fsck_ask_err
done
--
1.8.1.4
1.1 sys-kernel/dracut/files/025-0004-dracut.sh-reverting-return-value-chang.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/025-0004-dracut.sh-reverting-return-value-chang.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/025-0004-dracut.sh-reverting-return-value-chang.patch?rev=1.1&content-type=text/plain
Index: 025-0004-dracut.sh-reverting-return-value-chang.patch
===================================================================
From 826b11e8adea942a7fb63fa54374d5571aab0930 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Tue, 5 Feb 2013 16:45:42 +0100
Subject: [PATCH 4/5] dracut.sh: reverting return value change
reverting _get_fs_type() return values of patch
c8d685c9d3860e49f39a9c85ffebbb4c4fec341f
---
dracut.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/dracut.sh b/dracut.sh
index cfd10a1..23ffaa4 100755
--- a/dracut.sh
+++ b/dracut.sh
@@ -766,18 +766,18 @@ if [[ $hostonly ]]; then
fi
_get_fs_type() (
- [[ $1 ]] || return 1
+ [[ $1 ]] || return
if [[ -b $1 ]] && get_fs_env $1; then
echo "$(readlink -f $1)|$ID_FS_TYPE"
- return 0
+ return 1
fi
if [[ -b /dev/block/$1 ]] && get_fs_env /dev/block/$1; then
echo "$(readlink -f /dev/block/$1)|$ID_FS_TYPE"
- return 0
+ return 1
fi
if fstype=$(find_dev_fstype $1); then
echo "$1|$fstype"
- return 0
+ return 1
fi
return 1
)
--
1.8.1.4
1.1 sys-kernel/dracut/files/025-0002-gentoo.conf-let-udevdir-be-handled-by-.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/025-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/025-0002-gentoo.conf-let-udevdir-be-handled-by-.patch?rev=1.1&content-type=text/plain
Index: 025-0002-gentoo.conf-let-udevdir-be-handled-by-.patch
===================================================================
From 1f8ab99eca988b15e9573155dd6207cc82842aff 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/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 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.4
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2013-03-09 20:06 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-09 20:06 [gentoo-commits] gentoo-x86 commit in sys-kernel/dracut/files: 025-0005-Mount-proc-before-including-dracut-lib.patch 025-0001-dracut-functions.sh-support-for-altern.patch 025-0003-rootfs-block-mount-root.sh-fixup-for-8.patch 025-0004-dracut.sh-reverting-return-value-chang.patch 025-0002-gentoo.conf-let-udevdir-be-handled-by-.patch Amadeusz Zolnowski (aidecoe)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox