diff --git a/src/66/66-hpr.c b/src/66/66-hpr.c
index fa0317dc7a1538990a0348e8d5fce681615e53ee..5924dc2b743bc379ec7f6840792eef9bacb31ed8 100644
--- a/src/66/66-hpr.c
+++ b/src/66/66-hpr.c
@@ -120,7 +120,7 @@ int main (int argc, char const *const *argv)
reboot(what == 3 ? RB_AUTOBOOT : what == 2 ? RB_POWER_OFF : RB_HALT_SYSTEM) ;
strerr_diefu1sys(111, "reboot()") ;
}
-
+
if (!tain_now_g()) strerr_warnw1sys("get current time") ;
if (dowtmp)
{
@@ -164,7 +164,7 @@ int main (int argc, char const *const *argv)
memcpy(tlive,live,livelen) ;
memcpy(tlive + livelen,INITCTL,INITCTL_LEN) ;
tlive[livelen + INITCTL_LEN] = 0 ;
- if (!hpr_shutdown(tlive,what, &STAMP, 0))
+ if (!hpr_shutdown(tlive,what, &tain_zero, 0))
strerr_diefu1sys(111, "notify 66-shutdownd") ;
}
return 0 ;
diff --git a/src/66/66-shutdown.c b/src/66/66-shutdown.c
index 38bdb816f56d207bce2b02dac7c10344b0aebbe8..fd0b14da9dc6d67ae7a11fd40f83f7980f2339e8 100644
--- a/src/66/66-shutdown.c
+++ b/src/66/66-shutdown.c
@@ -282,7 +282,16 @@ int main (int argc, char const *const *argv)
}
if (!argc) strerr_dieusage(100,USAGE) ;
parse_time(&when, argv[0]) ;
- if (argv[1]) hpr_wall(argv[1]) ;
+ tain_sub(&when, &when, &STAMP) ;
+ if (argv[1])
+ {
+ size_t len = strlen(argv[1]) ;
+ char msg[sizeof(HPR_WALL_BANNER) + 1 + len] ;
+ memcpy(msg, HPR_WALL_BANNER, sizeof(HPR_WALL_BANNER) - 1) ;
+ msg[sizeof(HPR_WALL_BANNER) - 1] = '\n' ;
+ memcpy(msg + sizeof(HPR_WALL_BANNER), argv[1], len + 1) ;
+ hpr_wall(msg) ;
+ }
if (what < 4)
{
if (gracetime > 300)
diff --git a/src/66/66-shutdownd.c b/src/66/66-shutdownd.c
index 7822fd13f91ff89c8d55ff5a86d3be12c8fcaadc..458924309bfe39948bb320ba561b7663d0475fa6 100644
--- a/src/66/66-shutdownd.c
+++ b/src/66/66-shutdownd.c
@@ -167,6 +167,7 @@ static inline void prepare_shutdown (buffer *b, tain_t *deadline, unsigned int *
if (r == -1) strerr_diefu1sys(111, "read from pipe") ;
if (r < TAIN_PACK + 4) strerr_dief1x(101, "bad shutdown protocol") ;
tain_unpack(pack, deadline) ;
+ tain_add_g(deadline,deadline) ;
uint32_unpack_big(pack + TAIN_PACK, &u) ;
if (u && u <= 300000) *grace_time = u ;
}
@@ -331,7 +332,7 @@ int main (int argc, char const *const *argv, char const *const *envp)
if (sig_ignore(SIGPIPE) == -1)
strerr_diefu1sys(111, "sig_ignore SIGPIPE") ;
buffer_init(&b, &buffer_read, fdr, buf, 64) ;
- tain_now_g() ;
+ tain_now_set_stopwatch_g() ;
tain_add_g(&deadline, &tain_infinite_relative) ;
for (;;)
@@ -369,6 +370,7 @@ int main (int argc, char const *const *argv, char const *const *envp)
kill(-1, SIGTERM) ;
kill(-1, SIGCONT) ;
tain_from_millisecs(&deadline, grace_time) ;
+ tain_now_g() ;
tain_add_g(&deadline, &deadline) ;
deepsleepuntil_g(&deadline) ;
sync() ;
diff --git a/src/66/deps-exe/66-all b/src/66/deps-exe/66-all
index 306db624e775967d5f8dee9157a531ba4d44f70b..bc799f3349039873f5dba6b56a175016ea63b5b0 100644
--- a/src/66/deps-exe/66-all
+++ b/src/66/deps-exe/66-all
@@ -2,3 +2,4 @@ ${LIB66}
-ls6
-loblibs
-lskarnet
+${SPAWN_LIB}
diff --git a/src/66/deps-exe/66-boot b/src/66/deps-exe/66-boot
index 390fc3b50a19ade5209e13428a74ea3806b77192..bc799f3349039873f5dba6b56a175016ea63b5b0 100644
--- a/src/66/deps-exe/66-boot
+++ b/src/66/deps-exe/66-boot
@@ -2,4 +2,4 @@ ${LIB66}
-ls6
-loblibs
-lskarnet
-
+${SPAWN_LIB}
diff --git a/src/66/deps-exe/66-dbctl b/src/66/deps-exe/66-dbctl
index f1e60dad80b6949a291fd1320dd53b5888a8da74..af2429b4f51a3dbb5c595160730daea161685172 100644
--- a/src/66/deps-exe/66-dbctl
+++ b/src/66/deps-exe/66-dbctl
@@ -3,3 +3,5 @@ ${LIB66}
-ls6
-loblibs
-lskarnet
+${SYSCLOCK_LIB}
+${SPAWN_LIB}
diff --git a/src/66/deps-exe/66-hpr b/src/66/deps-exe/66-hpr
index 33e53254472a9c69ae7aaa84e3b59e5a3884c886..d720e509b3ff09e3a86ea3d2ca063dbfe7bf2835 100644
--- a/src/66/deps-exe/66-hpr
+++ b/src/66/deps-exe/66-hpr
@@ -1,6 +1,6 @@
${LIB66}
${LIBUTMPS}
-lskarnet
-${TAINNOW_LIB}
+${SYSCLOCK_LIB}
${SOCKET_LIB}
diff --git a/src/66/deps-exe/66-inservice b/src/66/deps-exe/66-inservice
index 306db624e775967d5f8dee9157a531ba4d44f70b..bc799f3349039873f5dba6b56a175016ea63b5b0 100644
--- a/src/66/deps-exe/66-inservice
+++ b/src/66/deps-exe/66-inservice
@@ -2,3 +2,4 @@ ${LIB66}
-ls6
-loblibs
-lskarnet
+${SPAWN_LIB}
diff --git a/src/66/deps-exe/66-shutdown b/src/66/deps-exe/66-shutdown
index f88daf57e3e8333a814861878080c8d83b3c0d80..aa3691e78655b5f2f0f5a8560495ea6a1d8ecffe 100644
--- a/src/66/deps-exe/66-shutdown
+++ b/src/66/deps-exe/66-shutdown
@@ -1,5 +1,5 @@
${LIB66}
${LIBUTMPS}
-lskarnet
-${TAINNOW_LIB}
+${SYSCLOCK_LIB}
${SOCKET_LIB}
diff --git a/src/66/deps-exe/66-shutdownd b/src/66/deps-exe/66-shutdownd
index ffb45b221994681092a6c2f8a93af1647d2d104f..9fcfb24bbd870483b1852d20b8935460efcbb545 100644
--- a/src/66/deps-exe/66-shutdownd
+++ b/src/66/deps-exe/66-shutdownd
@@ -3,5 +3,5 @@ ${LIB66}
-loblibs
${LIBUTMPS}
-lskarnet
-${TAINNOW_LIB}
+${SYSCLOCK_LIB}
${SOCKET_LIB}
diff --git a/src/66/deps-exe/66-svctl b/src/66/deps-exe/66-svctl
index 306db624e775967d5f8dee9157a531ba4d44f70b..ec930b0468a1ecc85f4399db401081861a34663b 100644
--- a/src/66/deps-exe/66-svctl
+++ b/src/66/deps-exe/66-svctl
@@ -2,3 +2,4 @@ ${LIB66}
-ls6
-loblibs
-lskarnet
+${SYSCLOCK_LIB}
diff --git a/src/66/deps-exe/66-tree b/src/66/deps-exe/66-tree
index f1e60dad80b6949a291fd1320dd53b5888a8da74..c34874a1dc66e9c236cd245e418e3c5111d662ed 100644
--- a/src/66/deps-exe/66-tree
+++ b/src/66/deps-exe/66-tree
@@ -3,3 +3,4 @@ ${LIB66}
-ls6
-loblibs
-lskarnet
+${SPAWN_LIB}
diff --git a/src/lib66/ssexec_svctl.c b/src/lib66/ssexec_svctl.c
index 77e8671d2507f2bcce965119fa42dd8b3dcc6c2b..da7474d85d1c2b77c6e97f6f0edfd06a2cb0e26f 100644
--- a/src/lib66/ssexec_svctl.c
+++ b/src/lib66/ssexec_svctl.c
@@ -648,7 +648,7 @@ int ssexec_svctl(int argc, char const *const *argv,char const *const *envp,ssexe
//ttmain = tain_infinite_relative ;
tain_from_millisecs(&ttmain,tsv_g) ;
- tain_now_g() ;
+ tain_now_set_stopwatch_g() ;
tain_add_g(&ttmain,&ttmain) ;
int spfd = selfpipe_init() ;
diff --git a/src/lib66/svc_init.c b/src/lib66/svc_init.c
index 31a7447cfacb51b1e45df855907202e178629a71..752ed17319da7ae8f424c856a4b59657cc1e3752 100644
--- a/src/lib66/svc_init.c
+++ b/src/lib66/svc_init.c
@@ -51,7 +51,7 @@ int svc_init(ssexec_t *info,char const *src, genalloc *ga)
ss_state_t sta = STATE_ZERO ;
tain_t deadline ;
- tain_now_g() ;
+ tain_now_set_stopwatch_g() ;
tain_addsec(&deadline,&STAMP,2) ;
if (!ftrigr_startf(&fifo, &deadline, &STAMP))