Merge pull request #252 from bergwolf/nfs-volume

Nfs volume

Author: gao-feng

build/Dockerfile

@@ -1,7 +1,7 @@
 FROM centos:7
 MAINTAINER Hyper Developers <dev@hyper.sh>
 
-RUN yum install -y patch gcc ncurses-devel make openssl-devel bc
+RUN yum install -y patch gcc ncurses-devel make openssl-devel bc perl
 
 ENV KERNEL_VERSION 4.4.28
 ENV LOCALVERSION -hyper

build/kernel

@@ -1185,7 +1185,7 @@ CONFIG_NET_ACT_CONNMARK=m
 CONFIG_NET_CLS_IND=y
 CONFIG_NET_SCH_FIFO=y
 CONFIG_DCB=y
-# CONFIG_DNS_RESOLVER is not set
+CONFIG_DNS_RESOLVER=m
 # CONFIG_BATMAN_ADV is not set
 CONFIG_OPENVSWITCH=m
 CONFIG_OPENVSWITCH_GRE=m
@@ -2059,8 +2059,23 @@ CONFIG_TMPFS_XATTR=y
 # CONFIG_CONFIGFS_FS is not set
 # CONFIG_MISC_FILESYSTEMS is not set
 CONFIG_NETWORK_FILESYSTEMS=y
-# CONFIG_NFS_FS is not set
+CONFIG_NFS_FS=m
+CONFIG_NFS_V2=m
+CONFIG_NFS_V3=m
+# CONFIG_NFS_V3_ACL is not set
+CONFIG_NFS_V4=m
+# CONFIG_NFS_SWAP is not set
+# CONFIG_NFS_V4_1 is not set
+# CONFIG_NFS_USE_LEGACY_DNS is not set
+CONFIG_NFS_USE_KERNEL_DNS=y
 # CONFIG_NFSD is not set
+CONFIG_GRACE_PERIOD=m
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
+# CONFIG_SUNRPC_DEBUG is not set
 # CONFIG_CEPH_FS is not set
 # CONFIG_CIFS is not set
 # CONFIG_NCP_FS is not set
@@ -2484,6 +2499,7 @@ CONFIG_NLATTR=y
 CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
 # CONFIG_CORDIC is not set
 # CONFIG_DDR is not set
+CONFIG_OID_REGISTRY=m
 # CONFIG_SG_SPLIT is not set
 CONFIG_ARCH_HAS_SG_CHAIN=y
 CONFIG_ARCH_HAS_PMEM_API=y

build/kernel_config

@@ -16,6 +16,7 @@ cp busybox /tmp/hyperstart-rootfs/sbin/
 cp iptables /tmp/hyperstart-rootfs/sbin/
 cp ipvsadm /tmp/hyperstart-rootfs/sbin/
 cp libm.so.6 /tmp/hyperstart-rootfs/lib64/
+cp mount.nfs /tmp/hyperstart-rootfs/sbin/mount.nfs4
 
 if [ "$1"x = "aarch64"x ]; then
 	echo "build hyperstart for aarch64"

build/make-initrd.sh

@@ -113,23 +113,33 @@ static int container_setup_volume(struct hyper_container *container)
 		sprintf(path, "/tmp/%s", vol->mountpoint);
 		sprintf(mountpoint, "./%s", vol->mountpoint);
 
-		fprintf(stdout, "mount %s to %s, tmp path %s\n",
-			dev, vol->mountpoint, path);
-
 		if (hyper_mkdir(path, 0755) < 0) {
 			perror("create volume dir failed");
 			return -1;
 		}
 
-		if (!strncmp(vol->fstype, "xfs", strlen("xfs")))
-			options = "nouuid";
+		if (!strcmp(vol->fstype, "nfs")) {
+			fprintf(stdout, "mount nfs share %s to %s, tmp path %s\n",
+				vol->device, vol->mountpoint, path);
 
-		if (mount(dev, path, vol->fstype, 0, options) < 0) {
-			perror("mount volume device failed");
-			return -1;
+			if (hyper_mount_nfs(vol->device, path) < 0)
+				return -1;
+			/* nfs export has implicitly included _data part of the volume */
+			sprintf(volume, "/%s/", path);
+		} else {
+			fprintf(stdout, "mount %s to %s, tmp path %s\n",
+				dev, vol->mountpoint, path);
+
+			if (!strcmp(vol->fstype, "xfs"))
+				options = "nouuid";
+
+			if (mount(dev, path, vol->fstype, 0, options) < 0) {
+				perror("mount volume device failed");
+				return -1;
+			}
+			sprintf(volume, "/%s/_data", path);
 		}
 
-		sprintf(volume, "/%s/_data", path);
 		if (container_check_file_volume(volume, &filevolume) < 0)
 			return -1;
 

build/modules.tar

@@ -716,3 +716,11 @@ ssize_t nonblock_read(int fd, void *buf, size_t count)
 
 	return len > 0 ? len : ret;
 }
+
+int hyper_mount_nfs(char *server, char *mountpoint)
+{
+	char cmd[512];
+	snprintf(cmd, sizeof(cmd), "mount.nfs4 -n %s %s", server, mountpoint);
+
+	return hyper_cmd(cmd);
+}

build/mount.nfs

@@ -42,4 +42,5 @@ struct passwd *hyper_getpwnam(const char *name);
 struct group *hyper_getgrnam(const char *name);
 int hyper_getgrouplist(const char *user, gid_t group, gid_t *groups, int *ngroups);
 ssize_t nonblock_read(int fd, void *buf, size_t count);
+int hyper_mount_nfs(char *server, char *mountpoint);
 #endif