Skip to contentSkip to conversation

package/nfs-utils: fix nfs-utils_env.sh path

PATCH New James Hilliard 4 participants 7 messages Oct 3, 2019 – Oct 28, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/nfs-utils: fix nfs-utils_env.sh path

Per upstream commit bf12e1fa9f48e8ee91a2869e69484c70595b5160
https://cdn.kernel.org/pub/linux/utils/nfs-utils/1.3.4/1.3.4-Changelog

Currently nfs-utils_env.sh is installed in a directory that is own by systemd. They requested via https://bugzilla.redhat.com/show_bug.cgi?id=1303113
to move the script into /usr/libexec/nfs-utils

As such we must update the installation path for nfs-utils_env.sh.

---
 package/nfs-utils/nfs-utils.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/nfs-utils/nfs-utils.mk +1 -1
index 9d3e5e7563..cb2caa03f0 100644
@@ -93,7 +93,7 @@ define NFS_UTILS_INSTALL_INIT_SYSTEMD
 		$(TARGET_DIR)/etc/systemd/system/remote-fs.target.wants/nfs-client.target
 
 	$(INSTALL) -D -m 0755 package/nfs-utils/nfs-utils_env.sh \
-		$(TARGET_DIR)/usr/lib/systemd/scripts/nfs-utils_env.sh
+		$(TARGET_DIR)/usr/libexec/nfs-utils/nfs-utils_env.sh
 
 	$(INSTALL) -D -m 0644 package/nfs-utils/nfs-utils_tmpfiles.conf \
 		$(TARGET_DIR)/usr/lib/tmpfiles.d/nfs-utils.conf
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 package/nfs-utils: fix nfs-utils_env.sh path

Quoted 32 lines · James Hilliard

Per upstream commit bf12e1fa9f48e8ee91a2869e69484c70595b5160
https://cdn.kernel.org/pub/linux/utils/nfs-utils/1.3.4/1.3.4-Changelog

Currently nfs-utils_env.sh is installed in a directory that is own by systemd. They requested via https://bugzilla.redhat.com/show_bug.cgi?id=1303113
to move the script into /usr/libexec/nfs-utils

As such we must update the installation path for nfs-utils_env.sh.

---
 package/nfs-utils/nfs-utils.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/nfs-utils/nfs-utils.mk +1 -2
index 9d3e5e7563..cb2caa03f0 100644
@@ -93,7 +93,7 @@ define NFS_UTILS_INSTALL_INIT_SYSTEMD
                $(TARGET_DIR)/etc/systemd/system/remote-fs.target.wants/nfs-client.target
 
        $(INSTALL) -D -m 0755 package/nfs-utils/nfs-utils_env.sh \
-               $(TARGET_DIR)/usr/lib/systemd/scripts/nfs-utils_env.sh
+               $(TARGET_DIR)/usr/libexec/nfs-utils/nfs-utils_env.sh
 
        $(INSTALL) -D -m 0644 package/nfs-utils/nfs-utils_tmpfiles.conf \
                $(TARGET_DIR)/usr/lib/tmpfiles.d/nfs-utils.conf
--

2.20.1

Quoted 4 lines

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

#2 lore raw

PATCH 1/1 package/nfs-utils: fix nfs-utils_env.sh path

In reply to James Hilliard

Hello James,

Quoted 20 lines · On Thu, 3 Oct 2019 08:04:10 -0600 James Hilliard <[email protected]>…

Per upstream commit bf12e1fa9f48e8ee91a2869e69484c70595b5160
https://cdn.kernel.org/pub/linux/utils/nfs-utils/1.3.4/1.3.4-Changelog

Currently nfs-utils_env.sh is installed in a directory that is own by systemd. They requested via https://bugzilla.redhat.com/show_bug.cgi?id=1303113
to move the script into /usr/libexec/nfs-utils

As such we must update the installation path for nfs-utils_env.sh.

---
 package/nfs-utils/nfs-utils.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/nfs-utils/nfs-utils.mk +0 -0
index 9d3e5e7563..cb2caa03f0 100644

package/nfs-utils/nfs-utils.mk define NFS_UTILS_INSTALL_INIT_SYSTEMD · line 96

Quoted 5 lines
package/nfs-utils/nfs-utils.mk +1 -1
@@ -93,7 +93,7 @@ define NFS_UTILS_INSTALL_INIT_SYSTEMD
 		$(TARGET_DIR)/etc/systemd/system/remote-fs.target.wants/nfs-client.target
 
 	$(INSTALL) -D -m 0755 package/nfs-utils/nfs-utils_env.sh \
-		$(TARGET_DIR)/usr/lib/systemd/scripts/nfs-utils_env.sh
+		$(TARGET_DIR)/usr/libexec/nfs-utils/nfs-utils_env.sh

If I get it correctly looking at upstream commit bf12e1fa9f48e8ee91a2869e69484c70595b5160, this script is only used from nfs-config.service, and we are not installing nfs-config.service. So what is the impact ?

Also, could you indicate if this issue is applicable to 2019.02.x, 2019.05.x and 2019.08.x ? I guess it depends on which version of nfs-utils is currently shipped in those branches, and whether they have bf12e1fa9f48e8ee91a2869e69484c70595b5160 or not.

Thanks,

Thomas

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

PATCH 1/1 package/nfs-utils: fix nfs-utils_env.sh path

Quoted 28 lines · Thomas Petazzoni

Hello James,

Quoted 22 lines · On Thu, 3 Oct 2019 08:04:10 -0600 James Hilliard <[email protected]>…

Per upstream commit bf12e1fa9f48e8ee91a2869e69484c70595b5160
https://cdn.kernel.org/pub/linux/utils/nfs-utils/1.3.4/1.3.4-Changelog

Currently nfs-utils_env.sh is installed in a directory that is own by systemd. They requested via https://bugzilla.redhat.com/show_bug.cgi?id=1303113
to move the script into /usr/libexec/nfs-utils

As such we must update the installation path for nfs-utils_env.sh.

---
 package/nfs-utils/nfs-utils.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/nfs-utils/nfs-utils.mk +0 -0
index 9d3e5e7563..cb2caa03f0 100644
@@ -93,7 +93,7 @@ define NFS_UTILS_INSTALL_INIT_SYSTEMD
              $(TARGET_DIR)/etc/systemd/system/remote-fs.target.wants/nfs-client.target
 
Quoted 8 lines

package/nfs-utils/nfs-utils.mk define NFS_UTILS_INSTALL_INIT_SYSTEMD · line 96

Quoted 3 lines
package/nfs-utils/nfs-utils.mk +1 -1
      $(INSTALL) -D -m 0755 package/nfs-utils/nfs-utils_env.sh \
-             $(TARGET_DIR)/usr/lib/systemd/scripts/nfs-utils_env.sh
+             $(TARGET_DIR)/usr/libexec/nfs-utils/nfs-utils_env.sh

If I get it correctly looking at upstream commit bf12e1fa9f48e8ee91a2869e69484c70595b5160, this script is only used from nfs-config.service, and we are not installing nfs-config.service. So what is the impact ?

The package itself handles nfs-config.service installation so we do use it. See:
http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=blob;f=systemd/Makefile.am;h=03f96e93dccf814f7c8aee5cc9a78083231fefb3;hb=188354e57dd8476e66ce30d647180a106da29b88#l8

Quoted 5 lines

Also, could you indicate if this issue is applicable to 2019.02.x, 2019.05.x and 2019.08.x ? I guess it depends on which version of nfs-utils is currently shipped in those branches, and whether they have bf12e1fa9f48e8ee91a2869e69484c70595b5160 or not.

It was broken by buildroot commit 06445ee36dee49555599bc9c963201bce237ab64 so anything before that should be fine.

Quoted 8 lines

Thanks,

Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

#4 lore raw

PATCH 1/1 package/nfs-utils: fix nfs-utils_env.sh path

Quoted 7 lines · On Fri, 4 Oct 2019 14:43:18 +0200 James Hilliard <[email protected]>…
Quoted 4 lines

If I get it correctly looking at upstream commit bf12e1fa9f48e8ee91a2869e69484c70595b5160, this script is only used from nfs-config.service, and we are not installing nfs-config.service. So what is the impact ?

The package itself handles nfs-config.service installation so we do use it. See:
http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=blob;f=systemd/Makefile.am;h=03f96e93dccf814f7c8aee5cc9a78083231fefb3;hb=188354e57dd8476e66ce30d647180a106da29b88#l8

OK.

Quoted 6 lines
Quoted 4 lines

Also, could you indicate if this issue is applicable to 2019.02.x, 2019.05.x and 2019.08.x ? I guess it depends on which version of nfs-utils is currently shipped in those branches, and whether they have bf12e1fa9f48e8ee91a2869e69484c70595b5160 or not.

It was broken by buildroot commit 06445ee36dee49555599bc9c963201bce237ab64 so anything before that should be fine.

OK, so 2019.08.x is affected, but not 2019.05.x and 2019.02.x.

Thanks!

Thomas

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

PATCH 1/1 package/nfs-utils: fix nfs-utils_env.sh path

In reply to James Hilliard
Quoted 8 lines · On Thu, 3 Oct 2019 08:04:10 -0600 James Hilliard <[email protected]>…

Per upstream commit bf12e1fa9f48e8ee91a2869e69484c70595b5160
https://cdn.kernel.org/pub/linux/utils/nfs-utils/1.3.4/1.3.4-Changelog

Currently nfs-utils_env.sh is installed in a directory that is own by systemd. They requested via https://bugzilla.redhat.com/show_bug.cgi?id=1303113
to move the script into /usr/libexec/nfs-utils

Quoted 6 lines

As such we must update the installation path for nfs-utils_env.sh.

---
 package/nfs-utils/nfs-utils.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied to master, thanks.

Thomas

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

PATCH 1/1 package/nfs-utils: fix nfs-utils_env.sh path

In reply to James Hilliard
Quoted 5 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"James" == James Hilliard <[email protected]> writes:

Per upstream commit bf12e1fa9f48e8ee91a2869e69484c70595b5160
https://cdn.kernel.org/pub/linux/utils/nfs-utils/1.3.4/1.3.4-Changelog

Quoted 8 lines

Currently nfs-utils_env.sh is installed in a directory that is own by systemd. They requested via https://bugzilla.redhat.com/show_bug.cgi?id=1303113
to move the script into /usr/libexec/nfs-utils

As such we must update the installation path for nfs-utils_env.sh.

Committed to 2019.08.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard