swapon, swapheader, mkswap: move swap signature to header
Both swapon and mkswap need to know what is valid device signature, so share the value. [kzak@redhat.com: - use SWAP_SIGNATURE_SZ properly in write_signature()] Signed-off-by: Sami Kerola <kerolasa@iki.fi> Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
parent
eb397d19e4
commit
24f83f7392
|
@ -177,7 +177,7 @@ write_signature(char *sig)
|
||||||
{
|
{
|
||||||
char *sp = (char *) signature_page;
|
char *sp = (char *) signature_page;
|
||||||
|
|
||||||
strncpy(sp + pagesize - 10, sig, 10);
|
strncpy(sp + pagesize - SWAP_SIGNATURE_SZ, sig, SWAP_SIGNATURE_SZ);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -611,7 +611,7 @@ main(int argc, char **argv) {
|
||||||
printf(_("Setting up swapspace version %d, size = %llu KiB\n"),
|
printf(_("Setting up swapspace version %d, size = %llu KiB\n"),
|
||||||
version, goodpages * pagesize / 1024);
|
version, goodpages * pagesize / 1024);
|
||||||
|
|
||||||
write_signature("SWAPSPACE2");
|
write_signature(SWAP_SIGNATURE);
|
||||||
write_uuid_and_label(uuid, opt_label);
|
write_uuid_and_label(uuid, opt_label);
|
||||||
|
|
||||||
offset = 1024;
|
offset = 1024;
|
||||||
|
|
|
@ -4,6 +4,8 @@
|
||||||
#define SWAP_VERSION 1
|
#define SWAP_VERSION 1
|
||||||
#define SWAP_UUID_LENGTH 16
|
#define SWAP_UUID_LENGTH 16
|
||||||
#define SWAP_LABEL_LENGTH 16
|
#define SWAP_LABEL_LENGTH 16
|
||||||
|
#define SWAP_SIGNATURE "SWAPSPACE2"
|
||||||
|
#define SWAP_SIGNATURE_SZ (sizeof(SWAP_SIGNATURE) - 1)
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
|
|
|
@ -76,9 +76,6 @@ enum {
|
||||||
SIG_SWSUSPEND
|
SIG_SWSUSPEND
|
||||||
};
|
};
|
||||||
|
|
||||||
#define SWAP_SIGNATURE "SWAPSPACE2"
|
|
||||||
#define SWAP_SIGNATURE_SZ (sizeof(SWAP_SIGNATURE) - 1)
|
|
||||||
|
|
||||||
static int all;
|
static int all;
|
||||||
static int priority = -1; /* non-prioritized swap by default */
|
static int priority = -1; /* non-prioritized swap by default */
|
||||||
static int discard; /* don't send swap discards by default */
|
static int discard; /* don't send swap discards by default */
|
||||||
|
|
Loading…
Reference in New Issue