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

[Petter Reinholdtsen]

Author: pere
Date: 2009-07-14 19:51:16 +0000 (Tue, 14 Jul 2009)
New Revision: 1462

Added:
   sysvinit/trunk/debian/patches/96_shutdown_acctoff.dpatch
Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/patches/00list
Log:
New patch 96_shutdown_acctoff making sure to call accton with the
argument off during shutdown to stop accounting (Closes: #536574).

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-07-14 19:41:16 UTC (rev 1461)
+++ sysvinit/trunk/debian/changelog	2009-07-14 19:51:16 UTC (rev 1462)
@@ -9,6 +9,8 @@
   * Clean up control file, dropping replaces and conflicts on sysvinit
     packages before oldstable: sysvinit (<< 2.85-1),
     sysv-rc (<< 2.86.ds1-1.2) and sysvinit (<< 2.86.ds1-12).
+  * New patch 96_shutdown_acctoff making sure to call accton with the
+    argument off during shutdown to stop accounting (Closes: #536574).
 
  -- Petter Reinholdtsen <pere at debian.org>  Mon, 13 Jul 2009 00:19:43 +0200
 

Modified: sysvinit/trunk/debian/patches/00list
===================================================================
--- sysvinit/trunk/debian/patches/00list	2009-07-14 19:41:16 UTC (rev 1461)
+++ sysvinit/trunk/debian/patches/00list	2009-07-14 19:51:16 UTC (rev 1462)
@@ -52,3 +52,4 @@
 93_sulogin_fallback
 94_fstab-decode
 95_halt-name
+96_shutdown_acctoff

Added: sysvinit/trunk/debian/patches/96_shutdown_acctoff.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/96_shutdown_acctoff.dpatch	                        (rev 0)
+++ sysvinit/trunk/debian/patches/96_shutdown_acctoff.dpatch	2009-07-14 19:51:16 UTC (rev 1462)
@@ -0,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 96_shutdown_acctoff.dpatch by Petter Reinholdtsen
+
+Debian accton require an argument since at least 2009-07-11.
+
+BTS: #536574
+
+ at DPATCH@
+diff -urNad trunk~/src/shutdown.c trunk/src/shutdown.c
+--- trunk~/src/shutdown.c	2009-07-14 21:47:18.000000000 +0200
++++ trunk/src/shutdown.c	2009-07-14 21:48:51.000000000 +0200
+@@ -331,7 +331,12 @@
+ 	write_wtmp("shutdown", "~~", 0, RUN_LVL, "~~");
+ 
+ 	/* This is for those who have quota installed. */
+-	spawn(1, "accton", NULL);
++	spawn(1, "accton", "off", NULL);
++/* This is an alternative way to disable accounting, saving a fork()
++#if _BSD_SOURCE || (_XOPEN_SOURCE && _XOPEN_SOURCE < 500)
++	if (acct(NULL)) perror("acct: ");
++#endif
++*/
+ 	spawn(1, "quotaoff", "-a", NULL);
+ 
+ 	sync();