[Pkg-sysvinit-commits] r1921 - in sysvinit/trunk/debian: . startpar/patches

[Petter Reinholdtsen]

Author: pere
Date: 2010-06-07 18:24:35 +0000 (Mon, 07 Jun 2010)
New Revision: 1921

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/startpar/patches/05_pri_kdm_gdm.patch
Log:
Drop special handling for udev-mtab.  Not needed to get kernel module loading done early.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2010-06-07 18:20:48 UTC (rev 1920)
+++ sysvinit/trunk/debian/changelog	2010-06-07 18:24:35 UTC (rev 1921)
@@ -6,8 +6,8 @@
   * New startpar patch 07_nocrash_missing_arg.patch to make sure
     missing argument (-a) do not cause startpar to segfault.
   * Change startpar patch 05_pri_kdm_gdm.patch to also give priority
-    to udev and udev-mtab to get kernel module loading started as
-    early as possible during boot.  Based on idea from live-net-startpar.
+    to udev to get kernel module loading started as early as possible 
+    during boot.  Based on idea from live-net-startpar.
   * Make init.d/bootlogs soft depend on gdm3 while we wait for gdm3 to
     provide $x-display-manager.
   * Make sure to create /dev/pts/ and /dev/shm/ in mountdevsub.sh

Modified: sysvinit/trunk/debian/startpar/patches/05_pri_kdm_gdm.patch
===================================================================
--- sysvinit/trunk/debian/startpar/patches/05_pri_kdm_gdm.patch	2010-06-07 18:20:48 UTC (rev 1920)
+++ sysvinit/trunk/debian/startpar/patches/05_pri_kdm_gdm.patch	2010-06-07 18:24:35 UTC (rev 1921)
@@ -6,14 +6,13 @@
 ===================================================================
 --- a/makeboot.c	(revision 1780)
 +++ b/makeboot.c	(working copy)
-@@ -236,7 +236,11 @@
+@@ -236,7 +236,10 @@
  	for (node = tree_list; node; node = node->next) {
  		int importance = 0;
  
 -		if (! strcmp(node->name, "xdm"))
 +		if (! strcmp(node->name, "xdm")
 +                    || ! strcmp(node->name, "udev")
-+                    || ! strcmp(node->name, "udev-mtab")
 +                    || ! strcmp(node->name, "gdm")
 +                    || ! strcmp(node->name, "kdm"))
  			importance = 100;