From mboxrd@z Thu Jan 1 00:00:00 1970 From: kostap at marvell.com Date: Wed, 6 Feb 2019 18:06:01 +0200 Subject: [Buildroot] [PATCH 2/2] package/nfs-utils: enable support of NFSv4 In-Reply-To: <20190206160601.6360-1-kostap@marvell.com> References: <20190206160601.6360-1-kostap@marvell.com> Message-ID: <20190206160601.6360-2-kostap@marvell.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net From: Konstantin Porotchkin Taken from git at github.com:openstack/manila-test-image.git /patches/nfs-utils-enable-nfsv4.patch Signed-off-by: Konstantin Porotchkin --- package/nfs-utils/Config.in | 10 ++++++++++ package/nfs-utils/S60nfs | 27 +++++++++++++++++++++++---- package/nfs-utils/etc-idmapd.conf | 9 +++++++++ package/nfs-utils/nfs-utils.mk | 19 ++++++++++++++++--- 4 files changed, 58 insertions(+), 7 deletions(-) create mode 100644 package/nfs-utils/etc-idmapd.conf diff --git a/package/nfs-utils/Config.in b/package/nfs-utils/Config.in index 055b711f0d..08c0f4caae 100644 --- a/package/nfs-utils/Config.in +++ b/package/nfs-utils/Config.in @@ -30,4 +30,14 @@ config BR2_PACKAGE_NFS_UTILS_RPC_RQUOTAD help NFS remote quota server +config BR2_PACKAGE_NFS_UTILS_NFS4 + bool "NFSv4 support" + select BR2_PACKAGE_LIBEVENT + select BR2_PACKAGE_LIBNFSIDMAP + help + Enable support for NFSv4. + +comment "nfs-utils requires a toolchain with RPC and LARGEFILE support" + depends on !BR2_INET_RPC || !BR2_LARGEFILE + endif diff --git a/package/nfs-utils/S60nfs b/package/nfs-utils/S60nfs index 4183ff6268..bec7307653 100755 --- a/package/nfs-utils/S60nfs +++ b/package/nfs-utils/S60nfs @@ -3,6 +3,8 @@ # nfs This shell script takes care of starting and stopping # the NFS services. Stolen from RedHat FC5. +ENABLEv4=yes + mkdir -p /var/lock/subsys mkdir -p /run/nfs/sm mkdir -p /run/nfs/sm.bak @@ -15,13 +17,26 @@ if [ -f "${CFG_FILE}" ]; then . "${CFG_FILE}" fi +if [ $ENABLEv4 == "yes" ]; then + pipefs_dir="`sed -n 's/^ *Pipefs-Directory *= *//p' /etc/idmapd.conf`" +fi start() { # Start daemons. + if [ $ENABLEv4 == "yes" ]; then + printf "Starting NFS idmapd: " + [ -d /var/lib/nfs/v4recovery ] || mkdir -p /var/lib/nfs/v4recovery + [ -d "$pipefs_dir" ] || mkdir -p "$pipefs_dir" + if ! ( grep -q "on $pipefs_dir type rpc_pipefs" /proc/mounts ); then + mount -t rpc_pipefs sunrpc "$pipefs_dir" + fi + rpc.idmapd + echo "done" + fi + printf "Starting NFS statd: " rpc.statd [ $? = 0 ] && echo "OK" || echo "FAIL" - touch /var/lock/subsys/nfslock printf "Starting NFS services: " /usr/sbin/exportfs -r @@ -34,11 +49,17 @@ start() { printf "Starting NFS mountd: " rpc.mountd [ $? = 0 ] && echo "OK" || echo "FAIL" - touch /var/lock/subsys/nfs } stop() { # Stop daemons. + if [ $ENABLEv4 == "yes" ]; then + printf "Shutting down NFS idmapd: " + killall -q rpc.idmapd + umount "$pipefs_dir" + echo "done" + fi + printf "Shutting down NFS mountd: " killall -q rpc.mountd 2>/dev/null [ $? = 0 ] && echo "OK" || echo "FAIL" @@ -56,7 +77,6 @@ stop() { [ $? = 0 ] && echo "OK" || echo "FAIL" rm -f /var/lock/subsys/nfs rm -f /var/run/rpc.statd.pid - rm -f /var/lock/subsys/nfslock } # See how we were called. @@ -73,7 +93,6 @@ case "$1" in ;; reload) /usr/sbin/exportfs -r - touch /var/lock/subsys/nfs ;; *) echo "Usage: $0 {start|stop|restart|reload}" diff --git a/package/nfs-utils/etc-idmapd.conf b/package/nfs-utils/etc-idmapd.conf new file mode 100644 index 0000000000..0288c0ce03 --- /dev/null +++ b/package/nfs-utils/etc-idmapd.conf @@ -0,0 +1,9 @@ +[General] +Verbosity = 0 +Pipefs-Directory = /var/lib/nfs/rpc_pipefs +Domain = localdomain + +[Mapping] +Nobody-User = nobody +Nobody-Group = nogroup + diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index 9fa7ae200b..517ec19bea 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -15,15 +15,19 @@ NFS_UTILS_DEPENDENCIES = host-pkgconf NFS_UTILS_CONF_ENV = knfsd_cv_bsd_signals=no NFS_UTILS_CONF_OPTS = \ - --disable-nfsv4 \ - --disable-nfsv41 \ --disable-gss \ --disable-uuid \ - --disable-ipv6 \ --without-tcp-wrappers \ --with-statedir=/run/nfs \ --with-rpcgen=internal +ifeq ($(BR2_PACKAGE_LIBNFSIDMAP),y) +NFS_UTILS_DEPENDENCIES += libevent libnfsidmap lvm2 sqlite +NFS_UTILS_CONF_OPTS += --enable-nfsv4 --enable-nfsv41 +else +NFS_UTILS_CONF_OPTS += --disable-nfsv4 --disable-nfsv41 +endif + HOST_NFS_UTILS_CONF_OPTS = \ --disable-nfsv4 \ --disable-nfsv41 \ @@ -62,7 +66,16 @@ define NFS_UTILS_INSTALL_FIXUP $(INSTALL) -D -m 644 \ $(@D)/utils/mount/nfsmount.conf $(TARGET_DIR)/etc/nfsmount.conf endef + +define NFS_UTILS_INSTALL_IDMAPD_CONF + $(INSTALL) -m 0644 package/nfs-utils/etc-idmapd.conf \ + $(TARGET_DIR)/etc/idmapd.conf +endef + NFS_UTILS_POST_INSTALL_TARGET_HOOKS += NFS_UTILS_INSTALL_FIXUP +ifeq ($(BR2_PACKAGE_NFS_UTILS_NFS4),y) + NFS_UTILS_POST_INSTALL_TARGET_HOOKS += NFS_UTILS_INSTALL_IDMAPD_CONF +endif ifeq ($(BR2_INIT_SYSTEMD),y) NFS_UTILS_CONF_OPTS += --with-systemd=/usr/lib/systemd/system -- 2.17.1