diff options
author | Tito Ragusa <farmatito@tiscali.it> | 2013-08-08 10:21:27 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2013-08-08 10:21:27 +0200 |
commit | 8c7fcbd7521c1bafcf6e792af8b140c256e2cbfd (patch) | |
tree | eea811cd3291153738e69b8fbff6f76375bd86be | |
parent | a5e6c6cd3b458e20643a9cd4202091720901a4d0 (diff) | |
download | busybox-w32-8c7fcbd7521c1bafcf6e792af8b140c256e2cbfd.tar.gz busybox-w32-8c7fcbd7521c1bafcf6e792af8b140c256e2cbfd.tar.bz2 busybox-w32-8c7fcbd7521c1bafcf6e792af8b140c256e2cbfd.zip |
swapon: support "pri=NNN" in fstab
function old new delta
swap_on_off_main 244 365 +121
Signed-off-by: Tito Ragusa <farmatito@tiscali.it>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r-- | util-linux/swaponoff.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c index 54867ec36..afad4ab8f 100644 --- a/util-linux/swaponoff.c +++ b/util-linux/swaponoff.c | |||
@@ -95,6 +95,20 @@ static int do_em_all(void) | |||
95 | if (applet_name[5] != 'n' | 95 | if (applet_name[5] != 'n' |
96 | || hasmntopt(m, MNTOPT_NOAUTO) == NULL | 96 | || hasmntopt(m, MNTOPT_NOAUTO) == NULL |
97 | ) { | 97 | ) { |
98 | #if ENABLE_FEATURE_SWAPON_PRI | ||
99 | char *p; | ||
100 | g_flags = 0; /* each swap space might have different flags */ | ||
101 | p = strstr(m->mnt_opts, "pri="); | ||
102 | if (p) { | ||
103 | /* Max allowed 32767 (==SWAP_FLAG_PRIO_MASK) */ | ||
104 | int swap_prio = MIN(bb_strtoull(p + 4 , NULL, 10), SWAP_FLAG_PRIO_MASK); | ||
105 | /* We want to allow "NNNN,foo", thus errno == EINVAL is allowed too */ | ||
106 | if (errno != ERANGE) { | ||
107 | g_flags = SWAP_FLAG_PREFER | | ||
108 | (swap_prio << SWAP_FLAG_PRIO_SHIFT); | ||
109 | } | ||
110 | } | ||
111 | #endif | ||
98 | err += swap_enable_disable(m->mnt_fsname); | 112 | err += swap_enable_disable(m->mnt_fsname); |
99 | } | 113 | } |
100 | } | 114 | } |