From 84f6ffe6af05b9bdd33066254dca57ef4582afe2 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Tue, 29 Nov 2022 12:52:26 +0000
Subject:  Prepare for 1.0.8.1

Signed-off-by: Laurent Bercot <ska@appnovation.com>
---
 src/shutdown/hpr_confirm_hostname.c    | 2 +-
 src/shutdown/hpr_wallv.c               | 2 +-
 src/shutdown/s6-linux-init-hpr.c       | 2 +-
 src/shutdown/s6-linux-init-shutdown.c  | 3 ++-
 src/shutdown/s6-linux-init-shutdownd.c | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/shutdown')

diff --git a/src/shutdown/hpr_confirm_hostname.c b/src/shutdown/hpr_confirm_hostname.c
index 040c2f6..3cb1d29 100644
--- a/src/shutdown/hpr_confirm_hostname.c
+++ b/src/shutdown/hpr_confirm_hostname.c
@@ -9,7 +9,7 @@
 
 #include <skalibs/allreadwrite.h>
 #include <skalibs/bytestr.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 
 #include "hpr.h"
 
diff --git a/src/shutdown/hpr_wallv.c b/src/shutdown/hpr_wallv.c
index 50523c5..083fa7f 100644
--- a/src/shutdown/hpr_wallv.c
+++ b/src/shutdown/hpr_wallv.c
@@ -5,7 +5,7 @@
 #include <utmpx.h>
 
 #include <skalibs/allreadwrite.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/djbunix.h>
 #include <skalibs/posixishard.h>
 
diff --git a/src/shutdown/s6-linux-init-hpr.c b/src/shutdown/s6-linux-init-hpr.c
index 7f3d457..d4fc6e8 100644
--- a/src/shutdown/s6-linux-init-hpr.c
+++ b/src/shutdown/s6-linux-init-hpr.c
@@ -8,7 +8,7 @@
 #include <utmpx.h>
 #include <sys/reboot.h>
 
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/sgetopt.h>
 #include <skalibs/sig.h>
 #include <skalibs/tai.h>
diff --git a/src/shutdown/s6-linux-init-shutdown.c b/src/shutdown/s6-linux-init-shutdown.c
index 011abef..bc30f0c 100644
--- a/src/shutdown/s6-linux-init-shutdown.c
+++ b/src/shutdown/s6-linux-init-shutdown.c
@@ -14,7 +14,7 @@
 #include <skalibs/uint64.h>
 #include <skalibs/types.h>
 #include <skalibs/allreadwrite.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/sgetopt.h>
 #include <skalibs/sig.h>
 #include <skalibs/tai.h>
@@ -181,6 +181,7 @@ static inline void access_control (void)
     fmt[uint32_fmt(fmt, AC_BUFSIZE - 1)] = 0 ;
     strerr_dief4x(1, AC_FILE, " is too big: it needs to be ", fmt, " bytes or less") ;
   }
+  errno = EPIPE ;
   if (allread(fd, buf, st.st_size) < st.st_size)
     strerr_diefu2sys(111, "read ", AC_FILE) ;
   fd_close(fd) ;
diff --git a/src/shutdown/s6-linux-init-shutdownd.c b/src/shutdown/s6-linux-init-shutdownd.c
index ed02721..9b019e5 100644
--- a/src/shutdown/s6-linux-init-shutdownd.c
+++ b/src/shutdown/s6-linux-init-shutdownd.c
@@ -16,7 +16,7 @@
 #include <skalibs/allreadwrite.h>
 #include <skalibs/bytestr.h>
 #include <skalibs/buffer.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/sgetopt.h>
 #include <skalibs/sig.h>
 #include <skalibs/tai.h>
-- 
cgit v1.3.1