Merge remote-tracking branch 'mariner/master'

Signed-off-by: Ian Jackson <ian.jackson@citrix.com>

diff --git a/cprogs/really.c b/cprogs/really.c
index ef2fb64dcb94f23b3801b297f8d7b1b7666fd681..3183e500746d9196c428f639e56a6a823df62d9e 100644 (file)
--- a/cprogs/really.c
+++ b/cprogs/really.c
@@ -101,9 +101,14 @@ static const struct cmdinfo cmdinfos[]= {
 #ifdef REALLY_CHECK_FILE
 static int checkroot(void) {
   int r;
-  r= access(REALLY_CHECK_FILE,W_OK);
-  if (r) return -1;
-  return 0;
+  r= access(REALLY_CHECK_FILE,   W_OK);
+  if (!r) return 0;
+#ifdef REALLY_CHECK_FILE_2
+  r= access(REALLY_CHECK_FILE_2, W_OK);
+  if (!r) return 0;
+  /* If all fails we return the errno from file _2 */
+#endif REALLY_CHECK_FILE_2
+  return -1;
 }
 #endif
 #ifdef REALLY_CHECK_GID

diff --git a/debian/changelog b/debian/changelog
index 56032aa3709edd3a84f3d764495ddb09c912d801..889d53241ec2878290e476cb74c90dc8ab154472 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-chiark-utils (6.0.5~citrix2~) unstable; urgency=medium
+chiark-utils (6.1.0~iwj1+citrix2~) unstable; urgency=medium
 
   * WIP git-cache-proxy gc fix
 
@@ -11,6 +11,13 @@ chiark-utils (6.0.5~citrix1) unstable; urgency=medium
 
  -- Ian Jackson <ian.jackson@citrix.com>  Fri, 20 Dec 2019 17:50:02 +0000
 
+chiark-utils (6.1.0~iwj1) unstable; urgency=medium
+
+  * really: Writeability of rc.local suffices, too.
+    (Non-sysvinit compatibility.)
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Mon, 12 Aug 2019 10:59:02 +0100
+
 chiark-utils (6.0.4) unstable; urgency=medium
 
   * sync-accounts: Fix perl syntax error.  Closes:#865985.

diff --git a/settings.make b/settings.make
index 495b2b3f855b47d716d59929186d61ee5079bdf4..27969c14f319761ab1cf37b96cb43f9a4e55aff2 100644 (file)
--- a/settings.make
+++ b/settings.make
@@ -20,7 +20,8 @@
 # website at www.fsf.org, or the GNU Project website at www.gnu.org.
 
 CONFIG_CPPFLAGS=       -DRWBUFFER_SIZE_MB=$(RWBUFFER_SIZE_MB) \
-                       -DREALLY_CHECK_FILE='"/etc/inittab"'
+                       -DREALLY_CHECK_FILE='"/etc/inittab"' \
+                       -DREALLY_CHECK_FILE_2='"/etc/rc.local"'
 
 CC=            gcc
 CFLAGS=                $(WARNINGS) $(OPTIMISE) $(DEBUG) $(CMDLINE_CFLAGS)