[Pkg-kde-commits] rev 1071 - branches/kde-3.4.0/packages/kdebase/debian/patches

[Christopher Martin]

Author: chrsmrtn-guest
Date: 2005-05-15 01:11:42 +0000 (Sun, 15 May 2005)
New Revision: 1071

Modified:
   branches/kde-3.4.0/packages/kdebase/debian/patches/11_genkdmconf.diff
Log:
kdm STILL doesn't completely ignore the installed system when creating
kdmrc. It looks at inittab, meaning whoever builds it will affect the
defaults. Dumb dumb dumb.

This rips out that code, so it always picks "normal" settings (TTYs, etc.).


Modified: branches/kde-3.4.0/packages/kdebase/debian/patches/11_genkdmconf.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/patches/11_genkdmconf.diff	2005-05-15 00:09:31 UTC (rev 1070)
+++ branches/kde-3.4.0/packages/kdebase/debian/patches/11_genkdmconf.diff	2005-05-15 01:11:42 UTC (rev 1071)
@@ -129,3 +129,33 @@
  
  static const char def_background[] =
  "[Desktop0]\n"
+@@ -942,29 +915,6 @@
+ 
+ 	if (maxTTY)
+ 		return;
+-	if (readFile( &it, "/etc/inittab" )) {
+-		usedFile( "/etc/inittab" );
+-		for (p = it.buf; p < it.eof; p = eol + 1) {
+-			for (eol = p; eol < it.eof && *eol != '\n'; eol++);
+-			if (*p != '#') {
+-				if ((ep = mem_mem( p, eol - p, " tty", 4 )) &&
+-				    ep < eol && isdigit( *ep ))
+-				{
+-					if (ep + 1 == eol || isspace( *(ep + 1) ))
+-						tty = *ep - '0';
+-					else if (isdigit( *(ep + 1) ) &&
+-					         (ep + 2 == eol || isspace( *(ep + 2) )))
+-						tty = (*ep - '0') * 10 + (*(ep + 1) - '0');
+-					else
+-						continue;
+-					TTYmask |= 1 << (tty - 1);
+-					if (tty > maxTTY)
+-						maxTTY = tty;
+-				}
+-			}
+-		}
+-		freeBuf( &it );
+-	}
+ 	if (!maxTTY) {
+ 		maxTTY = 6;
+ 		TTYmask = 0x3f;