From a163eb60bbcedcf0c668064c3bfa1ac9cdee3a3c Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Thu, 11 Dec 2025 18:58:17 +0000
Subject:  fstab2s6rc: doc typo fix; add binddep even for non-bind mounts

---
 doc/fstab2s6rc.html             | 2 +-
 src/s6-linux-utils/fstab2s6rc.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/fstab2s6rc.html b/doc/fstab2s6rc.html
index 31c83e3..8ca85a5 100644
--- a/doc/fstab2s6rc.html
+++ b/doc/fstab2s6rc.html
@@ -33,7 +33,7 @@ effect of mounting these partitions when run by <a href="//skarnet.org/s6-rc/s6-
  <li> Parallelization. Dependencies between the mount points are respected: if <tt>/var</tt>
 and <tt>/var/log</tt> are mount points in <tt>/etc/fstab</tt>, s6-rc will not attempt to
 mount <tt>/var/log</tt> before <tt>/var</tt> is successfully mounted. But apart from this
-necessary serialization, s6-rc will performs in parallel as much as it can. </li>
+necessary serialization, s6-rc will perform in parallel as much as it can. </li>
  <li> Granularity. <tt>mount -a</tt> in the boot sequence treats all the mounts as one
 unit; and although the output of fstab2s6rc can provide a bundle listing all the mounts,
 each mount is available as a separate service. </li>
diff --git a/src/s6-linux-utils/fstab2s6rc.c b/src/s6-linux-utils/fstab2s6rc.c
index d48caaa..14d817a 100644
--- a/src/s6-linux-utils/fstab2s6rc.c
+++ b/src/s6-linux-utils/fstab2s6rc.c
@@ -212,7 +212,7 @@ static inline int add_fs (struct mntent *mnt, genalloc *root, stralloc *sa, uint
   e = process_servicename(sa, mnt->mnt_dir, 0) ;
   if (e) return e ;
   f.binddep = sa->len - 1 ;
-  if (mnt->mnt_fsname[0] == '/' && hasmntopt(mnt, "bind")) adjust_binddep(&f.binddep, mnt->mnt_fsname + 1, genalloc_s(fsent, root), genalloc_len(fsent, root), sa->s) ;
+  if (mnt->mnt_fsname[0] == '/') adjust_binddep(&f.binddep, mnt->mnt_fsname + 1, genalloc_s(fsent, root), genalloc_len(fsent, root), sa->s) ;
   return fstab_insert_mount(&f, root, sa->s) ;
 }
 
-- 
cgit v1.3.1