ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

swapon: split swapon-common.c 

swapon    - requires libmount and libblkid
 swapoff   - requires libmount
 swaplabel - requires libblkid

This patch add lib/swapprober.c with blkid stuff for swap. It allows
to use and link libblkid only when necessary.

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2014-09-22 13:16:25 +02:00
parent 5ec85227ad
commit 18b3e5495b
9 changed files with 83 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
disk-utils/Makemodule.am
View File

@ -65,10 +65,13 @@ endif # BUILD_MKSWAP
if BUILD_SWAPLABEL
sbin_PROGRAMS += swaplabel
dist_man_MANS += disk-utils/swaplabel.8
swaplabel_SOURCES = disk-utils/swaplabel.c sys-utils/swapon-common.c
swaplabel_SOURCES = \
disk-utils/swaplabel.c \
lib/swapprober.c \
include/swapprober.h
swaplabel_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) -I$(ul_libmount_incdir)
swaplabel_LDADD = $(LDADD) libblkid.la libmount.la libcommon.la
swaplabel_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
swaplabel_LDADD = $(LDADD) libblkid.la libcommon.la
if BUILD_LIBUUID
swaplabel_LDADD += libuuid.la

12
disk-utils/swaplabel.c
View File

@ -18,7 +18,6 @@
#include <sys/stat.h>
#include <unistd.h>
#include <stdlib.h>
#include <blkid.h>
#include <getopt.h>
#ifdef HAVE_LIBUUID
@ -26,12 +25,13 @@
#endif
#include "c.h"
#include "closestream.h"
#include "all-io.h"
#include "swapheader.h"
#include "swapon-common.h"
#include "strutils.h"
#include "nls.h"
#include "all-io.h"
#include "strutils.h"
#include "closestream.h"
#include "swapheader.h"
#include "swapprober.h"
#define SWAP_UUID_OFFSET (offsetof(struct swap_header_v1_2, uuid))
#define SWAP_LABEL_OFFSET (offsetof(struct swap_header_v1_2, volume_name))

2
include/Makemodule.am
View File

@ -41,7 +41,7 @@ dist_noinst_HEADERS += \
include/rpmatch.h \
include/setproctitle.h \
include/strutils.h \
include/swapon-common.h \
include/swapprober.h \
include/swapheader.h \
include/sysfs.h \
include/timer.h \

9
include/swapprober.h Normal file
View File

@ -0,0 +1,9 @@
#ifndef UTIL_LINUX_SWAP_PROBER_H
#define UTIL_LINUX_SWAP_PROBER_H
#include <blkid.h>
blkid_probe get_swap_prober(const char *devname);
#endif /* UTIL_LINUX_SWAP_PROBER_H */

48
lib/swapprober.c Normal file
View File

@ -0,0 +1,48 @@
#include "c.h"
#include "nls.h"
#include "swapprober.h"
blkid_probe get_swap_prober(const char *devname)
{
blkid_probe pr;
int rc;
const char *version = NULL;
char *swap_filter[] = { "swap", NULL };
pr = blkid_new_probe_from_filename(devname);
if (!pr) {
warn(_("%s: unable to probe device"), devname);
return NULL;
}
blkid_probe_enable_superblocks(pr, TRUE);
blkid_probe_set_superblocks_flags(pr,
BLKID_SUBLKS_LABEL | BLKID_SUBLKS_UUID |
BLKID_SUBLKS_VERSION);
blkid_probe_filter_superblocks_type(pr, BLKID_FLTR_ONLYIN, swap_filter);
rc = blkid_do_safeprobe(pr);
if (rc == -1)
warn(_("%s: unable to probe device"), devname);
else if (rc == -2)
warnx(_("%s: ambivalent probing result, use wipefs(8)"), devname);
else if (rc == 1)
warnx(_("%s: not a valid swap partition"), devname);
if (rc == 0) {
/* Only the SWAPSPACE2 is supported. */
if (blkid_probe_lookup_value(pr, "VERSION", &version, NULL) == 0
&& version
&& strcmp(version, stringify_value(SWAP_VERSION)))
warnx(_("%s: unsupported swap version '%s'"),
devname, version);
else
return pr;
}
blkid_free_probe(pr);
return NULL;
}

12
sys-utils/Makemodule.am
View File

@ -262,7 +262,10 @@ dist_man_MANS += \
swapon_SOURCES = \
sys-utils/swapon.c \
sys-utils/swapon-common.c
sys-utils/swapon-common.c \
sys-utils/swapon-common.h \
lib/swapprober.c \
include/swapprober.h
swapon_CFLAGS = $(AM_CFLAGS) \
-I$(ul_libblkid_incdir) \
-I$(ul_libmount_incdir) \
@ -273,8 +276,11 @@ swapon_LDADD = $(LDADD) \
libmount.la \
libsmartcols.la
swapoff_SOURCES = sys-utils/swapoff.c sys-utils/swapon-common.c
swapoff_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir) -I$(ul_libblkid_incdir)
swapoff_SOURCES = \
sys-utils/swapoff.c \
sys-utils/swapon-common.c \
sys-utils/swapon-common.h
swapoff_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir)
swapoff_LDADD = $(LDADD) libmount.la
endif

47
sys-utils/swapon-common.c
View File

@ -1,11 +1,10 @@
#include <blkid.h>
#include "c.h"
#include "nls.h"
#include "swapheader.h"
#include "swapon-common.h"
#include "xalloc.h"
#include "swapon-common.h"
/*
* content of /proc/swaps and /etc/fstab
*/
@ -106,45 +105,3 @@ size_t numof_uuids(void)
return ulct;
}
blkid_probe get_swap_prober(const char *devname)
{
blkid_probe pr;
int rc;
const char *version = NULL;
char *swap_filter[] = { "swap", NULL };
pr = blkid_new_probe_from_filename(devname);
if (!pr) {
warn(_("%s: unable to probe device"), devname);
return NULL;
}
blkid_probe_enable_superblocks(pr, TRUE);
blkid_probe_set_superblocks_flags(pr,
BLKID_SUBLKS_LABEL | BLKID_SUBLKS_UUID |
BLKID_SUBLKS_VERSION);
blkid_probe_filter_superblocks_type(pr, BLKID_FLTR_ONLYIN, swap_filter);
rc = blkid_do_safeprobe(pr);
if (rc == -1)
warn(_("%s: unable to probe device"), devname);
else if (rc == -2)
warnx(_("%s: ambivalent probing result, use wipefs(8)"), devname);
else if (rc == 1)
warnx(_("%s: not a valid swap partition"), devname);
if (rc == 0) {
/* Only the SWAPSPACE2 is supported. */
if (blkid_probe_lookup_value(pr, "VERSION", &version, NULL) == 0
&& version
&& strcmp(version, stringify_value(SWAP_VERSION)))
warnx(_("%s: unsupported swap version '%s'"),
devname, version);
else
return pr;
}
blkid_free_probe(pr);
return NULL;
}

3
include/swapon-common.h → sys-utils/swapon-common.h
View File

@ -1,7 +1,6 @@
#ifndef UTIL_LINUX_SWAPON_COMMON_H
#define UTIL_LINUX_SWAPON_COMMON_H
#include <blkid.h>
#include <libmount.h>
extern struct libmnt_cache *mntcache;
@ -23,6 +22,4 @@ extern void add_uuid(const char *uuid);
extern const char *get_uuid(size_t i);
extern size_t numof_uuids(void);
blkid_probe get_swap_prober(const char *devname);
#endif /* UTIL_LINUX_SWAPON_COMMON_H */

6
sys-utils/swapon.c
View File

@ -12,9 +12,6 @@
#include <stdint.h>
#include <ctype.h>
#include <blkid.h>
#include <libmount.h>
#include <libsmartcols.h>
#include "c.h"
@ -23,11 +20,12 @@
#include "blkdev.h"
#include "pathnames.h"
#include "xalloc.h"
#include "strutils.h"
#include "closestream.h"
#include "swapheader.h"
#include "swapprober.h"
#include "swapon-common.h"
#include "strutils.h"
#define PATH_MKSWAP "/sbin/mkswap"