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

Petter Reinholdtsen pere at alioth.debian.org
Fri Jun 4 22:34:07 UTC 2010


Author: pere
Date: 2010-06-04 22:34:04 +0000 (Fri, 04 Jun 2010)
New Revision: 1913

Added:
   sysvinit/trunk/debian/startpar/patches/06_stdin_notty.patch
Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/startpar/patches/series
Log:
New startpar patch 06_stdin_notty.patch to make sure startpar run
programs also when stdin is a pine, to get it working on OpenVZ
(Closes: #584102)

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2010-05-30 12:58:42 UTC (rev 1912)
+++ sysvinit/trunk/debian/changelog	2010-06-04 22:34:04 UTC (rev 1913)
@@ -1,3 +1,11 @@
+sysvinit (2.88dsf-8) UNRELEASED; urgency=low
+
+  * New startpar patch 06_stdin_notty.patch to make sure startpar run
+    programs also when stdin is a pine, to get it working on OpenVZ
+    (Closes: #584102)
+
+ -- Petter Reinholdtsen <pere at debian.org>  Sat, 05 Jun 2010 00:33:27 +0200
+
 sysvinit (2.88dsf-7) unstable; urgency=low
 
   [ Petter Reinholdtsen ]

Added: sysvinit/trunk/debian/startpar/patches/06_stdin_notty.patch
===================================================================
--- sysvinit/trunk/debian/startpar/patches/06_stdin_notty.patch	                        (rev 0)
+++ sysvinit/trunk/debian/startpar/patches/06_stdin_notty.patch	2010-06-04 22:34:04 UTC (rev 1913)
@@ -0,0 +1,41 @@
+Purpose: Make sure startpar do not fail when booting OpenVZ machines,
+	 where stdin/stdout is a pipe and not a tty.  If no tty is
+	 used, run all scripts sequencially, as if they were interactive.
+	 A better approach would be to get parallel booting working in
+	 such setting.
+Fixes:   #584102
+Authour: Petter Reinholdtsen
+Status:  Not applied upstream
+
+--- a/startpar.c	(revision 1898)
++++ b/startpar.c	(working copy)
+@@ -631,6 +631,7 @@
+   char *prev_level = getenv("PREVLEVEL");
+   char *run_level = getenv("RUNLEVEL");
+   char *splashopt = 0;
++  int notty = 0;
+ 
+   (void)signal(SIGUSR1, sighandler_preload);
+   (void)signal(SIGUSR2, sighandler_nopreload);
+@@ -813,8 +814,7 @@
+ 
+   if (tcgetattr(0, &tio))
+     {
+-      perror("tcgetattr");
+-      exit(1);
++      notty = 1;
+     }
+   if (ioctl(0, TIOCGWINSZ, &wz) == 0)
+     wzok = 1;
+@@ -904,6 +904,11 @@
+ 		  }
+ 		  p->splashadd = calcsplash(num, argc, splashopt);
+ 		  p->num = num++;
++                  if (notty)
++                    {
++                      interactive_task = p;     /* no tty, treat as interactive */
++                      continue;
++                    }
+ 		  if (interactive_task)
+ 		    continue;			/* don't start this here */
+ 		  run(p);

Modified: sysvinit/trunk/debian/startpar/patches/series
===================================================================
--- sysvinit/trunk/debian/startpar/patches/series	2010-05-30 12:58:42 UTC (rev 1912)
+++ sysvinit/trunk/debian/startpar/patches/series	2010-06-04 22:34:04 UTC (rev 1913)
@@ -4,3 +4,4 @@
 03_o_direct_undef.patch 
 04_makeboot_loop_upper_bound.patch
 05_pri_kdm_gdm.patch
+06_stdin_notty.patch




More information about the Pkg-sysvinit-commits mailing list