#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 "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).
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);
int r;
if (!flag)
- r = command (NULL, &err, "/sbin/mkswap", "-f", device, NULL);
+ r = command (NULL, &err, "mkswap", "-f", device, NULL);
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) {
reply_with_error ("%s", err);
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);
}
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 swaponoff ("/sbin/swapon", NULL, device);
+ return swaponoff ("swapon", NULL, device);
}
int
do_swapoff_device (const char *device)
{
- return swaponoff ("/sbin/swapoff", NULL, device);
+ return swaponoff ("swapoff", NULL, device);
}
int
return -1;
}
- r = swaponoff ("/sbin/swapon", NULL, buf);
+ r = swaponoff ("swapon", NULL, buf);
free (buf);
return r;
}
return -1;
}
- r = swaponoff ("/sbin/swapoff", NULL, buf);
+ r = swaponoff ("swapoff", NULL, buf);
free (buf);
return r;
}
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)
{
- 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)
{
- return swaponoff ("/sbin/swapon", "-U", uuid);
+ return swaponoff ("swapon", "-U", uuid);
}
int
do_swapoff_uuid (const char *uuid)
{
- return swaponoff ("/sbin/swapoff", "-U", uuid);
+ return swaponoff ("swapoff", "-U", uuid);
}