mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-25 07:08:13 -07:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
31 lines
1.0 KiB
Diff
31 lines
1.0 KiB
Diff
Make boot time detection failures non-fatal. Taken from PLD Linux
|
|
|
|
Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=468444
|
|
PLD bug: https://bugs.launchpad.net/pld-linux/+bug/1034364
|
|
Patch: https://github.com/pld-linux/tmpwatch/blob/master/tmpwatch-boottime.patch
|
|
|
|
--- tmpwatch-2.11/tmpwatch.c~
|
|
+++ tmpwatch-2.11/tmpwatch.c
|
|
@@ -666,9 +666,11 @@
|
|
time_t boot_time;
|
|
|
|
if (clock_gettime(CLOCK_REALTIME, &real_clock) != 0
|
|
- || clock_gettime(CLOCK_BOOTTIME, &boot_clock) != 0)
|
|
- message(LOG_FATAL, "Error determining boot time: %s\n",
|
|
+ || clock_gettime(CLOCK_BOOTTIME, &boot_clock) != 0) {
|
|
+ message(LOG_DEBUG, "Error determining boot time: %s\n",
|
|
strerror(errno));
|
|
+ socket_kill_time = 0; /* Never remove sockets */
|
|
+ } else {
|
|
boot_time = real_clock.tv_sec - boot_clock.tv_sec;
|
|
if (real_clock.tv_nsec < boot_clock.tv_nsec)
|
|
boot_time--;
|
|
@@ -677,6 +679,7 @@
|
|
boot_time -= 2;
|
|
|
|
socket_kill_time = boot_time - grace_seconds;
|
|
+ }
|
|
#else
|
|
socket_kill_time = 0; /* Never remove sockets */
|
|
#endif
|