summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko2017-07-27 10:58:08 +0200
committerDenys Vlasenko2017-07-27 10:58:08 +0200
commit8cae43c5d732e86b8a668013b957fdb6363c8388 (patch)
tree7ff6fb0ddc7a31d151e65213e55be5b9a57a3664
parent68b653b66b0db6b1554806650fb0bebd7af9ef3b (diff)
downloadbusybox-8cae43c5d732e86b8a668013b957fdb6363c8388.zip
busybox-8cae43c5d732e86b8a668013b957fdb6363c8388.tar.gz
swapon: do not use FEATURE_MOUNT_LABEL, have your own FEATURE_SWAPONOFF_LABEL
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--util-linux/mount.c1
-rw-r--r--util-linux/swaponoff.c11
-rw-r--r--util-linux/volume_id/get_devname.c1
3 files changed, 11 insertions, 2 deletions
diff --git a/util-linux/mount.c b/util-linux/mount.c
index 823b7c1..5f03060 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -64,7 +64,6 @@
//config: help
//config: This allows for specifying a device by label or uuid, rather than by
//config: name. This feature utilizes the same functionality as blkid/findfs.
-//config: This also enables label or uuid support for swapon.
//config:
//config:config FEATURE_MOUNT_NFS
//config: bool "Support mounting NFS file systems on Linux < 2.6.23"
diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c
index bda0687..f432ce1 100644
--- a/util-linux/swaponoff.c
+++ b/util-linux/swaponoff.c
@@ -37,6 +37,15 @@
//config: bool "swapoff (4.3 kb)"
//config: default y
//config: select PLATFORM_LINUX
+//config:
+//config:config FEATURE_SWAPONOFF_LABEL
+//config: bool "Support specifying devices by label or UUID"
+//config: default y
+//config: depends on SWAPON || SWAPOFF
+//config: select VOLUMEID
+//config: help
+//config: This allows for specifying a device by label or uuid, rather than by
+//config: name. This feature utilizes the same functionality as blkid/findfs.
// APPLET_ODDNAME:name main location suid_type help
//applet:IF_SWAPON( APPLET_ODDNAME(swapon, swap_on_off, BB_DIR_SBIN, BB_SUID_DROP, swapon))
@@ -72,7 +81,7 @@
# include <sys/swap.h>
#endif
-#if ENABLE_FEATURE_MOUNT_LABEL
+#if ENABLE_FEATURE_SWAPONOFF_LABEL
# include "volume_id.h"
#else
# define resolve_mount_spec(fsname) ((void)0)
diff --git a/util-linux/volume_id/get_devname.c b/util-linux/volume_id/get_devname.c
index b64d28c..34f5d11 100644
--- a/util-linux/volume_id/get_devname.c
+++ b/util-linux/volume_id/get_devname.c
@@ -11,6 +11,7 @@
//kbuild:lib-$(CONFIG_BLKID) += get_devname.o
//kbuild:lib-$(CONFIG_FINDFS) += get_devname.o
//kbuild:lib-$(CONFIG_FEATURE_MOUNT_LABEL) += get_devname.o
+//kbuild:lib-$(CONFIG_FEATURE_SWAPONOFF_LABEL) += get_devname.o
#include <sys/mount.h> /* BLKGETSIZE64 */
#if !defined(BLKGETSIZE64)