diff options
| author | Natanael Copa <natanael.copa@gmail.com> | 2009-09-20 04:28:22 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2009-09-20 04:28:22 +0200 |
| commit | 9aff29997ed22932f78aa8d8c7c2412e9d3f49e5 (patch) | |
| tree | 8df24e36d81c3f4f6d1cf6b9892341f96b5ecb92 /util-linux/swaponoff.c | |
| parent | 2bf6634ef46b5360e6381e61b27415e52a1cd7c7 (diff) | |
| download | busybox-w32-9aff29997ed22932f78aa8d8c7c2412e9d3f49e5.tar.gz busybox-w32-9aff29997ed22932f78aa8d8c7c2412e9d3f49e5.tar.bz2 busybox-w32-9aff29997ed22932f78aa8d8c7c2412e9d3f49e5.zip | |
swaponoff: add uuid/label support. By Natanael Copa
function old new delta
swap_enable_disable 130 150 +20
resolve_mount_spec 76 96 +20
mount_main 1152 1154 +2
findfs_main 125 80 -45
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 3/1 up/down: 42/-45) Total: -3 bytes
Signed-off-by: Natanael Copa <natanael.copa@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'util-linux/swaponoff.c')
| -rw-r--r-- | util-linux/swaponoff.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c index 863f7734a..33ad00ac1 100644 --- a/util-linux/swaponoff.c +++ b/util-linux/swaponoff.c | |||
| @@ -11,6 +11,12 @@ | |||
| 11 | #include <mntent.h> | 11 | #include <mntent.h> |
| 12 | #include <sys/swap.h> | 12 | #include <sys/swap.h> |
| 13 | 13 | ||
| 14 | #if ENABLE_FEATURE_MOUNT_LABEL | ||
| 15 | # include "volume_id.h" | ||
| 16 | #else | ||
| 17 | # define resolve_mount_spec(fsname) ((void)0) | ||
| 18 | #endif | ||
| 19 | |||
| 14 | #if ENABLE_FEATURE_SWAPON_PRI | 20 | #if ENABLE_FEATURE_SWAPON_PRI |
| 15 | struct globals { | 21 | struct globals { |
| 16 | int flags; | 22 | int flags; |
| @@ -26,6 +32,7 @@ static int swap_enable_disable(char *device) | |||
| 26 | int status; | 32 | int status; |
| 27 | struct stat st; | 33 | struct stat st; |
| 28 | 34 | ||
| 35 | resolve_mount_spec(&device); | ||
| 29 | xstat(device, &st); | 36 | xstat(device, &st); |
| 30 | 37 | ||
| 31 | #if ENABLE_DESKTOP | 38 | #if ENABLE_DESKTOP |