[PR PATCH] mkinitcpio-nfs-utils: fix hook on musl

[PR PATCH] mkinitcpio-nfs-utils: fix hook on musl

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 499 bytes --]

There is a new pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages mkinitcpio-nfs
https://github.com/void-linux/void-packages/pull/49214

mkinitcpio-nfs-utils: fix hook on musl
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

@thypon


A patch file from https://github.com/void-linux/void-packages/pull/49214.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mkinitcpio-nfs-49214.patch --]
[-- Type: text/x-diff, Size: 1479 bytes --]

From 86e611079064f3e8fac70591f114f7fc0d0f3ec9 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 10 Mar 2024 01:46:23 -0500
Subject: [PATCH] mkinitcpio-nfs-utils: fix hook on musl

---
 srcpkgs/mkinitcpio-nfs-utils/files/initcpio-install-net | 2 +-
 srcpkgs/mkinitcpio-nfs-utils/template                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mkinitcpio-nfs-utils/files/initcpio-install-net b/srcpkgs/mkinitcpio-nfs-utils/files/initcpio-install-net
index d4b2d7f0d01320..0d10711386fcce 100644
--- a/srcpkgs/mkinitcpio-nfs-utils/files/initcpio-install-net
+++ b/srcpkgs/mkinitcpio-nfs-utils/files/initcpio-install-net
@@ -10,7 +10,7 @@ build() {
     # nfsmount helper might not be available on musl installations
     if [ -e "/usr/lib/initcpio/nfsmount" ]; then
         add_binary "/usr/lib/initcpio/nfsmount" "/bin/nfsmount"
-    else
+    elif command -v mount.nfs >/dev/null 2>&1; then
         add_binary "mount.nfs"
     fi
 
diff --git a/srcpkgs/mkinitcpio-nfs-utils/template b/srcpkgs/mkinitcpio-nfs-utils/template
index 75b8565158ac31..65287b43280e9b 100644
--- a/srcpkgs/mkinitcpio-nfs-utils/template
+++ b/srcpkgs/mkinitcpio-nfs-utils/template
@@ -1,7 +1,7 @@
 # Template file for 'mkinitcpio-nfs-utils'
 pkgname=mkinitcpio-nfs-utils
 version=0.3
-revision=4
+revision=5
 build_style=gnu-makefile
 depends="mkinitcpio"
 short_desc="Ipconfig and nfsmount tools for NFS root support in mkinitcpio"

Re: mkinitcpio-nfs-utils: fix hook on musl

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 201 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/49214#issuecomment-1987110088

Comment:
cc @ahesford since you added nfsv4 support to the hook

Re: [PR PATCH] [Merged]: mkinitcpio-nfs-utils: fix hook on musl

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 331 bytes --]

There's a merged pull request on the void-packages repository

mkinitcpio-nfs-utils: fix hook on musl
https://github.com/void-linux/void-packages/pull/49214

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

@thypon