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

[Petter Reinholdtsen]

Author: pere
Date: 2005-11-12 14:33:46 +0000 (Sat, 12 Nov 2005)
New Revision: 115

Added:
   sysvinit/trunk/debian/patches/62_init_freebsdterm.dpatch
Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/patches/00list
Log:
  * On FreeBSD, set TERM=cons25 in init as the kernel isn't setting
    TERM. (Closes: #335023)

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2005-11-12 14:02:29 UTC (rev 114)
+++ sysvinit/trunk/debian/changelog	2005-11-12 14:33:46 UTC (rev 115)
@@ -23,6 +23,8 @@
     to be incorrect.  Commented out 10_doc_lastb.dpatch from patches/00list.
   * Improve argument handling for init.d scripts.  Based on patch from
     Enrico Zini.
+  * On FreeBSD, set TERM=cons25 in init as the kernel isn't setting
+    TERM. (Closes: #335023)
 
  -- Petter Reinholdtsen <pere at debian.org>  Sat,  8 Oct 2005 17:08:47 +0200
 

Modified: sysvinit/trunk/debian/patches/00list
===================================================================
--- sysvinit/trunk/debian/patches/00list	2005-11-12 14:02:29 UTC (rev 114)
+++ sysvinit/trunk/debian/patches/00list	2005-11-12 14:33:46 UTC (rev 115)
@@ -13,6 +13,7 @@
 50_bootlogd_exitcode
 60_init_race
 61_init_msg
+62_init_freebsdterm
 70_wall_ttyname
 71_wall_hostname
 80_killall_sched

Added: sysvinit/trunk/debian/patches/62_init_freebsdterm.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/62_init_freebsdterm.dpatch	2005-11-12 14:02:29 UTC (rev 114)
+++ sysvinit/trunk/debian/patches/62_init_freebsdterm.dpatch	2005-11-12 14:33:46 UTC (rev 115)
@@ -0,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 62_init_freebsdterm.dpatch by Petter Reinholdtsen
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Make sure TERM is set on FreeBSD.  Closes debian bug #335023.
+
+ at DPATCH@
+diff -ur sysvinit-2.86.ds1.old/src/init.c sysvinit-2.86.ds1/src/init.c
+--- sysvinit-2.86.ds1.old/src/init.c	2004-07-30 14:16:20.000000000 +0200
++++ sysvinit-2.86.ds1/src/init.c	2005-10-21 15:53:03.000000000 +0200
+@@ -685,6 +685,14 @@
+ 		return;
+ 	}
+ 
++#ifdef __FreeBSD_kernel__
++	/* The kernel of FreeBSD expects userland to set TERM.  Usualy, we want
++	"cons25".  Later, gettys might disagree on this (i.e. we're not using
++	syscons) but some boot scripts, like /etc/init.d/xserver-xorg, still
++	need a non-dumb terminal. */
++	putenv ("TERM=cons25");
++#endif
++
+ 	(void) tcgetattr(fd, &tty);
+ 
+ 	tty.c_cflag &= CBAUD|CBAUDEX|CSIZE|CSTOPB|PARENB|PARODD;


Property changes on: sysvinit/trunk/debian/patches/62_init_freebsdterm.dpatch
___________________________________________________________________
Name: svn:executable
   + *