summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Swartzlander <ben@swartzlander.org>2017-10-10 14:56:51 -0400
committerBen Swartzlander <ben@swartzlander.org>2017-10-26 18:13:04 +0000
commit63fb858e1e3106866f7d9b823c410435e099d10a (patch)
tree2ae76fdbf85a274ab4acba0a69cc8babd3ee0717
parentc6d3c8478de260df27929bf7ddb6bbd9b3691e14 (diff)
Use external mount programs instead of busybox
Avoid the busybox mount applets for NFS and CIFS because the external mount apps are better. Change-Id: I53192102ed1d4efe8a1f306d8d065883293a5dd8
Notes
Notes (review): Verified+1: Jenkins Code-Review+2: Ben Swartzlander <ben@swartzlander.org> Workflow+1: Ben Swartzlander <ben@swartzlander.org> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Thu, 26 Oct 2017 18:27:58 +0000 Reviewed-on: https://review.openstack.org/511008 Project: openstack/manila-test-image Branch: refs/heads/master
-rw-r--r--conf/buildroot-client.config1
-rw-r--r--conf/busybox.config8
2 files changed, 5 insertions, 4 deletions
diff --git a/conf/buildroot-client.config b/conf/buildroot-client.config
index a169b7b..f96a84e 100644
--- a/conf/buildroot-client.config
+++ b/conf/buildroot-client.config
@@ -14,6 +14,7 @@ BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="../conf/linux.config"
14BR2_LINUX_KERNEL_LZMA=y 14BR2_LINUX_KERNEL_LZMA=y
15BR2_LINUX_KERNEL_INSTALL_TARGET=y 15BR2_LINUX_KERNEL_INSTALL_TARGET=y
16BR2_PACKAGE_BUSYBOX_CONFIG="../conf/busybox.config" 16BR2_PACKAGE_BUSYBOX_CONFIG="../conf/busybox.config"
17BR2_PACKAGE_CIFS_UTILS=y
17BR2_PACKAGE_NFS_UTILS=y 18BR2_PACKAGE_NFS_UTILS=y
18BR2_PACKAGE_NFS_UTILS_RPC_LOCKD=y 19BR2_PACKAGE_NFS_UTILS_RPC_LOCKD=y
19BR2_PACKAGE_NFS_UTILS_RPC_RQUOTAD=y 20BR2_PACKAGE_NFS_UTILS_RPC_RQUOTAD=y
diff --git a/conf/busybox.config b/conf/busybox.config
index 521f411..c099d14 100644
--- a/conf/busybox.config
+++ b/conf/busybox.config
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Busybox version: 1.24.1 3# Busybox version: 1.24.1
4# Thu Jan 26 00:44:45 2017 4# Sat Oct 7 20:01:38 2017
5# 5#
6CONFIG_HAVE_DOT_CONFIG=y 6CONFIG_HAVE_DOT_CONFIG=y
7 7
@@ -52,7 +52,7 @@ CONFIG_FEATURE_SUID=y
52# CONFIG_FEATURE_PREFER_APPLETS is not set 52# CONFIG_FEATURE_PREFER_APPLETS is not set
53CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" 53CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
54CONFIG_FEATURE_SYSLOG=y 54CONFIG_FEATURE_SYSLOG=y
55CONFIG_FEATURE_HAVE_RPC=y 55# CONFIG_FEATURE_HAVE_RPC is not set
56 56
57# 57#
58# Build Options 58# Build Options
@@ -563,8 +563,8 @@ CONFIG_FEATURE_MOUNT_FAKE=y
563CONFIG_FEATURE_MOUNT_VERBOSE=y 563CONFIG_FEATURE_MOUNT_VERBOSE=y
564CONFIG_FEATURE_MOUNT_HELPERS=y 564CONFIG_FEATURE_MOUNT_HELPERS=y
565CONFIG_FEATURE_MOUNT_LABEL=y 565CONFIG_FEATURE_MOUNT_LABEL=y
566CONFIG_FEATURE_MOUNT_NFS=y 566# CONFIG_FEATURE_MOUNT_NFS is not set
567CONFIG_FEATURE_MOUNT_CIFS=y 567# CONFIG_FEATURE_MOUNT_CIFS is not set
568CONFIG_FEATURE_MOUNT_FLAGS=y 568CONFIG_FEATURE_MOUNT_FLAGS=y
569CONFIG_FEATURE_MOUNT_FSTAB=y 569CONFIG_FEATURE_MOUNT_FSTAB=y
570CONFIG_FEATURE_MOUNT_OTHERTAB=y 570CONFIG_FEATURE_MOUNT_OTHERTAB=y