Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow named wedges to be used on command line, also fix name lookup

Browse Source 
for the dump device.
This commit is contained in:
mlelstv 2012-12-26 10:15:28 +00:00
parent 8daebbc807
commit 153341a17d
1 changed files with 39 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
sbin/swapctl/swapctl.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: swapctl.c,v 1.37 2012/04/07 04:52:20 christos Exp $ */
/* $NetBSD: swapctl.c,v 1.38 2012/12/26 10:15:28 mlelstv Exp $ */
/*
* Copyright (c) 1996, 1997, 1999 Matthew R. Green
@ -64,7 +64,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: swapctl.c,v 1.37 2012/04/07 04:52:20 christos Exp $");
__RCSID("$NetBSD: swapctl.c,v 1.38 2012/12/26 10:15:28 mlelstv Exp $");
#endif
@ -150,6 +150,7 @@ static int pri; /* uses 0 as default pri */
static void change_priority(char *);
static int add_swap(char *, int);
static int delete_swap(char *);
static void set_dumpdev1(char *);
static void set_dumpdev(char *);
static int get_dumpdev(void);
__dead static void do_fstab(int);
@ -445,8 +446,14 @@ static int
add_swap(char *path, int priority)
{
struct stat sb;
char buf[MAXPATHLEN];
char *spec;
if (stat(path, &sb) < 0)
if (getfsspecname(buf, sizeof(buf), path) == NULL)
goto oops;
spec = buf;
if (stat(spec, &sb) < 0)
goto oops;
if (sb.st_mode & S_IROTH)
@ -455,7 +462,7 @@ add_swap(char *path, int priority)
warnx("WARNING: %s is writable by the world", path);
if (fflag || oflag) {
set_dumpdev(path);
set_dumpdev1(spec);
if (oflag)
exit(0);
else
@ -465,7 +472,7 @@ add_swap(char *path, int priority)
if (nflag)
return 1;
if (swapctl(SWAP_ON, path, priority) < 0) {
if (swapctl(SWAP_ON, spec, priority) < 0) {
oops:
err(1, "%s", path);
}
@ -478,31 +485,50 @@ oops:
static int
delete_swap(char *path)
{
char buf[MAXPATHLEN];
char *spec;
if (getfsspecname(buf, sizeof(buf), path) == NULL)
err(1, "%s", path);
spec = buf;
if (nflag)
return 1;
if (swapctl(SWAP_OFF, path, pri) < 0)
if (swapctl(SWAP_OFF, spec, pri) < 0)
err(1, "%s", path);
return (1);
}
static void
set_dumpdev(char *path)
set_dumpdev1(char *spec)
{
int rv = 0;
if (!nflag) {
if (strcmp(path, "none") == 0)
if (strcmp(spec, "none") == 0)
rv = swapctl(SWAP_DUMPOFF, NULL, 0);
else
rv = swapctl(SWAP_DUMPDEV, path, 0);
rv = swapctl(SWAP_DUMPDEV, spec, 0);
}
if (rv == -1)
err(1, "could not set dump device to %s", path);
err(1, "could not set dump device to %s", spec);
else
printf("%s: setting dump device to %s\n", getprogname(), path);
printf("%s: setting dump device to %s\n", getprogname(), spec);
}
static void
set_dumpdev(char *path)
{
char buf[MAXPATHLEN];
char *spec;
if (getfsspecname(buf, sizeof(buf), path) == NULL)
err(1, "%s", path);
spec = buf;
return set_dumpdev1(spec);
}
static int
@ -706,7 +732,7 @@ do_fstab(int add)
cmd[0] = '\0';
if (strcmp(fp->fs_type, "dp") == 0 && add) {
set_dumpdev(spec);
set_dumpdev1(spec);
continue;
}
@ -715,7 +741,7 @@ do_fstab(int add)
/* handle dp as mnt option */
if (strstr(fp->fs_mntops, "dp") && add)
set_dumpdev(spec);
set_dumpdev1(spec);
isblk = 0;