patches

patches

[Maarten Vanraes]

[-- Attachment #1: Type: Text/Plain, Size: 183 bytes --]

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

[-- Attachment #2: 0001-conffile-before-confdir.patch --]
[-- Type: text/x-patch, Size: 1188 bytes --]

From 25419eb164e842499d391bb396f71ddede9ad0ed Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <arvidjaar-JGs/UdohzUI@public.gmane.org>
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-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
 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


[-- Attachment #3: 0002-bootchartd-support.patch --]
[-- Type: text/x-patch, Size: 1425 bytes --]

From 325eac162cb35d76e50633796b086ab3a0dcd475 Mon Sep 17 00:00:00 2001
From: Frederic Crozat <fcrozat-4qZELD6FgxhWk0Htik3J/w@public.gmane.org>
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-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
 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


[-- Attachment #4: 0003-fix-hostonly-check.patch --]
[-- Type: text/x-patch, Size: 1045 bytes --]

From 4a364127faed338ac74e169a077373bd28eb3b41 Mon Sep 17 00:00:00 2001
From: Maarten Vanraes <maarten.vanraes-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
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-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
 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

Re: patches

[Harald Hoyer]

On 07/14/2010 02:05 AM, Maarten Vanraes wrote:
> 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

-[ "$1" = "-h" ] && ! egrep -q '/ nfs[34 ]' /proc/mounts && exit 1
+[ "$1" = "-h" ] && ! egrep -q '\s/\s+nfs[34]?\s' /etc/fstab && exit 1

Hmm, I think "hostonly" should be really "hostonly", so the check is valid.

You can always force the addition of nfs, if you are building a special image 
for an NFS client. Or just boot with the generic (non-hostonly) one, and build 
the hostonly one on the client.

Re: patches

[Harald Hoyer]

On 07/14/2010 02:05 AM, Maarten Vanraes wrote:
> 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

Pushed the conffile patch and the bootchartd patch, but I disabled bootchartd by 
default.
Users can always add "-a bootchartd" on image creation or add it to 
/etc/dracut.conf.d/myconf.conf.

Re: patches

[Maarten Vanraes]

Op woensdag 21 juli 2010 13:41:04 schreef Harald Hoyer:
> On 07/14/2010 02:05 AM, Maarten Vanraes wrote:
> > 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
> 
> Pushed the conffile patch and the bootchartd patch, but I disabled
>  bootchartd by default.
> Users can always add "-a bootchartd" on image creation or add it to
> /etc/dracut.conf.d/myconf.conf.
> 

well, i think the bootchartd one only works if you have bootchartd? or am i 
mistaken?

in any case i'm fine with it. those patches come from the Mandriva tree, and 
the less patches need to be maintained, the better.

Re: patches

[Harald Hoyer]

On 07/21/2010 05:03 PM, Maarten Vanraes wrote:
> Op woensdag 21 juli 2010 13:41:04 schreef Harald Hoyer:
>> On 07/14/2010 02:05 AM, Maarten Vanraes wrote:
>>> 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
>>
>> Pushed the conffile patch and the bootchartd patch, but I disabled
>>   bootchartd by default.
>> Users can always add "-a bootchartd" on image creation or add it to
>> /etc/dracut.conf.d/myconf.conf.
>>
>
> well, i think the bootchartd one only works if you have bootchartd? or am i
> mistaken?

Sure, but even if you have bootchartd installed, you might not want it.

>
> in any case i'm fine with it. those patches come from the Mandriva tree, and
> the less patches need to be maintained, the better.

Re: patches

[Maarten Vanraes]

Op woensdag 21 juli 2010 13:33:05 schreef Harald Hoyer:
> On 07/14/2010 02:05 AM, Maarten Vanraes wrote:
> > 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
> 
> -[ "$1" = "-h" ] && ! egrep -q '/ nfs[34 ]' /proc/mounts && exit 1
> +[ "$1" = "-h" ] && ! egrep -q '\s/\s+nfs[34]?\s' /etc/fstab && exit 1
> 
> Hmm, I think "hostonly" should be really "hostonly", so the check is valid.
> 
> You can always force the addition of nfs, if you are building a special
>  image for an NFS client. Or just boot with the generic (non-hostonly) one,
>  and build the hostonly one on the client.
> 

i see what you mean, but i beg to differ.

this thing is not really about nfs, it's about building an initrd on a chroot.

if you're building initrd on a chroot, it's always a hostonly, in fact, only 
distros ship generic initrds. and even that's not always true.

this fix has no consequences whatsoever in any case, except that it checks 
fstab instead of /proc/mounts. which means if you adjust your fstab, because 
you're going to run it elsewhere.

I was planning on checking everywhere and trying to reduce the dependencies on 
/proc and /sys, IF it works the same everywhere without any consequences (just 
like this here).

Also, if you look at it; not having / mounted as an nfs WILL disable the use 
of this module entirely and thus all the root=nfs stuff will fail.

What do you think?

Re: patches

[Maarten Vanraes]

Op woensdag 21 juli 2010 17:13:49 schreef Harald Hoyer:
> On 07/21/2010 05:03 PM, Maarten Vanraes wrote:
> > Op woensdag 21 juli 2010 13:41:04 schreef Harald Hoyer:
> >> On 07/14/2010 02:05 AM, Maarten Vanraes wrote:
> >>> 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
> >>
> >> Pushed the conffile patch and the bootchartd patch, but I disabled
> >>   bootchartd by default.
> >> Users can always add "-a bootchartd" on image creation or add it to
> >> /etc/dracut.conf.d/myconf.conf.
> >
> > well, i think the bootchartd one only works if you have bootchartd? or am
> > i mistaken?
> 
> Sure, but even if you have bootchartd installed, you might not want it.

well, imo, by default NO modules should be selected (in the future); and 
generic would make it use all, while hostonly would detect only those you 
have. but that's for the future anyway.
 
> > in any case i'm fine with it. those patches come from the Mandriva tree,
> > and the less patches need to be maintained, the better.
> 

Re: patches

[Maarten Vanraes]

Op woensdag 21 juli 2010 17:18:28 schreef Maarten Vanraes:
> Op woensdag 21 juli 2010 13:33:05 schreef Harald Hoyer:
> > On 07/14/2010 02:05 AM, Maarten Vanraes wrote:
> > > 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
> >
> > -[ "$1" = "-h" ] && ! egrep -q '/ nfs[34 ]' /proc/mounts && exit 1
> > +[ "$1" = "-h" ] && ! egrep -q '\s/\s+nfs[34]?\s' /etc/fstab && exit 1
> >
> > Hmm, I think "hostonly" should be really "hostonly", so the check is
> > valid.
> >
> > You can always force the addition of nfs, if you are building a special
> >  image for an NFS client. Or just boot with the generic (non-hostonly)
> > one, and build the hostonly one on the client.
> 
> i see what you mean, but i beg to differ.
> 
> this thing is not really about nfs, it's about building an initrd on a
>  chroot.
> 
> if you're building initrd on a chroot, it's always a hostonly, in fact,
>  only distros ship generic initrds. and even that's not always true.
> 
> this fix has no consequences whatsoever in any case, except that it checks
> fstab instead of /proc/mounts. which means if you adjust your fstab,
>  because you're going to run it elsewhere.
> 
> I was planning on checking everywhere and trying to reduce the dependencies
>  on /proc and /sys, IF it works the same everywhere without any
>  consequences (just like this here).
> 
> Also, if you look at it; not having / mounted as an nfs WILL disable the
>  use of this module entirely and thus all the root=nfs stuff will fail.
> 
> What do you think?
> 

imo,

Either we get hostonly to work for this, or we need a separate chroot option 
to make this work.

We can fiddle all we want, but in effect the purpose of this is to have an easy 
way to generate an initrd.

patches

[Maarten Vanraes]

[-- Attachment #1: Type: text/plain, Size: 58 bytes --]

Hi,

another small patch.

Kind regards,

Maarten Vanraes

[-- Attachment #2: 0004-not-remove-unloaded-modules.patch --]
[-- Type: text/x-patch, Size: 1592 bytes --]

From 4ef6f01f12874dde73025e890b012d443b355766 Mon Sep 17 00:00:00 2001
From: Maarten Vanraes <maarten.vanraes-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Date: Mon, 26 Jul 2010 09:49:06 +0200
Subject: [PATCH 4/4] not remove unloaded modules

Currently unloaded kernel modules can't be removed, because this would
break kernel module renames or newer modules for certain hardware, this
also has problems for chrooted installs.

Signed-off-by: Maarten Vanraes <maarten.vanraes-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
 dracut-functions |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/dracut-functions b/dracut-functions
index be6b2e9..47a958d 100755
--- a/dracut-functions
+++ b/dracut-functions
@@ -607,10 +607,13 @@ instmods() {
 	        [[ -f $initdir/$1 ]] && { shift; continue; }
 		# If we are building a host-specific initramfs and this
 		# module is not already loaded, move on to the next one.
-		[[ $hostonly ]] && ! grep -q "${mod//-/_}" /proc/modules && \
-	        ! echo $add_drivers | grep -qe "\<${mod}\>" &&	{
-		    shift; continue; 
-		}
+		# NOTE: This is not desirable, if a new kernel has a renamed
+		# module or it has a new module with better support, that module
+		# won't be used here.
+		#[[ $hostonly ]] && ! grep -q "${mod//-/_}" /proc/modules && \
+	        #! echo $add_drivers | grep -qe "\<${mod}\>" &&	{
+		#    shift; continue; 
+		#}
 
 		# We use '-d' option in modprobe only if modules prefix path
 		# differs from default '/'.  This allows us to use Dracut with
-- 
1.6.4.4

[PATCH] load dracut.conf.d before dracut.conf (was: Re: patches)

[Anssi Hannula]

[-- Attachment #1: Type: text/plain, Size: 1513 bytes --]

On 21.07.2010 14:41, Harald Hoyer wrote:
> On 07/14/2010 02:05 AM, Maarten Vanraes wrote:
>> 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
> 
> Pushed the conffile patch and the bootchartd patch

The conffile patch causes dracut to load /etc/dracut.conf first and only
then /etc/dracut.conf.d, allowing the latter to override the former.

IMO this is backwards. I thought distribution/package default stuff was
supposed to be put in /etc/dracut.conf.d/*.conf, and /etc/dracut.conf
was the place for the user to override them if they so wished.

Is this not the case?

If I've indeed misunderstood this, what is the recommended way for a
user to override distribution default settings?
Create a /etc/dracut.conf.d/zzz-last-user.conf?
Wouldn't that make /etc/dracut.conf superfluous? Or is that file indeed
intended for distribution defaults instead?

Or is there some more important reason to have it this way?

I've attached a patch which makes the behaviour sensible to me.


For background, the Mandriva package (again, wrongly IMO) currently uses
/etc/dracut.conf for distribution defaults and expects any user
configuration to be in /etc/dracut.conf.d/*.conf, and that was the
reason for the original patch submission; I'll change this behavior in
Mandriva (no one was against it on our ml in March) if the attached
patch gets OK'd.

-- 
Anssi Hannula

[-- Attachment #2: 0001-dracut-load-dracut.conf.d-.conf-before-dracut.conf.patch --]
[-- Type: text/x-patch, Size: 2525 bytes --]

From 1a361ec63abe41c38fdfb85813ced0e5fb8893b2 Mon Sep 17 00:00:00 2001
From: Anssi Hannula <anssi-4qZELD6Fgxhg9hUCZPvPmw@public.gmane.org>
Date: Sat, 8 Jan 2011 08:23:52 +0200
Subject: [PATCH] dracut: load dracut.conf.d/*.conf before dracut.conf

---
 dracut            |    6 +++---
 dracut.conf.5.xml |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dracut b/dracut
index 303d817..0a0b628 100755
--- a/dracut
+++ b/dracut
@@ -176,9 +176,6 @@ if [[ ! -d $confdir ]]; then
         confdir="/etc/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 
@@ -186,6 +183,9 @@ 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"
diff --git a/dracut.conf.5.xml b/dracut.conf.5.xml
index df89233..fe8f7bc 100644
--- a/dracut.conf.5.xml
+++ b/dracut.conf.5.xml
@@ -35,8 +35,8 @@
     <para><filename>dracut.conf</filename>
 is loaded during the initialisation phase of dracut.
 Command line parameter will overwrite any values set here.
-<emphasis><filename>dracut.conf.d/*.conf</filename> files are read in alphanumerical order and will</emphasis>
-overwrite parameters set in <filename>/etc/dracut.conf</filename>. Each line specifies an attribute and a value. A &apos;#&apos; indicates the beginning of a comment; following characters, up to the end of the line are not interpreted.</para>
+It will override parameters set in <filename>dracut.conf.d/*.conf</filename>.
+Each line specifies an attribute and a value. A &apos;#&apos; indicates the beginning of a comment; following characters, up to the end of the line are not interpreted.</para>
     <variablelist>
       <varlistentry>
         <term>
@@ -180,7 +180,7 @@ initramfs.</para>
           <filename>/etc/dracut/conf.d/</filename>
         </term>
         <listitem>
-          <para>Any <filename>/etc/dracut/conf.d/*.conf</filename> file can overwrite the values in <filename>/etc/dracut.conf</filename>.
+          <para><filename>/etc/dracut/conf.d/*.conf</filename> files are loaded before <filename>/etc/dracut.conf</filename>.
 The configuration files are read in alphanumerical order.</para>
         </listitem>
       </varlistentry>
-- 
1.7.3

Re: [PATCH] load dracut.conf.d before dracut.conf

[Harald Hoyer]

Am 08.01.2011 07:41, schrieb Anssi Hannula:
> On 21.07.2010 14:41, Harald Hoyer wrote:
>> On 07/14/2010 02:05 AM, Maarten Vanraes wrote:
>>> 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
>>
>> Pushed the conffile patch and the bootchartd patch
> 
> The conffile patch causes dracut to load /etc/dracut.conf first and only
> then /etc/dracut.conf.d, allowing the latter to override the former.
> 
> IMO this is backwards. I thought distribution/package default stuff was
> supposed to be put in /etc/dracut.conf.d/*.conf, and /etc/dracut.conf
> was the place for the user to override them if they so wished.
> 
> Is this not the case?
> 
> If I've indeed misunderstood this, what is the recommended way for a
> user to override distribution default settings?
> Create a /etc/dracut.conf.d/zzz-last-user.conf?
> Wouldn't that make /etc/dracut.conf superfluous? Or is that file indeed
> intended for distribution defaults instead?
> 
> Or is there some more important reason to have it this way?
> 
> I've attached a patch which makes the behaviour sensible to me.
> 
> 
> For background, the Mandriva package (again, wrongly IMO) currently uses
> /etc/dracut.conf for distribution defaults and expects any user
> configuration to be in /etc/dracut.conf.d/*.conf, and that was the
> reason for the original patch submission; I'll change this behavior in
> Mandriva (no one was against it on our ml in March) if the attached
> patch gets OK'd.
> 

in Fedora, I put distro specific stuff in /etc/dracut.conf.d/01-dist.conf and I
encourage people to put their config in e.g. /etc/dracut.conf.d/99-myconf.conf

Re: [PATCH] load dracut.conf.d before dracut.conf

[Anssi Hannula]

On 18.02.2011 12:15, Harald Hoyer wrote:
> Am 08.01.2011 07:41, schrieb Anssi Hannula:
>> The conffile patch causes dracut to load /etc/dracut.conf first and only
>> then /etc/dracut.conf.d, allowing the latter to override the former.
>>
>> IMO this is backwards. I thought distribution/package default stuff was
>> supposed to be put in /etc/dracut.conf.d/*.conf, and /etc/dracut.conf
>> was the place for the user to override them if they so wished.
>>
>> Is this not the case?
>>
>> If I've indeed misunderstood this, what is the recommended way for a
>> user to override distribution default settings?
>> Create a /etc/dracut.conf.d/zzz-last-user.conf?
>> Wouldn't that make /etc/dracut.conf superfluous? Or is that file indeed
>> intended for distribution defaults instead?
>>
>> Or is there some more important reason to have it this way?
>>
>> I've attached a patch which makes the behaviour sensible to me.
>>
>>
>> For background, the Mandriva package (again, wrongly IMO) currently uses
>> /etc/dracut.conf for distribution defaults and expects any user
>> configuration to be in /etc/dracut.conf.d/*.conf, and that was the
>> reason for the original patch submission; I'll change this behavior in
>> Mandriva (no one was against it on our ml in March) if the attached
>> patch gets OK'd.
>>
> 
> in Fedora, I put distro specific stuff in /etc/dracut.conf.d/01-dist.conf and I
> encourage people to put their config in e.g. /etc/dracut.conf.d/99-myconf.conf

What's the purpose of /etc/dracut.conf then?

If you don't think my previous patch was reasonable, I suggest removing
it completely :)

-- 
Anssi Hannula

Re: [PATCH] load dracut.conf.d before dracut.conf

[Harald Hoyer]

Am 20.02.2011 18:29, schrieb Anssi Hannula:
> What's the purpose of /etc/dracut.conf then?
> 
> If you don't think my previous patch was reasonable, I suggest removing
> it completely :)
> 

True, indeed we can think about it. Like /etc/modprobe.conf is gone now in
favour of /etc/modprobe.d.