git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 1.10.10.
[libguestfs.git]
/
daemon
/
swap.c
diff --git
a/daemon/swap.c
b/daemon/swap.c
index
2d3d9ff
..
99fb563
100644
(file)
--- a/
daemon/swap.c
+++ b/
daemon/swap.c
@@
-23,11
+23,16
@@
#include <string.h>
#include <unistd.h>
#include <string.h>
#include <unistd.h>
-#include "
../src/
guestfs_protocol.h"
+#include "guestfs_protocol.h"
#include "daemon.h"
#include "actions.h"
#include "optgroups.h"
#include "daemon.h"
#include "actions.h"
#include "optgroups.h"
+#include "ignore-value.h"
+
+/* Confirmed this is true for Linux swap partitions from the Linux sources. */
+#define SWAP_LABEL_MAX 16
+
/* Convenient place to test for the later version of e2fsprogs
* and util-linux which supports -U parameters to specify UUIDs.
* (Not supported in RHEL 5).
/* Convenient place to test for the later version of e2fsprogs
* and util-linux which supports -U parameters to specify UUIDs.
* (Not supported in RHEL 5).
@@
-39,7
+44,7
@@
optgroup_linuxfsuuid_available (void)
int av;
/* Ignore return code - mkswap --help *will* fail. */
int av;
/* Ignore return code - mkswap --help *will* fail. */
-
command (NULL, &err, "/sbin/mkswap", "--help", NULL
);
+
ignore_value (command (NULL, &err, "mkswap", "--help", NULL)
);
av = strstr (err, "-U") != NULL;
free (err);
av = strstr (err, "-U") != NULL;
free (err);
@@
-53,12
+58,12
@@
mkswap (const char *device, const char *flag, const char *value)
int r;
if (!flag)
int r;
if (!flag)
- r = command (NULL, &err, "
/sbin/
mkswap", "-f", device, NULL);
+ r = command (NULL, &err, "mkswap", "-f", device, NULL);
else
else
- r = command (NULL, &err, "
/sbin/
mkswap", "-f", flag, value, device, NULL);
+ r = command (NULL, &err, "mkswap", "-f", flag, value, device, NULL);
if (r == -1) {
if (r == -1) {
- reply_with_error ("
mkswap:
%s", err);
+ reply_with_error ("%s", err);
free (err);
return -1;
}
free (err);
return -1;
}
@@
-77,6
+82,12
@@
do_mkswap (const char *device)
int
do_mkswap_L (const char *label, const char *device)
{
int
do_mkswap_L (const char *label, const char *device)
{
+ if (strlen (label) > SWAP_LABEL_MAX) {
+ reply_with_error ("%s: Linux swap labels are limited to %d bytes",
+ label, SWAP_LABEL_MAX);
+ return -1;
+ }
+
return mkswap (device, "-L", label);
}
return mkswap (device, "-L", label);
}
@@
-115,26
+126,31
@@
swaponoff (const char *cmd, const char *flag, const char *value)
r = command (NULL, &err, cmd, flag, value, NULL);
if (r == -1) {
r = command (NULL, &err, cmd, flag, value, NULL);
if (r == -1) {
- reply_with_error ("%s: %s
: %s", cmd
, value, err);
+ reply_with_error ("%s: %s
"
, value, err);
free (err);
return -1;
}
free (err);
free (err);
return -1;
}
free (err);
+ /* Possible fix for RHBZ#516096. It probably doesn't hurt to do
+ * this in any case.
+ */
+ udev_settle ();
+
return 0;
}
int
do_swapon_device (const char *device)
{
return 0;
}
int
do_swapon_device (const char *device)
{
- return swaponoff ("
/sbin/
swapon", NULL, device);
+ return swaponoff ("swapon", NULL, device);
}
int
do_swapoff_device (const char *device)
{
}
int
do_swapoff_device (const char *device)
{
- return swaponoff ("
/sbin/
swapoff", NULL, device);
+ return swaponoff ("swapoff", NULL, device);
}
int
}
int
@@
-149,7
+165,7
@@
do_swapon_file (const char *path)
return -1;
}
return -1;
}
- r = swaponoff ("
/sbin/
swapon", NULL, buf);
+ r = swaponoff ("swapon", NULL, buf);
free (buf);
return r;
}
free (buf);
return r;
}
@@
-166,7
+182,7
@@
do_swapoff_file (const char *path)
return -1;
}
return -1;
}
- r = swaponoff ("
/sbin/
swapoff", NULL, buf);
+ r = swaponoff ("swapoff", NULL, buf);
free (buf);
return r;
}
free (buf);
return r;
}
@@
-174,23
+190,35
@@
do_swapoff_file (const char *path)
int
do_swapon_label (const char *label)
{
int
do_swapon_label (const char *label)
{
- return swaponoff ("/sbin/swapon", "-L", label);
+ if (strlen (label) > SWAP_LABEL_MAX) {
+ reply_with_error ("%s: Linux swap labels are limited to %d bytes",
+ label, SWAP_LABEL_MAX);
+ return -1;
+ }
+
+ return swaponoff ("swapon", "-L", label);
}
int
do_swapoff_label (const char *label)
{
}
int
do_swapoff_label (const char *label)
{
- return swaponoff ("/sbin/swapoff", "-L", label);
+ if (strlen (label) > SWAP_LABEL_MAX) {
+ reply_with_error ("%s: Linux swap labels are limited to %d bytes",
+ label, SWAP_LABEL_MAX);
+ return -1;
+ }
+
+ return swaponoff ("swapoff", "-L", label);
}
int
do_swapon_uuid (const char *uuid)
{
}
int
do_swapon_uuid (const char *uuid)
{
- return swaponoff ("
/sbin/
swapon", "-U", uuid);
+ return swaponoff ("swapon", "-U", uuid);
}
int
do_swapoff_uuid (const char *uuid)
{
}
int
do_swapoff_uuid (const char *uuid)
{
- return swaponoff ("
/sbin/
swapoff", "-U", uuid);
+ return swaponoff ("swapoff", "-U", uuid);
}
}