Hi,
Here are some patches, some that were used as patches in the mandriva builds,
and a first one from me, to fix nfs hostonly on chrooted installs.
Kind regards,
Maarten Vanraes
From 25419eb164e842499d391bb396f71ddede9ad0ed Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <arvidjaar@xxxxxxx>
Date: Wed, 14 Jul 2010 01:30:16 +0200
Subject: [PATCH 1/3] conffile before confdir
conffile should be sourced before confdir
Signed-off-by: Maarten Vanraes <maarten.vanraes@xxxxxxxxx>
---
dracut | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dracut b/dracut
index 6b590f5..d21736b 100755
--- a/dracut
+++ b/dracut
@@ -130,6 +130,9 @@ if [[ ! -d $confdir ]]; then
[[ $allowlocal ]] && confdir="$dracutbasedir/dracut.conf.d"
fi
+# source our config file
+[[ -f $conffile ]] && . "$conffile"
+
# source our config dir
if [ "$confdir" ] && [ -d "$confdir" ]; then
for f in "$confdir"/*.conf; do
@@ -137,9 +140,6 @@ if [ "$confdir" ] && [ -d "$confdir" ]; then
done
fi
-# source our config file
-[[ -f $conffile ]] && . "$conffile"
-
# these optins add to the stuff in the config file
[[ $add_dracutmodules_l ]] && add_dracutmodules+=" $add_dracutmodules_l"
[[ $add_drivers_l ]] && add_drivers+=" $add_drivers_l"
--
1.6.4.4
From 325eac162cb35d76e50633796b086ab3a0dcd475 Mon Sep 17 00:00:00 2001
From: Frederic Crozat <fcrozat@xxxxxxxxxxxx>
Date: Wed, 14 Jul 2010 01:50:55 +0200
Subject: [PATCH 2/3] bootchartd support
add preliminary bootchard support
Signed-off-by: Maarten Vanraes <maarten.vanraes@xxxxxxxxx>
---
modules.d/00bootchartd/check | 2 ++
modules.d/00bootchartd/install | 15 +++++++++++++++
2 files changed, 17 insertions(+), 0 deletions(-)
create mode 100644 modules.d/00bootchartd/check
create mode 100644 modules.d/00bootchartd/install
diff --git a/modules.d/00bootchartd/check b/modules.d/00bootchartd/check
new file mode 100644
index 0000000..b691465
--- /dev/null
+++ b/modules.d/00bootchartd/check
@@ -0,0 +1,2 @@
+#!/bin/sh
+[ -x /sbin/bootchartd ]
diff --git a/modules.d/00bootchartd/install b/modules.d/00bootchartd/install
new file mode 100644
index 0000000..ff29de0
--- /dev/null
+++ b/modules.d/00bootchartd/install
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+inst /sbin/bootchartd
+inst /bin/bash
+ln -s /init "${initdir}/sbin/init"
+mkdir -p /lib/bootchart/
+inst /lib/bootchart/bootchart-collector
+inst /etc/bootchartd.conf
+inst /sbin/accton
+inst /usr/bin/pkill /bin/pkill
+inst /bin/echo
+inst /bin/grep
+inst /bin/usleep
+inst /usr/bin/[ /bin/[
+mknod -m 0666 "${initdir}/dev/null" c 1 3
--
1.6.4.4
From 4a364127faed338ac74e169a077373bd28eb3b41 Mon Sep 17 00:00:00 2001
From: Maarten Vanraes <maarten.vanraes@xxxxxxxxx>
Date: Wed, 14 Jul 2010 01:57:19 +0200
Subject: [PATCH 3/3] fix hostonly check
this bugfix fixes chrooted hostonly check by checking fstab instead of
mount
Signed-off-by: Maarten Vanraes <maarten.vanraes@xxxxxxxxx>
---
modules.d/95nfs/check | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/modules.d/95nfs/check b/modules.d/95nfs/check
index f72aaae..3dad486 100755
--- a/modules.d/95nfs/check
+++ b/modules.d/95nfs/check
@@ -4,7 +4,7 @@
# If hostonly was requested, fail the check if we are not actually
# booting from root.
-[ "$1" = "-h" ] && ! egrep -q '/ nfs[34 ]' /proc/mounts && exit 1
+[ "$1" = "-h" ] && ! egrep -q '\s/\s+nfs[34]?\s' /etc/fstab && exit 1
# If our prerequisites are not met, fail anyways.
which rpcbind >/dev/null 2>&1 || which portmap >/dev/null 2>&1 || exit 1
--
1.6.4.4
