[Pkg-sysvinit-commits] r699 - sysvinit/trunk/debian/patches

[Thomas Hood]

Author: jdthood-guest
Date: 2006-01-24 21:13:07 +0000 (Tue, 24 Jan 2006)
New Revision: 699

Modified:
   sysvinit/trunk/debian/patches/25_last_sanify.dpatch
Log:
Fix rest of bug

Modified: sysvinit/trunk/debian/patches/25_last_sanify.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/25_last_sanify.dpatch	2006-01-24 21:00:32 UTC (rev 698)
+++ sysvinit/trunk/debian/patches/25_last_sanify.dpatch	2006-01-24 21:13:07 UTC (rev 699)
@@ -1,13 +1,14 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 25_last_sanify.dpatch by  <jdthood at yahoo.co.uk>
+## 25_last_sanify.dpatch by Thomas Hood <jdthood at yahoo.co.uk>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Do print end time on "reboot" line
+## DP: (Closes: #58119)
 
 @DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./src/last.c /tmp/dpep-work.Tn7lf6/trunk/src/last.c
+diff -urNad --exclude=CVS --exclude=.svn ./src/last.c /tmp/dpep-work.bMPzBG/trunk/src/last.c
 --- ./src/last.c	2005-12-02 17:22:57.000000000 +0100
-+++ /tmp/dpep-work.Tn7lf6/trunk/src/last.c	2006-01-24 21:59:09.000000000 +0100
++++ /tmp/dpep-work.bMPzBG/trunk/src/last.c	2006-01-24 22:12:35.000000000 +0100
 @@ -418,7 +418,6 @@
  			sprintf(length, "- no logout");
  			break;
@@ -16,3 +17,20 @@
  			break;
  		case R_TIMECHANGE:
  			logouttime[0] = 0;
+@@ -752,7 +751,7 @@
+ 		case SHUTDOWN_TIME:
+ 			if (extended) {
+ 				strcpy(ut.ut_line, "system down");
+-				quit = list(&ut, lastdown, R_NORMAL);
++				quit = list(&ut, lastboot, R_NORMAL);
+ 			}
+ 			lastdown = lastrch = ut.ut_time;
+ 			down = 1;
+@@ -769,6 +768,7 @@
+ 		case BOOT_TIME:
+ 			strcpy(ut.ut_line, "system boot");
+ 			quit = list(&ut, lastdown, R_REBOOT);
++			lastboot = ut.ut_time;
+ 			down = 1;
+ 			break;
+ 		case RUN_LVL: