commit: 6999ece65148c52357bee19b2dc766262708d4a4 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Mon Feb 26 16:42:09 2024 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Mon Feb 26 16:43:59 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6999ece6
net-fs/nfs-utils: remove 'need portmap' from init scripts (-nfsv3) Closes: https://bugs.gentoo.org/925459 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> net-fs/nfs-utils/files/nfs.initd | 3 ++- net-fs/nfs-utils/files/nfsclient.initd | 3 ++- net-fs/nfs-utils/files/rpc.gssd.initd | 3 ++- net-fs/nfs-utils/files/rpc.idmapd.initd | 3 ++- net-fs/nfs-utils/files/rpc.svcgssd.initd | 3 ++- ...{nfs-utils-2.6.4-r10.ebuild => nfs-utils-2.6.4-r11.ebuild} | 11 ++++++++--- 6 files changed, 18 insertions(+), 8 deletions(-) diff --git a/net-fs/nfs-utils/files/nfs.initd b/net-fs/nfs-utils/files/nfs.initd index 7c1de560d1da..88a13a85db38 100644 --- a/net-fs/nfs-utils/files/nfs.initd +++ b/net-fs/nfs-utils/files/nfs.initd @@ -24,7 +24,8 @@ depend() { }' /etc/exports /etc/exports.d/*.exports 2>/dev/null )" config /etc/exports /etc/exports.d/*.exports - need portmap rpc.statd ${myneed} ${NFS_NEEDED_SERVICES} + need portmap + need rpc.statd ${myneed} ${NFS_NEEDED_SERVICES} use ypbind net dns rpc.rquotad rpc.idmapd rpc.svcgssd after quota } diff --git a/net-fs/nfs-utils/files/nfsclient.initd b/net-fs/nfs-utils/files/nfsclient.initd index 6724e913d10f..e278cbde0539 100644 --- a/net-fs/nfs-utils/files/nfsclient.initd +++ b/net-fs/nfs-utils/files/nfsclient.initd @@ -14,7 +14,8 @@ depend() { done fi config /etc/fstab - need portmap rpc.statd rpc.idmapd ${myneed} + need portmap + need rpc.statd rpc.idmapd ${myneed} use ypbind dns } diff --git a/net-fs/nfs-utils/files/rpc.gssd.initd b/net-fs/nfs-utils/files/rpc.gssd.initd index 445d44c44473..7bfe920b3d54 100644 --- a/net-fs/nfs-utils/files/rpc.gssd.initd +++ b/net-fs/nfs-utils/files/rpc.gssd.initd @@ -6,7 +6,8 @@ depend() { use ypbind net - need portmap rpc.pipefs + need portmap + need rpc.pipefs after quota } diff --git a/net-fs/nfs-utils/files/rpc.idmapd.initd b/net-fs/nfs-utils/files/rpc.idmapd.initd index 61cfd4de2e73..9cb36000b5ed 100644 --- a/net-fs/nfs-utils/files/rpc.idmapd.initd +++ b/net-fs/nfs-utils/files/rpc.idmapd.initd @@ -8,7 +8,8 @@ rpc_bin=/usr/sbin/rpc.idmapd depend() { use ypbind net - need portmap rpc.pipefs + need portmap + need rpc.pipefs after quota } diff --git a/net-fs/nfs-utils/files/rpc.svcgssd.initd b/net-fs/nfs-utils/files/rpc.svcgssd.initd index c714e36076f4..11bc4265eddd 100644 --- a/net-fs/nfs-utils/files/rpc.svcgssd.initd +++ b/net-fs/nfs-utils/files/rpc.svcgssd.initd @@ -6,7 +6,8 @@ depend() { use ypbind net - need portmap rpc.pipefs + need portmap + need rpc.pipefs after quota } diff --git a/net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild b/net-fs/nfs-utils/nfs-utils-2.6.4-r11.ebuild similarity index 95% rename from net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild rename to net-fs/nfs-utils/nfs-utils-2.6.4-r11.ebuild index a50758b8b9eb..b64941485bd6 100644 --- a/net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild +++ b/net-fs/nfs-utils/nfs-utils-2.6.4-r11.ebuild @@ -167,14 +167,19 @@ src_install() { doins "${FILESDIR}"/exports keepdir /etc/exports.d - local f list=() opt_need="" + local f list=() if use nfsv4 ; then - opt_need="rpc.idmapd" list+=( rpc.idmapd rpc.pipefs ) use kerberos && list+=( rpc.gssd rpc.svcgssd ) fi + + local sedexp=( -e '#placehoder' ) + use nfsv3 || sedexp+=( -e '/need portmap/d' ) + + mkdir -p "${T}/init.d" || die for f in nfs nfsclient rpc.statd "${list[@]}" ; do - newinitd "${FILESDIR}"/${f}.initd ${f} + sed "${sedexp[@]}" "${FILESDIR}/${f}.initd" > "${T}/init.d/${f}" || die + doinitd "${T}/init.d/${f}" done local systemd_systemunitdir="$(systemd_get_systemunitdir)"
