Debian/Ubuntu patches

Debian/Ubuntu patches

[Jon Ander Hernandez]

Hello,

I post the patches as I promised :-)

- When a new kernel is installed or uninstalled dracut based initramfs
is not automatically created/deleted. Ubuntu's kernel package's post
script executes update-initramfs directly, and the update-initramfs
trigger is never fired.
Another solution is to install a postinst and a postrm script under
/etc/kernel/{postrm.d,prerm.d}.

http://kestrelhpc.svn.sourceforge.net/viewvc/kestrelhpc/Kestrelhpc/Src/dracut/debian_kernel_prerm_postinst.diff


- Postinst script can be executed when installing first time dracut,
or when we are upgrading Dracut. Check if it should create a new
initramfs or if it should upgrade it.

http://kestrelhpc.svn.sourceforge.net/viewvc/kestrelhpc/Kestrelhpc/Src/dracut/debian_postinst.diff


- Add xsltproc and docbook-xsl as dependencies to the source package,
since they are required for building the man files.

http://kestrelhpc.svn.sourceforge.net/viewvc/kestrelhpc/Kestrelhpc/Src/dracut/debian_control.diff


- Create the man files when building the package.

http://kestrelhpc.svn.sourceforge.net/viewvc/kestrelhpc/Kestrelhpc/Src/dracut/debian_rules.diff


- rpc.idmapd requires rpc_pipefs to be mounted. On Fedora when the
sunrpc module is loaded, modprobe mounts the rpc_pipefs, while this is
not the case on Debian/Ubuntu.

http://kestrelhpc.svn.sourceforge.net/viewvc/kestrelhpc/Kestrelhpc/Src/dracut/nfsroot_mount_rpc_pipefs.diff



I imagine that these should be version specific patches :

- Ubuntu Maverick ships dhclient 3, which doesn't support the "-4" flag.

http://kestrelhpc.svn.sourceforge.net/viewvc/kestrelhpc/Kestrelhpc/Src/dracut/debian_fix_dhclient_3.diff

- Ubuntu's Maverick arping seems to be broken (a least for me).

http://kestrelhpc.svn.sourceforge.net/viewvc/kestrelhpc/Kestrelhpc/Src/dracut/debian_fix_remove_arping.diff

Cheers,

Jon Ander.

Re: Debian/Ubuntu patches

[maximilian attems]

On Mon, Nov 08, 2010 at 07:50:59PM +0100, Jon Ander Hernandez wrote:
> Hello,
> 
> I post the patches as I promised :-)
> 
> - When a new kernel is installed or uninstalled dracut based initramfs
> is not automatically created/deleted. Ubuntu's kernel package's post
> script executes update-initramfs directly, and the update-initramfs
> trigger is never fired.
> Another solution is to install a postinst and a postrm script under
> /etc/kernel/{postrm.d,prerm.d}.
> 
> http://kestrelhpc.svn.sourceforge.net/viewvc/kestrelhpc/Kestrelhpc/Src/dracut/debian_kernel_prerm_postinst.diff

please send such patches inside of an email, aboves is pointless.

thanks.

Re: Debian/Ubuntu patches

[Seewer Philippe]

Hi Jon,

On 11/08/2010 07:50 PM, Jon Ander Hernandez wrote:
> Hello,
>
> I post the patches as I promised :-)

I repeat Maximilian's comment: Please post patches inline.

>
> - When a new kernel is installed or uninstalled dracut based initramfs
> is not automatically created/deleted. Ubuntu's kernel package's post
> script executes update-initramfs directly, and the update-initramfs
> trigger is never fired.
> Another solution is to install a postinst and a postrm script under
> /etc/kernel/{postrm.d,prerm.d}.
>
> http://kestrelhpc.svn.sourceforge.net/viewvc/kestrelhpc/Kestrelhpc/Src/dracut/debian_kernel_prerm_postinst.diff

>
>
> - Postinst script can be executed when installing first time dracut,
> or when we are upgrading Dracut. Check if it should create a new
> initramfs or if it should upgrade it.
>
> http://kestrelhpc.svn.sourceforge.net/viewvc/kestrelhpc/Kestrelhpc/Src/dracut/debian_postinst.diff
>
>
> - Add xsltproc and docbook-xsl as dependencies to the source package,
> since they are required for building the man files.
>
> http://kestrelhpc.svn.sourceforge.net/viewvc/kestrelhpc/Kestrelhpc/Src/dracut/debian_control.diff
>
>
> - Create the man files when building the package.
>
> http://kestrelhpc.svn.sourceforge.net/viewvc/kestrelhpc/Kestrelhpc/Src/dracut/debian_rules.diff

Personal comment on the debian/* stuff: It's horribly outdated. Due do 
workload and private reasons I haven't been able to work on them for 
months.

As for these patches, they look sensible. But question: have you tried 
them on debian testing/unstable?

> - rpc.idmapd requires rpc_pipefs to be mounted. On Fedora when the
> sunrpc module is loaded, modprobe mounts the rpc_pipefs, while this is
> not the case on Debian/Ubuntu.
>
> http://kestrelhpc.svn.sourceforge.net/viewvc/kestrelhpc/Kestrelhpc/Src/dracut/nfsroot_mount_rpc_pipefs.diff

Good one! Please post inline patch.

> I imagine that these should be version specific patches :
>
> - Ubuntu Maverick ships dhclient 3, which doesn't support the "-4" flag.
>
> http://kestrelhpc.svn.sourceforge.net/viewvc/kestrelhpc/Kestrelhpc/Src/dracut/debian_fix_dhclient_3.diff
This is a debian/ubuntu specific fix and should not go in just like 
that. We need a version check to decide if -[46] can be passed or not, 
since newer version of dhclient should be supplied with it.

>
> - Ubuntu's Maverick arping seems to be broken (a least for me).
>
> http://kestrelhpc.svn.sourceforge.net/viewvc/kestrelhpc/Kestrelhpc/Src/dracut/debian_fix_remove_arping.diff

We need iputils-arping and not the standard arping. Mind checking if you 
are using the correct package?

Thanks && Regards,
Philippe

Re: Debian/Ubuntu patches

[Jon Ander Hernandez]

2010/11/9 Seewer Philippe <philippe.seewer-omB+W0Dpw2o@public.gmane.org>:
> Hi Jon,
>
> On 11/08/2010 07:50 PM, Jon Ander Hernandez wrote:
>>
>> Hello,
>>
>> I post the patches as I promised :-)
>
> I repeat Maximilian's comment: Please post patches inline.

Ops I'm sorry, I readed the mailing list's guidelines, and I thought
that a patch (inlined) was also considered an attachment.



- When a new kernel is installed or uninstalled dracut based initramfs
is not automatically created/deleted. Ubuntu's kernel package's post
script executes update-initramfs directly, and the update-initramfs
trigger is never fired.
Another solution is to install a postinst and a postrm script under
/etc/kernel/{postrm.d,prerm.d}.

diff -urN dracut/debian/dracut.install dracut-007/debian/dracut.install
--- dracut/debian/dracut.install	2010-08-09 16:13:51.000000000 +0200
+++ dracut-007/debian/dracut.install	2010-10-21 02:49:45.714564995 +0200
@@ -4,6 +4,8 @@
 dracut-gencmdline	usr/sbin
 dracut-functions	usr/share/dracut
 dracut.conf		etc
+dracut-postinst.d	etc/kernel/postinst.d
+dracut-prerm.d		etc/kernel/prerm.d
 modules.d/00dash		usr/share/dracut/modules.d
 modules.d/01fips		usr/share/dracut/modules.d
 modules.d/60xen			usr/share/dracut/modules.d
diff -urN dracut/dracut-postinst.d dracut-007/dracut-postinst.d
--- dracut/dracut-postinst.d	1970-01-01 01:00:00.000000000 +0100
+++ dracut-007/dracut-postinst.d	2010-10-21 02:49:45.714564995 +0200
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+version=$1
+dracut-update-initramfs -c -k ${version}
diff -urN dracut/dracut-prerm.d dracut-007/dracut-prerm.d
--- dracut/dracut-prerm.d	1970-01-01 01:00:00.000000000 +0100
+++ dracut-007/dracut-prerm.d	2010-10-21 02:49:45.714564995 +0200
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+version=$1
+dracut-update-initramfs -d -k ${version}


- Postinst script can be executed when installing first time dracut,
and when we are upgrading Dracut. Check if it should create a new
initramfs or if it should upgrade it.

diff -urN dracut/debian/dracut.postinst dracut-007/debian/dracut.postinst
--- dracut/debian/dracut.postinst	2010-08-09 16:13:51.000000000 +0200
+++ dracut-007/debian/dracut.postinst	2010-10-21 02:49:45.714564995 +0200
@@ -2,7 +2,11 @@

 set -e

-# Regenerate initramfs when we're `installed`
-DPKG_MAINTSCRIPT_PACKAGE='' dracut-update-initramfs -u
+if [ -f /boot/dracut.img-`uname -r` ]; then
+    # Regenerate initramfs when we're `installed`
+    DPKG_MAINTSCRIPT_PACKAGE='' dracut-update-initramfs -t -u
+else
+    dracut-update-initramfs -c -k `uname -r`
+fi

 #DEBHELPER#


- Add xsltproc and docbook-xsl as dependencies to the source package,
since they are required for building the man files.

diff -urN dracut/debian/control dracut-007/debian/control
--- dracut/debian/control	2010-08-09 16:13:51.000000000 +0200
+++ dracut-007/debian/control	2010-10-21 19:50:22.123359964 +0200
@@ -2,7 +2,7 @@
 Section: utils
 Priority: optional
 Maintainer: Philippe Seewer <philippe.seewer-omB+W0Dpw2o@public.gmane.org>
-Build-Depends: debhelper (>= 5.0), cdbs
+Build-Depends: debhelper (>= 5.0), cdbs, xsltproc, docbook-xsl
 Standards-Version: 3.8.4
 Vcs-Browser: http://dracut.git.sourceforge.net/git/gitweb-index.cgi
 Vcs-Git: git://dracut.git.sourceforge.net/gitroot/dracut/dracut
@@ -11,7 +11,7 @@
 Architecture: all
 Recommends: cryptsetup, dmsetup, dmraid, lvm2, mdadm
 Suggests: dracut-network
-Depends: cpio, module-init-tools, udev, ${misc:Depends}
+Depends: cpio, module-init-tools, udev, bridge-utils, ${misc:Depends}
 Provides: linux-initramfs-tool
 Description: A new initramfs infrastructure
  Unlike existing initramfs's, this is an attempt at having as little as


- Create the man files when building the package. Make
dpkg-buildpackage execute make all, instead of just make.
The override_dh_auto_test line, prevents dpkg-buildpackage from
executing make test.

diff -urN dracut/debian/rules dracut-007/debian/rules
--- dracut/debian/rules	2010-08-09 16:13:51.000000000 +0200
+++ dracut-007/debian/rules	2010-10-21 02:49:45.714564995 +0200
@@ -1,3 +1,10 @@
 #!/usr/bin/make -f

-include /usr/share/cdbs/1/rules/debhelper.mk
+%:
+	dh $@
+
+override_dh_auto_build:
+	dh_auto_build -- all
+
+override_dh_auto_test:
+


- rpc.idmapd requires rpc_pipefs to be mounted. On Fedora when the
sunrpc module is loaded, modprobe mounts the rpc_pipefs, while this is
not the case on Debian/Ubuntu.

diff -urN dracut/modules.d/95nfs/nfsroot dracut-007/modules.d/95nfs/nfsroot
--- dracut/modules.d/95nfs/nfsroot	2010-08-09 16:13:51.000000000 +0200
+++ dracut-007/modules.d/95nfs/nfsroot	2010-10-21 22:21:12.682081301 +0200
@@ -88,6 +88,9 @@
 [ -x /sbin/rpcbind ] && [ -z "$(pidof rpcbind)" ] && rpcbind

 if [ "$nfs" = "nfs4" ]; then
+    [ ! -d /var/lib/nfs/rpc_pipefs/nfs ] && \
+        mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs
+
     # Start rpc.statd as mount won't let us use locks on a NFSv4
     # filesystem without talking to it. NFSv4 does locks internally,
     # rpc.lockd isn't needed


> Personal comment on the debian/* stuff: It's horribly outdated. Due do
> workload and private reasons I haven't been able to work on them for months.
>
> As for these patches, they look sensible. But question: have you tried them
> on debian testing/unstable?

I have not tried them lately, just in Ubuntu 10.04 and Ubuntu 10.10.


Regards,

Jon Ander.

Re: Debian/Ubuntu patches

[Jon Ander Hernandez]

>
>> I imagine that these should be version specific patches :
>>
>
> This is a debian/ubuntu specific fix and should not go in just like that. We
> need a version check to decide if -[46] can be passed or not, since newer
> version of dhclient should be supplied with it.

Sorry, I meant that Ubuntus packages should have this patches applied,
because otherwise are broken. I was not refering to pulling them into
the master, I'm sorry.


 - Ubuntu 10.10 ships dhclient 3, which doesn't support the "-4" flag.

diff -urN dracut/modules.d/40network/ifup dracut-007/modules.d/40network/ifup
--- dracut/modules.d/40network/ifup	2010-08-09 16:13:51.000000000 +0200
+++ dracut-007/modules.d/40network/ifup	2010-10-21 02:49:45.714564995 +0200
@@ -132,7 +132,7 @@
     if [ "$netroot" = "dhcp6" ]; then
 	do_dhcp -6
     else
-	do_dhcp -4
+	do_dhcp
     fi
 fi

@@ -151,7 +151,7 @@

     case $autoconf in
 	dhcp|on|any)
-	    do_dhcp -4 ;;
+	    do_dhcp ;;
 	dhcp6)
 	    do_dhcp -6 ;;
 	auto6)


- Ubuntu Maverick's arping seems to be broken (a least for me).

diff -urN dracut/modules.d/40network/netroot
dracut-007/modules.d/40network/netroot
--- dracut/modules.d/40network/netroot	2010-08-09 16:13:51.000000000 +0200
+++ dracut-007/modules.d/40network/netroot	2010-10-21 02:49:45.714564995 +0200
@@ -96,9 +96,9 @@
        [0-9]*\.[0-9]*\.[0-9]*\.[0-9]*) dest=$dummy;;
     esac
 fi
-if [ -n "$dest" ] && ! arping -q -f -w 60 -I $netif $dest ; then
-    die "Resolving $dest via ARP on $netif failed"
-fi
+#if [ -n "$dest" ] && ! arping -q -f -w 60 -I $netif $dest ; then
+#    die "Resolving $dest via ARP on $netif failed"
+#fi

 # Source netroot hooks before we start the handler
 source_all netroot


> We need iputils-arping and not the standard arping. Mind checking if you are
> using the correct package?

$ dpkg -S `which arping `
iputils-arping: /usr/bin/arping

$ arping -V
arping utility, iputils-sss20100418


> Thanks && Regards,
> Philippe

Regards,

Jon Ander.

Re: Debian/Ubuntu patches

[Seewer Philippe]

On 11/09/2010 12:19 PM, Jon Ander Hernandez wrote:
[snip]
>> We need iputils-arping and not the standard arping. Mind checking if you are
>> using the correct package?
>
> $ dpkg -S `which arping `
> iputils-arping: /usr/bin/arping
>
> $ arping -V
> arping utility, iputils-sss20100418

Thanks for checking. Now i'm confused. Because arping's invocation (sudo 
arping -f -w 60 -I eth0 ...) on my 10.10 works flawless. Is dracut 
"throwing" an error when calling arping or is it the "Resolving $dest 
via ARP on $netif failed" message?

Regards,
Philippe

Re: Debian/Ubuntu patches

[maximilian attems]

On Tue, Nov 09, 2010 at 12:11:58PM +0100, Jon Ander Hernandez wrote:
> diff -urN dracut/dracut-postinst.d dracut-007/dracut-postinst.d
> --- dracut/dracut-postinst.d	1970-01-01 01:00:00.000000000 +0100
> +++ dracut-007/dracut-postinst.d	2010-10-21 02:49:45.714564995 +0200
> @@ -0,0 +1,4 @@
> +#!/bin/bash
> +
> +version=$1
> +dracut-update-initramfs -c -k ${version}

please have a look at /etc/kernel/postinst.d/initramfs-tools this
is far from complete.

> diff -urN dracut/dracut-prerm.d dracut-007/dracut-prerm.d
> --- dracut/dracut-prerm.d	1970-01-01 01:00:00.000000000 +0100
> +++ dracut-007/dracut-prerm.d	2010-10-21 02:49:45.714564995 +0200
postrm.d is the right dir.
> @@ -0,0 +1,4 @@
> +#!/bin/bash
> +
> +version=$1
> +dracut-update-initramfs -d -k ${version}

same comment as aboves, see /etc/kernel/postrm.d/initramfs-tools
 
 
> - Postinst script can be executed when installing first time dracut,
> and when we are upgrading Dracut. Check if it should create a new
> initramfs or if it should upgrade it.
> 
> diff -urN dracut/debian/dracut.postinst dracut-007/debian/dracut.postinst
> --- dracut/debian/dracut.postinst	2010-08-09 16:13:51.000000000 +0200
> +++ dracut-007/debian/dracut.postinst	2010-10-21 02:49:45.714564995 +0200
> @@ -2,7 +2,11 @@
> 
>  set -e
> 
> -# Regenerate initramfs when we're `installed`
> -DPKG_MAINTSCRIPT_PACKAGE='' dracut-update-initramfs -u
> +if [ -f /boot/dracut.img-`uname -r` ]; then
> +    # Regenerate initramfs when we're `installed`
> +    DPKG_MAINTSCRIPT_PACKAGE='' dracut-update-initramfs -t -u
> +else
> +    dracut-update-initramfs -c -k `uname -r`
> +fi

not sure why you want a create at all here, create should be called
by linux-2.6 images not the wrapper script itself.
> 
> 
> - Create the man files when building the package. Make
> dpkg-buildpackage execute make all, instead of just make.
> The override_dh_auto_test line, prevents dpkg-buildpackage from
> executing make test.
> 
> diff -urN dracut/debian/rules dracut-007/debian/rules
> --- dracut/debian/rules	2010-08-09 16:13:51.000000000 +0200
> +++ dracut-007/debian/rules	2010-10-21 02:49:45.714564995 +0200
> @@ -1,3 +1,10 @@
>  #!/usr/bin/make -f
> 
> -include /usr/share/cdbs/1/rules/debhelper.mk
> +%:
> +	dh $@
> +
> +override_dh_auto_build:
> +	dh_auto_build -- all
> +
> +override_dh_auto_test:
> +

the changelog vor this change is very confusing,
essentialy you change here from a cdbs source package to a dh one.
 
-- 
maks

Re: Debian/Ubuntu patches

[Jon Ander Hernandez]

Hello,

2010/11/9 Seewer Philippe <philippe.seewer-omB+W0Dpw2o@public.gmane.org>:
>
>
> On 11/09/2010 12:19 PM, Jon Ander Hernandez wrote:
> [snip]
>>>
>>> We need iputils-arping and not the standard arping. Mind checking if you
>>> are
>>> using the correct package?
>>
>> $ dpkg -S `which arping `
>> iputils-arping: /usr/bin/arping
>>
>> $ arping -V
>> arping utility, iputils-sss20100418
>
> Thanks for checking. Now i'm confused. Because arping's invocation (sudo
> arping -f -w 60 -I eth0 ...) on my 10.10 works flawless.

Well now I'm also confused... I tested it sometime ago and it failed,
but now it works. May be I did something strange at that time, because
I was doing weird things to discover what was failing till I found the
arping issue. Maybe I should test everything with a different switch.

> Is dracut
> "throwing" an error when calling arping or is it the "Resolving $dest via
> ARP on $netif failed" message?

I've tested dracut without commenting the arping line and yes, I get :

dracut: FATAL: Resolving 192.168.30.1 via ARP on eth0 failed
dracut: Refusing to continue

No root device found

Boot has failed, sleeping forever

Re: Debian/Ubuntu patches

[Jon Ander Hernandez]

2010/11/9 maximilian attems <max-U9r9yeDMy7A@public.gmane.org>:
> On Tue, Nov 09, 2010 at 12:11:58PM +0100, Jon Ander Hernandez wrote:
>> diff -urN dracut/dracut-postinst.d dracut-007/dracut-postinst.d
>> --- dracut/dracut-postinst.d  1970-01-01 01:00:00.000000000 +0100
>> +++ dracut-007/dracut-postinst.d      2010-10-21 02:49:45.714564995 +0200
>> @@ -0,0 +1,4 @@
>> +#!/bin/bash
>> +
>> +version=$1
>> +dracut-update-initramfs -c -k ${version}
>
> please have a look at /etc/kernel/postinst.d/initramfs-tools this
> is far from complete.

Ops, I'm sorry I didn't know about those files, I wrote my scripts
from scratch. I will complete them.
- Ocultar texto citado -


>> diff -urN dracut/dracut-prerm.d dracut-007/dracut-prerm.d
>> --- dracut/dracut-prerm.d     1970-01-01 01:00:00.000000000 +0100
>> +++ dracut-007/dracut-prerm.d 2010-10-21 02:49:45.714564995 +0200
> postrm.d is the right dir.
>> @@ -0,0 +1,4 @@
>> +#!/bin/bash
>> +
>> +version=$1
>> +dracut-update-initramfs -d -k ${version}
>
> same comment as aboves, see /etc/kernel/postrm.d/initramfs-tools
>
>
>> - Postinst script can be executed when installing first time dracut,
>> and when we are upgrading Dracut. Check if it should create a new
>> initramfs or if it should upgrade it.
>>
>> diff -urN dracut/debian/dracut.postinst dracut-007/debian/dracut.postinst
>> --- dracut/debian/dracut.postinst     2010-08-09 16:13:51.000000000 +0200
>> +++ dracut-007/debian/dracut.postinst 2010-10-21 02:49:45.714564995 +0200
>> @@ -2,7 +2,11 @@
>>
>>  set -e
>>
>> -# Regenerate initramfs when we're `installed`
>> -DPKG_MAINTSCRIPT_PACKAGE='' dracut-update-initramfs -u
>> +if [ -f /boot/dracut.img-`uname -r` ]; then
>> +    # Regenerate initramfs when we're `installed`
>> +    DPKG_MAINTSCRIPT_PACKAGE='' dracut-update-initramfs -t -u
>> +else
>> +    dracut-update-initramfs -c -k `uname -r`
>> +fi
>
> not sure why you want a create at all here, create should be called
> by linux-2.6 images not the wrapper script itself.

It makes sense.

>> - Create the man files when building the package. Make
>> dpkg-buildpackage execute make all, instead of just make.
>> The override_dh_auto_test line, prevents dpkg-buildpackage from
>> executing make test.
>>
>> diff -urN dracut/debian/rules dracut-007/debian/rules
>> --- dracut/debian/rules       2010-08-09 16:13:51.000000000 +0200
>> +++ dracut-007/debian/rules   2010-10-21 02:49:45.714564995 +0200
>> @@ -1,3 +1,10 @@
>>  #!/usr/bin/make -f
>>
>> -include /usr/share/cdbs/1/rules/debhelper.mk
>> +%:
>> +     dh $@
>> +
>> +override_dh_auto_build:
>> +     dh_auto_build -- all
>> +
>> +override_dh_auto_test:
>> +
>
> the changelog vor this change is very confusing,
> essentialy you change here from a cdbs source package to a dh one.

What I'm trying to do is to avoid this error :

dh_installman -pdracut
dracut.8: No such file or directory at /usr/bin/dh_installman line 127.
make: *** [binary-install/dracut] Error 2
dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2


From what I understand (I don't have much experience with debian
packages), dpkg executes "make binary", which doesn't create the man
files. So I found that using dh and overriding the dh_auto_build I
could get it to call "make all" instead.

Re: Debian/Ubuntu patches

[maximilian attems]

[ Please keep mailing list on cc otherwise might get lost or deleted
  in personal mails, thanks. ]

On Tue, Nov 09, 2010 at 02:51:16PM +0100, Jon Ander Hernandez wrote:
> 2010/11/9 maximilian attems <max-U9r9yeDMy7A@public.gmane.org>:
> > On Tue, Nov 09, 2010 at 12:11:58PM +0100, Jon Ander Hernandez wrote:
> >> diff -urN dracut/dracut-postinst.d dracut-007/dracut-postinst.d
> >> --- dracut/dracut-postinst.d  1970-01-01 01:00:00.000000000 +0100
> >> +++ dracut-007/dracut-postinst.d      2010-10-21 02:49:45.714564995 +0200
> >> @@ -0,0 +1,4 @@
> >> +#!/bin/bash
> >> +
> >> +version=$1
> >> +dracut-update-initramfs -c -k ${version}
> >
> > please have a look at /etc/kernel/postinst.d/initramfs-tools this
> > is far from complete.
> 
> Ops, I'm sorry I didn't know about those files, I wrote my scripts
> from scratch. I will complete them.

ok cool, if you have questions for them please just ask on mailinglist.

the redirect to stderr is needed as linux images might use debconf.
 
 
> >> - Create the man files when building the package. Make
> >> dpkg-buildpackage execute make all, instead of just make.
> >> The override_dh_auto_test line, prevents dpkg-buildpackage from
> >> executing make test.
> >>
> >> diff -urN dracut/debian/rules dracut-007/debian/rules
> >> --- dracut/debian/rules       2010-08-09 16:13:51.000000000 +0200
> >> +++ dracut-007/debian/rules   2010-10-21 02:49:45.714564995 +0200
> >> @@ -1,3 +1,10 @@
> >>  #!/usr/bin/make -f
> >>
> >> -include /usr/share/cdbs/1/rules/debhelper.mk
> >> +%:
> >> +     dh $@
> >> +
> >> +override_dh_auto_build:
> >> +     dh_auto_build -- all
> >> +
> >> +override_dh_auto_test:
> >> +
> >
> > the changelog vor this change is very confusing,
> > essentialy you change here from a cdbs source package to a dh one.
> 
> What I'm trying to do is to avoid this error :
> 
> dh_installman -pdracut
> dracut.8: No such file or directory at /usr/bin/dh_installman line 127.
> make: *** [binary-install/dracut] Error 2
> dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2
> 
> 
> From what I understand (I don't have much experience with debian
> packages), dpkg executes "make binary", which doesn't create the man
> files. So I found that using dh and overriding the dh_auto_build I
> could get it to call "make all" instead.

ufff, please look at b5c928d159623f617f872323b7064ebfbf19a269 from
initramfs-tools for a similar switch, you need to fix the control
appropriately:
http://git.debian.org/?p=kernel/initramfs-tools.git;a=commit;h=b5c928d159623f617f872323b7064ebfbf19a269


-- 
maks

Re: Debian/Ubuntu patches

[Jon Ander Hernandez]

2010/11/9 maximilian attems <max-U9r9yeDMy7A@public.gmane.org>:

>> - Postinst script can be executed when installing first time dracut,
>> and when we are upgrading Dracut. Check if it should create a new
>> initramfs or if it should upgrade it.
>>
>> diff -urN dracut/debian/dracut.postinst dracut-007/debian/dracut.postinst
>> --- dracut/debian/dracut.postinst     2010-08-09 16:13:51.000000000 +0200
>> +++ dracut-007/debian/dracut.postinst 2010-10-21 02:49:45.714564995 +0200
>> @@ -2,7 +2,11 @@
>>
>>  set -e
>>
>> -# Regenerate initramfs when we're `installed`
>> -DPKG_MAINTSCRIPT_PACKAGE='' dracut-update-initramfs -u
>> +if [ -f /boot/dracut.img-`uname -r` ]; then
>> +    # Regenerate initramfs when we're `installed`
>> +    DPKG_MAINTSCRIPT_PACKAGE='' dracut-update-initramfs -t -u
>> +else
>> +    dracut-update-initramfs -c -k `uname -r`
>> +fi
>
> not sure why you want a create at all here, create should be called
> by linux-2.6 images not the wrapper script itself.

But you probably will install dracut once you have a linux kernel
installed, so if you do so, the kernel postinst script will create
dracut initramfs for any new kernel image installed, but not for the
current installed one.

Re: Debian/Ubuntu patches

[Jon Ander Hernandez]

By now an upgraded version of the patches as a single patch :

diff -urN dracut-007//debian/compat dracut/debian/compat
--- dracut-007//debian/compat	2010-08-09 16:13:51.000000000 +0200
+++ dracut/debian/compat	2010-11-09 20:49:29.324392489 +0100
@@ -1 +1 @@
-5
+7
diff -urN dracut-007//debian/control dracut/debian/control
--- dracut-007//debian/control	2010-08-09 16:13:51.000000000 +0200
+++ dracut/debian/control	2010-11-09 20:50:15.364391392 +0100
@@ -2,7 +2,7 @@
 Section: utils
 Priority: optional
 Maintainer: Philippe Seewer <philippe.seewer-omB+W0Dpw2o@public.gmane.org>
-Build-Depends: debhelper (>= 5.0), cdbs
+Build-Depends: debhelper (>= 7.0), xsltproc, docbook-xsl
 Standards-Version: 3.8.4
 Vcs-Browser: http://dracut.git.sourceforge.net/git/gitweb-index.cgi
 Vcs-Git: git://dracut.git.sourceforge.net/gitroot/dracut/dracut
@@ -11,7 +11,7 @@
 Architecture: all
 Recommends: cryptsetup, dmsetup, dmraid, lvm2, mdadm
 Suggests: dracut-network
-Depends: cpio, module-init-tools, udev, ${misc:Depends}
+Depends: cpio, module-init-tools, udev, bridge-utils, ${misc:Depends}
 Provides: linux-initramfs-tool
 Description: A new initramfs infrastructure
  Unlike existing initramfs's, this is an attempt at having as little as
diff -urN dracut-007//debian/dracut.install dracut/debian/dracut.install
--- dracut-007//debian/dracut.install	2010-08-09 16:13:51.000000000 +0200
+++ dracut/debian/dracut.install	2010-11-09 22:39:59.894391387 +0100
@@ -4,6 +4,8 @@
 dracut-gencmdline	usr/sbin
 dracut-functions	usr/share/dracut
 dracut.conf		etc
+debian/dracut-kernel-postinst	etc/kernel/postinst.d
+debian/dracut-kernel-postrm	etc/kernel/postrm.d
 modules.d/00dash		usr/share/dracut/modules.d
 modules.d/01fips		usr/share/dracut/modules.d
 modules.d/60xen			usr/share/dracut/modules.d
diff -urN dracut-007//debian/dracut-kernel-postinst
dracut/debian/dracut-kernel-postinst
--- dracut-007//debian/dracut-kernel-postinst	1970-01-01
01:00:00.000000000 +0100
+++ dracut/debian/dracut-kernel-postinst	2010-11-09 22:25:44.294391387 +0100
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+version="$1"
+bootopt=""
+
+# passing the kernel version is required
+[ -z "${version}" ] && exit 0
+
+# kernel-package passes an extra arg
+if [ -n "$2" ]; then
+	if [ -n "${KERNEL_PACKAGE_VERSION}" ]; then
+		# exit if custom kernel does not need an initramfs
+		[ "$INITRD" = 'No' ] && exit 0
+		bootdir=$(dirname "$2")
+		bootopt="-b ${bootdir}"
+	fi
+fi
+
+# avoid running multiple times
+if [ -n "$DEB_MAINT_PARAMS" ]; then
+	eval set -- "$DEB_MAINT_PARAMS"
+	if [ -z "$1" ] || [ "$1" != "configure" ]; then
+		exit 0
+	fi
+fi
+
+# we're good - create initramfs.  update runs do_bootloader
+dracut-update-initramfs -c -t -k "${version}" ${bootopt} >&2
diff -urN dracut-007//debian/dracut-kernel-postrm
dracut/debian/dracut-kernel-postrm
--- dracut-007//debian/dracut-kernel-postrm	1970-01-01 01:00:00.000000000 +0100
+++ dracut/debian/dracut-kernel-postrm	2010-11-09 22:25:57.804391387 +0100
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+version="$1"
+bootopt=""
+
+# passing the kernel version is required
+[ -z "${version}" ] && exit 0
+
+# kernel-package passes an extra arg
+if [ -n "$2" ]; then
+	if [ -n "${KERNEL_PACKAGE_VERSION}" ]; then
+		bootdir=$(dirname "$2")
+		bootopt="-b ${bootdir}"
+	fi
+fi
+
+# avoid running multiple times
+if [ -n "$DEB_MAINT_PARAMS" ]; then
+	eval set -- "$DEB_MAINT_PARAMS"
+	if [ -z "$1" ] || [ "$1" != "remove" ]; then
+		exit 0
+	fi
+fi
+
+# delete initramfs
+dracut-update-initramfs -d -t -k "${version}" ${bootopt} >&2
diff -urN dracut-007//debian/rules dracut/debian/rules
--- dracut-007//debian/rules	2010-08-09 16:13:51.000000000 +0200
+++ dracut/debian/rules	2010-11-09 20:49:13.044391518 +0100
@@ -1,3 +1,10 @@
 #!/usr/bin/make -f

-include /usr/share/cdbs/1/rules/debhelper.mk
+%:
+	dh $@
+
+override_dh_auto_build:
+	dh_auto_build -- all
+
+override_dh_auto_test:
+

Re: Debian/Ubuntu patches

[maximilian attems]

On Wed, Nov 10, 2010 at 05:21:41PM +0100, Jon Ander Hernandez wrote:
> By now an upgraded version of the patches as a single patch :

ok, this look good to me at first sight.

Please make sure to build this dracut in a chroot
(use sbuild or pbuilder or whatever suits you) in order
to check that it really autobuilds on upload.

thanks.

Acked-by: maximilian attems <max-U9r9yeDMy7A@public.gmane.org>

Re: Debian/Ubuntu patches

[Jon Ander Hernandez]

Hi maximilian,

2010/11/9 Jon Ander Hernandez <jonan.h-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>:
> 2010/11/9 maximilian attems <max-U9r9yeDMy7A@public.gmane.org>:
>
>>> - Postinst script can be executed when installing first time dracut,
>>> and when we are upgrading Dracut. Check if it should create a new
>>> initramfs or if it should upgrade it.
>>>
>>> diff -urN dracut/debian/dracut.postinst dracut-007/debian/dracut.postinst
>>> --- dracut/debian/dracut.postinst     2010-08-09 16:13:51.000000000 +0200
>>> +++ dracut-007/debian/dracut.postinst 2010-10-21 02:49:45.714564995 +0200
>>> @@ -2,7 +2,11 @@
>>>
>>>  set -e
>>>
>>> -# Regenerate initramfs when we're `installed`
>>> -DPKG_MAINTSCRIPT_PACKAGE='' dracut-update-initramfs -u
>>> +if [ -f /boot/dracut.img-`uname -r` ]; then
>>> +    # Regenerate initramfs when we're `installed`
>>> +    DPKG_MAINTSCRIPT_PACKAGE='' dracut-update-initramfs -t -u
>>> +else
>>> +    dracut-update-initramfs -c -k `uname -r`
>>> +fi
>>
>> not sure why you want a create at all here, create should be called
>> by linux-2.6 images not the wrapper script itself.
>
> But you probably will install dracut once you have a linux kernel
> installed, so if you do so, the kernel postinst script will create
> dracut initramfs for any new kernel image installed, but not for the
> current installed one.

Sorry, ¿Did you read this email? 0:-)

Thanks,

Jon Ander.

Re: Debian/Ubuntu patches

[maximilian attems]

On Wed, Nov 10, 2010 at 08:44:45PM +0100, Jon Ander Hernandez wrote:
> Hi maximilian,
> 
> 2010/11/9 Jon Ander Hernandez <jonan.h-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>:
> > 2010/11/9 maximilian attems <max-U9r9yeDMy7A@public.gmane.org>:
> >
> >>> - Postinst script can be executed when installing first time dracut,
> >>> and when we are upgrading Dracut. Check if it should create a new
> >>> initramfs or if it should upgrade it.
> >>>
> >>> diff -urN dracut/debian/dracut.postinst dracut-007/debian/dracut.postinst
> >>> --- dracut/debian/dracut.postinst     2010-08-09 16:13:51.000000000 +0200
> >>> +++ dracut-007/debian/dracut.postinst 2010-10-21 02:49:45.714564995 +0200
> >>> @@ -2,7 +2,11 @@
> >>>
> >>>  set -e
> >>>
> >>> -# Regenerate initramfs when we're `installed`
> >>> -DPKG_MAINTSCRIPT_PACKAGE='' dracut-update-initramfs -u
> >>> +if [ -f /boot/dracut.img-`uname -r` ]; then
> >>> +    # Regenerate initramfs when we're `installed`
> >>> +    DPKG_MAINTSCRIPT_PACKAGE='' dracut-update-initramfs -t -u
> >>> +else
> >>> +    dracut-update-initramfs -c -k `uname -r`
> >>> +fi
> >>
> >> not sure why you want a create at all here, create should be called
> >> by linux-2.6 images not the wrapper script itself.
> >
> > But you probably will install dracut once you have a linux kernel
> > installed, so if you do so, the kernel postinst script will create
> > dracut initramfs for any new kernel image installed, but not for the
> > current installed one.
> 
> Sorry, ¿Did you read this email? 0:-)

yes, but didn't understand your reply and short of time..
this seems like a chicken and egg trouble, please rephrase more coherently.

Re: Debian/Ubuntu patches

[Jon Ander Hernandez]

2010/11/10 maximilian attems <max-U9r9yeDMy7A@public.gmane.org>:

> yes, but didn't understand your reply and short of time..
> this seems like a chicken and egg trouble, please rephrase more coherently.

I'm sorry, I need to improve my English. :-)

I meant that if we ship Dracut with the kernel postinst script
(/etc/kernel/postinst), then the next time a linux image is installed,
that script will be fired and a Dracut based initramfs will be created
for that new kernel.

But when we install Dracut for the first time, there is not any Dracut
based initramfs installed on the system, and Dracut package's postinst
calls actually only call "dracut-update-initramfs -u" which only
updates the initramfs images present in the system (in this case no
one). So after installing Dracut you won't get a Dracut based image
for the kernel you are using, which is not very consistent with the
behaviour of creating the initramfs for any new kernel installed
afterwards.

I understand that is the linux kernel package's mission to call the
kernel postinst scripts under /etc/kernel/postinst, but... I think we
should do something. Maybe make the current linux kernel package call
the /etc/kernel/postinst scripts, or maybe call
dracut-update-initramfs, which was what I was doing in my original
patch... ¿What could be the best solution?

Thanks,

Jon Ander.

Re: Debian/Ubuntu patches

[maximilian attems]

On Wed, 10 Nov 2010, Jon Ander Hernandez wrote:

> 2010/11/10 maximilian attems <max-U9r9yeDMy7A@public.gmane.org>:
> 
> > yes, but didn't understand your reply and short of time..
> > this seems like a chicken and egg trouble, please rephrase more coherently.
> 
> I'm sorry, I need to improve my English. :-)
> 
> I meant that if we ship Dracut with the kernel postinst script
> (/etc/kernel/postinst), then the next time a linux image is installed,
> that script will be fired and a Dracut based initramfs will be created
> for that new kernel.
> 
> But when we install Dracut for the first time, there is not any Dracut
> based initramfs installed on the system, and Dracut package's postinst
> calls actually only call "dracut-update-initramfs -u" which only
> updates the initramfs images present in the system (in this case no
> one). So after installing Dracut you won't get a Dracut based image
> for the kernel you are using, which is not very consistent with the
> behaviour of creating the initramfs for any new kernel installed
> afterwards.

no, no this wrong logic.
first of all the linux image depends on the a linux initramfs creator
tool and thus this is installed *before* linux-2.6.

> I understand that is the linux kernel package's mission to call the
> kernel postinst scripts under /etc/kernel/postinst, but... I think we
> should do something. Maybe make the current linux kernel package call
> the /etc/kernel/postinst scripts, or maybe call
> dracut-update-initramfs, which was what I was doing in my original
> patch... ¿What could be the best solution?

the proposed create seems really wrong, I would nack any postinst
in debian or escalate as serious bug.

if you want hostile takeover that is up to the local admin
and only one command away
update-intramfs-dracut -t -u -k all
 
-- 
maks

Re: Debian/Ubuntu patches

[Jon Ander Hernandez]

2010/11/11 maximilian attems <max-U9r9yeDMy7A@public.gmane.org>:
> On Wed, 10 Nov 2010, Jon Ander Hernandez wrote:
>
>> 2010/11/10 maximilian attems <max-U9r9yeDMy7A@public.gmane.org>:
>>
>> > yes, but didn't understand your reply and short of time..
>> > this seems like a chicken and egg trouble, please rephrase more coherently.
>>
>> I'm sorry, I need to improve my English. :-)
>>
>> I meant that if we ship Dracut with the kernel postinst script
>> (/etc/kernel/postinst), then the next time a linux image is installed,
>> that script will be fired and a Dracut based initramfs will be created
>> for that new kernel.
>>
>> But when we install Dracut for the first time, there is not any Dracut
>> based initramfs installed on the system, and Dracut package's postinst
>> calls actually only call "dracut-update-initramfs -u" which only
>> updates the initramfs images present in the system (in this case no
>> one). So after installing Dracut you won't get a Dracut based image
>> for the kernel you are using, which is not very consistent with the
>> behaviour of creating the initramfs for any new kernel installed
>> afterwards.
>
> no, no this wrong logic.
> first of all the linux image depends on the a linux initramfs creator
> tool and thus this is installed *before* linux-2.6.
>
>> I understand that is the linux kernel package's mission to call the
>> kernel postinst scripts under /etc/kernel/postinst, but... I think we
>> should do something. Maybe make the current linux kernel package call
>> the /etc/kernel/postinst scripts, or maybe call
>> dracut-update-initramfs, which was what I was doing in my original
>> patch... ¿What could be the best solution?
>
> the proposed create seems really wrong, I would nack any postinst
> in debian or escalate as serious bug.
>
> if you want hostile takeover that is up to the local admin
> and only one command away
> update-intramfs-dracut -t -u -k all

Sorry, I didn't think it would be so problematic. I just wanted to
make it "just work" after being installed. After thinking about it, I
realize that I didn't think about a several scenarios such as in an
install using deboostrap.

Thanks a lot for your patience Maximilian,

Jon Ander