Skip to contentSkip to conversation

package/autofs: fix mount, umount and fsck program paths

PATCH New Fabrice Fontaine 4 participants 5 messages Aug 16, 2019 – Sep 2, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/autofs: fix mount, umount and fsck program paths

Fixes:
- https://bugs.buildroot.org/show_bug.cgi?id=11876

---
 package/autofs/autofs.mk | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
package/autofs/autofs.mk +8 -2
index e7c65ef4b0..5de399edf2 100644
@@ -11,11 +11,17 @@ AUTOFS_LICENSE = GPL-2.0+
 AUTOFS_LICENSE_FILES = COPYING COPYRIGHT
 AUTOFS_DEPENDENCIES = host-flex host-bison host-pkgconf host-nfs-utils
 
-# autofs looks on the build machine for the path of modprobe, so tell
-# it explicitly where it will be located on the target.
+# autofs looks on the build machine for the path of modprobe, mount, umount and
+# fsck programs so tell it explicitly where it will be located on the target.
 AUTOFS_CONF_ENV = \
+	ac_cv_path_E2FSCK=/usr/sbin/fsck.ext2 \
+	ac_cv_path_E3FSCK=/usr/sbin/fsck.ext3 \
+	ac_cv_path_E4FSCK=/usr/sbin/fsck.ext4 \
 	ac_cv_path_KRB5_CONFIG=no \
 	ac_cv_path_MODPROBE=/sbin/modprobe \
+	ac_cv_path_MOUNT=/bin/mount \
+	ac_cv_path_MOUNT_NFS=/usr/sbin/mount.nfs \
+	ac_cv_path_UMOUNT=/bin/umount \
 	ac_cv_linux_procfs=yes
 
 # instead of looking in the PATH like any reasonable package, autofs
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 package/autofs: fix mount, umount and fsck program paths

Hello Fabrice,

Quoted 7 lines · On Fri, 16 Aug 2019 11:09:13 +0200 Fabrice Fontaine…

Fixes:
- https://bugs.buildroot.org/show_bug.cgi?id=11876

---
 package/autofs/autofs.mk | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

Applied to master, thanks. However, autofs now has the path to those programs, but they may not necessarily be installed on the target. autofs has no dependency on Busybox, or any other package that would provide mount, umount, mount.nfs, fsck.*, etc. Perhaps this is something that should be investigated? Does autofs need those tools in all situations?

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH 1/1 package/autofs: fix mount, umount and fsck program paths

Quoted 13 lines · Thomas Petazzoni

Hello Fabrice,

Quoted 7 lines · On Fri, 16 Aug 2019 11:09:13 +0200 Fabrice Fontaine…

Fixes:
- https://bugs.buildroot.org/show_bug.cgi?id=11876

---
 package/autofs/autofs.mk | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
Quoted 6 lines

Applied to master, thanks. However, autofs now has the path to those programs, but they may not necessarily be installed on the target. autofs has no dependency on Busybox, or any other package that would provide mount, umount, mount.nfs, fsck.*, etc. Perhaps this is something that should be investigated? Does autofs need those tools in all situations?

mount and umount and modprobe really have to be there or the system is broken.
We don't check for such insanity. In fact, we assume that everything needed for a "normal" system (where "normal" is not exactly specified) is provided by either busybox or something else.

fsck.ext* I covered in my reply to the original patch.

mount.nfs I'm not sure of. It is only used to check the version of mount.nfs,
which is only used under the following comment:

* Check for either a list containing only proximity local hosts
* or a single host entry whose proximity isn't local. If so
* return immediately as we don't want to add probe latency for
* the common case of a single filesystem mount request. *
* But, if the kernel understands text nfs mount options then
* mount.nfs most likely bypasses its probing and lets the kernel
* do all the work. This can lead to long timeouts for hosts that
* are not available so check the kernel version and mount.nfs
* version and probe singleton mounts if the kernel version is
* greater than 2.6.22 and mount.nfs version is greater than 1.1.1.
* But also allow the MOUNT_WAIT configuration parameter to override
* the probing.

I don't really understand what is said here... But apparently, the worst case
is that it's a bit slower in some specific corner case.

Regards,
Arnout

Quoted 5 lines

Best regards,

Thomas

#3 lore raw

PATCH 1/1 package/autofs: fix mount, umount and fsck program paths

In reply to Fabrice Fontaine
Quoted 14 lines · Fabrice Fontaine

Fixes:
- https://bugs.buildroot.org/show_bug.cgi?id=11876

---
 package/autofs/autofs.mk | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
package/autofs/autofs.mk +0 -0
index e7c65ef4b0..5de399edf2 100644
@@ -11,11 +11,17 @@ AUTOFS_LICENSE = GPL-2.0+
 AUTOFS_LICENSE_FILES = COPYING COPYRIGHT

package/autofs/autofs.mk AUTOFS_LICENSE = GPL-2.0+ · line 19

Quoted 10 lines
package/autofs/autofs.mk +5 -2
 AUTOFS_DEPENDENCIES = host-flex host-bison host-pkgconf host-nfs-utils
 
-# autofs looks on the build machine for the path of modprobe, so tell
-# it explicitly where it will be located on the target.
+# autofs looks on the build machine for the path of modprobe, mount, umount and
+# fsck programs so tell it explicitly where it will be located on the target.
 AUTOFS_CONF_ENV = \
+	ac_cv_path_E2FSCK=/usr/sbin/fsck.ext2 \
+	ac_cv_path_E3FSCK=/usr/sbin/fsck.ext3 \
+	ac_cv_path_E4FSCK=/usr/sbin/fsck.ext4 \

I must be blind or something, but e2fsprogs seem to install these in /sbin. Am
I missing something?

Also, as noted by Thomas, these will only exist when e2fsprogs is installed. If
not, automounting any ext2/3/4 will not work because "fsck returned an error".

It would seem to make more sense to me to set

	ac_cv_path_E2FSCK=/sbin/fsck \
	ac_cv_path_E3FSCK=no \
	ac_cv_path_E4FSCK=no \

That way, the fsck wrapper always gets used (if the e3 and e4 versions don't
exist, the e2 version is used regardless of fs type).

Regards,
Arnout

Quoted 9 lines
package/autofs/autofs.mk +3 -0
 	ac_cv_path_KRB5_CONFIG=no \
 	ac_cv_path_MODPROBE=/sbin/modprobe \
+	ac_cv_path_MOUNT=/bin/mount \
+	ac_cv_path_MOUNT_NFS=/usr/sbin/mount.nfs \
+	ac_cv_path_UMOUNT=/bin/umount \
 	ac_cv_linux_procfs=yes
 
 # instead of looking in the PATH like any reasonable package, autofs