summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-08-03 16:43:39 +0000
committerGerrit Code Review <review@openstack.org>2018-08-03 16:43:39 +0000
commit8f66ecf323b3c2eb78490609af877454198e0e89 (patch)
tree4fe5cd055b9dbca71d539505ab1ac655c2d9efdf
parent4651af29422b4834e1444f90d3554cef2e2c362c (diff)
parentc815daddaeca104438539f19779535ebd5631694 (diff)
Merge "Remove package sysvinit."
-rw-r--r--sysvinit/sysvinit/log-start-completion-of-init-steps.patch27
-rw-r--r--sysvinit/sysvinit/log_timestamp.patch35
2 files changed, 0 insertions, 62 deletions
diff --git a/sysvinit/sysvinit/log-start-completion-of-init-steps.patch b/sysvinit/sysvinit/log-start-completion-of-init-steps.patch
deleted file mode 100644
index ba1b2e1..0000000
--- a/sysvinit/sysvinit/log-start-completion-of-init-steps.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1---
2 rc | 7 +++++++
3 1 file changed, 7 insertions(+)
4
5--- a/rc
6+++ b/rc
7@@ -41,6 +41,7 @@ startup_progress() {
8 startup() {
9 # Handle verbosity
10 [ "$VERBOSE" = very ] && echo "INIT: Running $@..."
11+ logger "INIT: Running $@..."
12
13 case "$1" in
14 *.sh)
15@@ -56,6 +57,12 @@ startup() {
16 "$@"
17 ;;
18 esac
19+ if [ $? -eq 0 ] ; then
20+ logger "INIT: Running $@ PASSED"
21+ else
22+ logger "INIT: Running $@ FAILED"
23+ fi
24+
25 startup_progress
26 }
27
diff --git a/sysvinit/sysvinit/log_timestamp.patch b/sysvinit/sysvinit/log_timestamp.patch
deleted file mode 100644
index 9e96e73..0000000
--- a/sysvinit/sysvinit/log_timestamp.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1---
2 sysvinit-2.88dsf/src/bootlogd.c | 13 +++++++++++--
3 1 file changed, 11 insertions(+), 2 deletions(-)
4
5--- a/sysvinit-2.88dsf/src/bootlogd.c
6+++ b/sysvinit-2.88dsf/src/bootlogd.c
7@@ -352,17 +352,26 @@ int consolename(char *res, int rlen)
8 void writelog(FILE *fp, unsigned char *ptr, int len)
9 {
10 time_t t;
11+ struct timespec ts;
12 char *s;
13 char tmp[8];
14+ char time_buf[64];
15 int olen = len;
16 int dosync = 0;
17 int tlen;
18+ int pos;
19
20 while (len > 0) {
21 tmp[0] = 0;
22 if (didnl) {
23- time(&t);
24- s = ctime(&t);
25+ clock_gettime(CLOCK_REALTIME, &ts);
26+ pos = strftime(time_buf, sizeof(time_buf), "%FT%T", localtime(&ts.tv_sec));
27+ if (pos > 0) {
28+ snprintf(&time_buf[pos], sizeof(time_buf) - pos, ".%03ld", ts.tv_nsec/1000000);
29+ s = time_buf;
30+ }
31+ else
32+ s = ctime(&ts.tv_sec);
33 fprintf(fp, "%.24s: ", s);
34 didnl = 0;
35 }