[Pkg-lustre-svn-commit] r304 - in /trunk/debian/patches: 00list 2.6.21-sysctl.dpatch 2.6.21-sysctl.patch

[goswin-guest at users.alioth.debian.org]

Author: goswin-guest
Date: Thu Sep 13 13:37:38 2007
New Revision: 304

URL: http://svn.debian.org/wsvn/pkg-lustre/?sc=1&rev=304
Log:
Update sysctl patch for 1.6.2 and add it to the patch list.


Added:
    trunk/debian/patches/2.6.21-sysctl.dpatch   (with props)
Removed:
    trunk/debian/patches/2.6.21-sysctl.patch
Modified:
    trunk/debian/patches/00list

Modified: trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/00list?rev=304&op=diff
==============================================================================
--- trunk/debian/patches/00list (original)
+++ trunk/debian/patches/00list Thu Sep 13 13:37:38 2007
@@ -17,6 +17,7 @@
 no-m64.dpatch
 autogen.sh.dpatch
 tex2pdf.dpatch
+2.6.21-sysctl.dpatch
 
 # Debian patches
 autogen-run.dpatch

Added: trunk/debian/patches/2.6.21-sysctl.dpatch
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/2.6.21-sysctl.dpatch?rev=304&op=file
==============================================================================
--- trunk/debian/patches/2.6.21-sysctl.dpatch (added)
+++ trunk/debian/patches/2.6.21-sysctl.dpatch Thu Sep 13 13:37:38 2007
@@ -1,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## insert_proc.dpatch by Goswin von Brederlow <brederlo at informatik.uni-tuebingen.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch from Q-Leap Networks
+## DP: 2.6.21+ requires the directories to be created before adding entries
+
+ at DPATCH@
+diff -urNad lustre-1.6.2~/lnet/libcfs/linux/linux-proc.c lustre-1.6.2/lnet/libcfs/linux/linux-proc.c
+--- lustre-1.6.2~/lnet/libcfs/linux/linux-proc.c	2007-08-02 10:30:13.000000000 +0200
++++ lustre-1.6.2/lnet/libcfs/linux/linux-proc.c	2007-09-13 15:32:58.952283099 +0200
+@@ -239,9 +239,19 @@
+ {
+         struct proc_dir_entry *ent;
+ 
++        ent = proc_mkdir("sys/lnet", NULL);
++        if (ent == NULL) {
++                CERROR("couldn't create /proc/sys/lnet \n");
++                return -1;
++        }
++
+ #ifdef CONFIG_SYSCTL
+         if (!lnet_table_header)
+                 lnet_table_header = cfs_register_sysctl_table(top_table, 0);
++        if (!lnet_table_header) {
++                CERROR("registering top_table failed\n");
++                return -1;
++        }
+ #endif
+ 
+         ent = create_proc_entry("sys/lnet/dump_kernel", 0, NULL);

Propchange: trunk/debian/patches/2.6.21-sysctl.dpatch
------------------------------------------------------------------------------
    svn:executable = *