8cae43c5d
Denys Vlasenko
2017-07-27
Subject
swapon: do not use FEATURE_MOUNT_LABEL, have your own FEATURE_SWAPONOFF_LABEL
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
util-linux/mount.c+0 -1
| @@ -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" | |
util-linux/swaponoff.c+10 -1
| @@ -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) | |
util-linux/volume_id/get_devname.c+1 -0
| @@ -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) | |