From 86c99b5be2ff091520decdf1a792e9d06f259c30 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Tue, 10 Nov 2020 23:03:01 +0000
Subject: Fix s6-l-i-m init $@ bug; prepare for 1.0.5.1

---
 NEWS                           | 6 ++++++
 doc/index.html                 | 2 +-
 doc/upgrade.html               | 6 ++++++
 package/info                   | 2 +-
 src/init/s6-linux-init-maker.c | 2 +-
 5 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 90aeab9..4c127ce 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 Changelog for s6-linux-init.
 
+In 1.0.5.1
+----------
+
+ - Bugfixes.
+
+
 In 1.0.5.0
 ----------
 
diff --git a/doc/index.html b/doc/index.html
index 74c23a9..d9e9abb 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -115,7 +115,7 @@ all the other packages against the <em>static</em> version of libskarnet.
 
 <ul>
  <li> The current released version of s6-linux-init is
-<a href="s6-linux-init-1.0.5.0.tar.gz">1.0.5.0</a>. </li>
+<a href="s6-linux-init-1.0.5.1.tar.gz">1.0.5.1</a>. </li>
  <li> Alternatively, you can checkout a copy of the
 <a href="//git.skarnet.org/cgi-bin/cgit.cgi/s6-linux-init/">s6-linux-init
 git repository</a>:
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 397ed86..ff58afe 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,12 @@
 
 <h1> What has changed in s6-linux-init </h1>
 
+<h2> in 1.0.5.1 </h2>
+
+<ul>
+ <li> No functional changes. </li>
+</ul>
+
 <h2> in 1.0.5.0 </h2>
 
 <ul>
diff --git a/package/info b/package/info
index ccfd089..a1011ec 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=s6-linux-init
-version=1.0.5.0
+version=1.0.5.1
 category=admin
 package_macro_name=S6_LINUX_INIT
diff --git a/src/init/s6-linux-init-maker.c b/src/init/s6-linux-init-maker.c
index 35beb3e..f858e5f 100644
--- a/src/init/s6-linux-init-maker.c
+++ b/src/init/s6-linux-init-maker.c
@@ -288,7 +288,7 @@ static inline int stage1_script (buffer *b, char const *data)
   if (inns && buffer_puts(b, " -C") < 0) return 0 ;
   if (nologger && buffer_puts(b, " -B") < 0) return 0 ;
 
-  if (buffer_puts(b, "\n") < 0) return 0 ;
+  if (buffer_puts(b, " -- \"$@\"\n") < 0) return 0 ;
   (void)data ;
   return 1 ;
 
-- 
cgit v1.2.3