Package: module-init-tools
Version: 3.4-1
Severity: wishlist
Tags: patch
Hi,
I've been testing[1] the boot time and found that using version 3.5
improves it by approx 6 seconds (4 just using the 3.5 version and 2
from using the new binary dependency files).
It would be great if you provide a 3.5 package, at least for
experimental. There is only one patch in the 3.4-1 diff that does not apply
correctly. The others patches apply with some offset. Attached you can find
two patches to fix both things.
Regards,
Santi
[1]
http://lists.alioth.debian.org/pipermail/debian-eeepc-devel/2008-November/001623.html
-- System Information:
Debian Release: lenny/sid
APT prefers testing
APT policy: (500, 'testing'), (200, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)
Kernel: Linux 2.6.28-rc5 (SMP w/1 CPU core)
Locale: LANG=ca_ES.UTF-8, LC_CTYPE=ca_ES.UTF-8 (charmap=ANSI_X3.4-1968)
(ignored: LC_ALL set to C)
Shell: /bin/sh linked to /bin/dash
Versions of packages module-init-tools depends on:
ii libc6 2.7-16 GNU C Library: Shared libraries
ii lsb-base 3.2-20 Linux Standard Base 3.2 init scrip
module-init-tools recommends no packages.
module-init-tools suggests no packages.
-- no debconf information
>From d1e2e7d58b432b2f956a5579ea651f425e24b1d2 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Santi=20B=C3=A9jar?= <[EMAIL PROTECTED]>
Date: Sat, 22 Nov 2008 15:50:11 +0100
Subject: [PATCH] Update patch ignore_arch_directory
---
debian/patches/ignore_arch_directory | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/debian/patches/ignore_arch_directory
b/debian/patches/ignore_arch_directory
index 8c7707c..a9b1080 100644
--- a/debian/patches/ignore_arch_directory
+++ b/debian/patches/ignore_arch_directory
@@ -1,18 +1,20 @@
-diff -ruN module-init-tools-3.3-pre11.orig/doc/modprobe.sgml
module-init-tools-3.3-pre11/doc/modprobe.sgml
---- module-init-tools-3.3-pre11.orig/doc/modprobe.sgml 2007-03-22
08:36:02.000000000 +0100
-+++ module-init-tools-3.3-pre11/doc/modprobe.sgml 2007-05-20
19:19:27.000000000 +0200
-@@ -78,6 +78,7 @@
- (see <citerefentry>
- <refentrytitle>modprobe.conf</refentrytitle><manvolnum>5</manvolnum>
- </citerefentry>).
+Index: module-init-tools-3.5/doc/modprobe.sgml
+===================================================================
+--- module-init-tools-3.5.orig/doc/modprobe.sgml 2008-11-22
14:36:04.000000000 +0100
++++ module-init-tools-3.5/doc/modprobe.sgml 2008-11-22 15:48:38.000000000
+0100
+@@ -80,6 +80,7 @@
+ </citerefentry>). <command>modprobe</command> will also use module
+ options specified on the kernel command line in the form of
+ <module>.option>.
+ All files in the \fI/etc/modprobe.d/arch/\fR directory are ignored.
</para>
<para>
Note that this version of <command>modprobe</command> does not
-diff -ruN module-init-tools-3.3-pre11.orig/modprobe.c
module-init-tools-3.3-pre11/modprobe.c
---- module-init-tools-3.3-pre11.orig/modprobe.c 2007-05-20
19:19:40.000000000 +0200
-+++ module-init-tools-3.3-pre11/modprobe.c 2007-05-20 19:18:24.000000000
+0200
-@@ -1211,6 +1211,10 @@
+Index: module-init-tools-3.5/modprobe.c
+===================================================================
+--- module-init-tools-3.5.orig/modprobe.c 2008-11-22 15:48:32.000000000
+0100
++++ module-init-tools-3.5/modprobe.c 2008-11-22 15:48:38.000000000 +0100
+@@ -1266,6 +1266,10 @@
DIR *dir;
int ret = 0;
--
1.6.0.rc1.27.g9b6bf
>From 32dcb24e89c071c9db4a8354bd157463a9595ec7 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Santi=20B=C3=A9jar?= <[EMAIL PROTECTED]>
Date: Sat, 22 Nov 2008 15:55:33 +0100
Subject: [PATCH] Refresh quilt patches
---
debian/patches/blacklist-warn.diff | 8 +++++---
debian/patches/fix_empty_options | 8 +++++---
debian/patches/runparts_like_names | 15 ++++++++-------
3 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/debian/patches/blacklist-warn.diff b/debian/patches/blacklist-warn.diff
index 08c1cae..137b57e 100644
--- a/debian/patches/blacklist-warn.diff
+++ b/debian/patches/blacklist-warn.diff
@@ -1,6 +1,8 @@
---- a/modprobe.c 2005-08-22 10:10:22.000000000 +0000
-+++ b/modprobe.c 2005-08-22 15:49:51.000000000 +0000
-@@ -725,8 +725,10 @@
+Index: module-init-tools-3.5/modprobe.c
+===================================================================
+--- module-init-tools-3.5.orig/modprobe.c 2008-11-22 15:49:10.000000000 +0100
++++ module-init-tools-3.5/modprobe.c 2008-11-22 15:51:28.000000000 +0100
+@@ -692,8 +692,10 @@
find_blacklist(const char *modname, const struct module_blacklist *blacklist)
{
while (blacklist) {
diff --git a/debian/patches/fix_empty_options b/debian/patches/fix_empty_options
index 27ea7c9..8ae43c2 100644
--- a/debian/patches/fix_empty_options
+++ b/debian/patches/fix_empty_options
@@ -1,6 +1,8 @@
---- a/modprobe.c
-+++ b/modprobe.c
-@@ -1309,6 +1309,9 @@ static char **merge_args(char *args, cha
+Index: module-init-tools-3.5/modprobe.c
+===================================================================
+--- module-init-tools-3.5.orig/modprobe.c 2008-11-22 15:51:41.000000000 +0100
++++ module-init-tools-3.5/modprobe.c 2008-11-22 15:51:45.000000000 +0100
+@@ -1462,6 +1462,9 @@
newargs[num_env] = arg;
}
diff --git a/debian/patches/runparts_like_names b/debian/patches/runparts_like_names
index 6db86cd..049438c 100644
--- a/debian/patches/runparts_like_names
+++ b/debian/patches/runparts_like_names
@@ -1,6 +1,7 @@
-diff -ruN module-init-tools-3.1-pre5.orig/modprobe.c module-init-tools-3.1-pre5/modprobe.c
---- module-init-tools-3.1-pre5.orig/modprobe.c 2004-07-21 01:21:36.000000000 +0200
-+++ module-init-tools-3.1-pre5/modprobe.c 2004-07-21 01:21:32.000000000 +0200
+Index: module-init-tools-3.5/modprobe.c
+===================================================================
+--- module-init-tools-3.5.orig/modprobe.c 2008-11-22 15:51:38.000000000 +0100
++++ module-init-tools-3.5/modprobe.c 2008-11-22 15:51:41.000000000 +0100
@@ -38,6 +38,7 @@
#include <asm/unistd.h>
#include <sys/wait.h>
@@ -9,7 +10,7 @@ diff -ruN module-init-tools-3.1-pre5.orig/modprobe.c module-init-tools-3.1-pre5/
#define streq(a,b) (strcmp((a),(b)) == 0)
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
-@@ -1052,6 +1053,20 @@
+@@ -1252,6 +1253,20 @@
return 1;
}
@@ -28,11 +29,11 @@ diff -ruN module-init-tools-3.1-pre5.orig/modprobe.c module-init-tools-3.1-pre5/
+}
+
/* Simple format, ignore lines starting with #, one command per line.
- Returns NULL or resolved alias. */
+ Returns true or false. */
static int read_config(const char *filename,
-@@ -1074,7 +1089,7 @@
+@@ -1275,7 +1290,7 @@
+ if (dir) {
struct dirent *i;
-
while ((i = readdir(dir)) != NULL) {
- if (!streq(i->d_name,".") && !streq(i->d_name,"..")) {
+ if (valid_file_name(i->d_name)) {
--
1.6.0.rc1.27.g9b6bf
