emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

swapon: do not use FEATURE_MOUNT_LABEL, have your own FEATURE_SWAPONOFF_LABEL

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2017-07-27 10:58:08 +02:00
parent 68b653b66b
commit 8cae43c5d7
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
util-linux/mount.c
View File

@ -64,7 +64,6 @@
//config: help //config: help
//config: This allows for specifying a device by label or uuid, rather than by //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: name. This feature utilizes the same functionality as blkid/findfs.
//config: This also enables label or uuid support for swapon.
//config: //config:
//config:config FEATURE_MOUNT_NFS //config:config FEATURE_MOUNT_NFS
//config: bool "Support mounting NFS file systems on Linux < 2.6.23" //config: bool "Support mounting NFS file systems on Linux < 2.6.23"

11
util-linux/swaponoff.c
View File

@ -37,6 +37,15 @@
//config: bool "swapoff (4.3 kb)" //config: bool "swapoff (4.3 kb)"
//config: default y //config: default y
//config: select PLATFORM_LINUX //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_ODDNAME:name main location suid_type help
//applet:IF_SWAPON( APPLET_ODDNAME(swapon, swap_on_off, BB_DIR_SBIN, BB_SUID_DROP, swapon)) //applet:IF_SWAPON( APPLET_ODDNAME(swapon, swap_on_off, BB_DIR_SBIN, BB_SUID_DROP, swapon))
@ -72,7 +81,7 @@
# include <sys/swap.h> # include <sys/swap.h>
#endif #endif
#if ENABLE_FEATURE_MOUNT_LABEL #if ENABLE_FEATURE_SWAPONOFF_LABEL
# include "volume_id.h" # include "volume_id.h"
#else #else
# define resolve_mount_spec(fsname) ((void)0) # define resolve_mount_spec(fsname) ((void)0)

1
util-linux/volume_id/get_devname.c
View File

@ -11,6 +11,7 @@
//kbuild:lib-$(CONFIG_BLKID) += get_devname.o //kbuild:lib-$(CONFIG_BLKID) += get_devname.o
//kbuild:lib-$(CONFIG_FINDFS) += get_devname.o //kbuild:lib-$(CONFIG_FINDFS) += get_devname.o
//kbuild:lib-$(CONFIG_FEATURE_MOUNT_LABEL) += 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 */ #include <sys/mount.h> /* BLKGETSIZE64 */
#if !defined(BLKGETSIZE64) #if !defined(BLKGETSIZE64)