X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fswap.c;h=51dbbe483f6748ae0508a622d5998d6b38d6ff87;hp=2d3d9ff413bf6aec17b133ad3fd32fb786fac393;hb=04ea1375c55aa67df4e7fc61dbb534111767f3b6;hpb=2d9953097b6d3b71122d444a4550047e97aee009

diff --git a/daemon/swap.c b/daemon/swap.c
index 2d3d9ff..51dbbe4 100644
--- a/daemon/swap.c
+++ b/daemon/swap.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include <config.h>
@@ -23,11 +23,16 @@
 #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).
@@ -38,8 +43,13 @@ optgroup_linuxfsuuid_available (void)
   char *err;
   int av;
 
-  /* Ignore return code - mkswap --help *will* fail. */
-  command (NULL, &err, "/sbin/mkswap", "--help", NULL);
+  /* Upstream util-linux have been gradually changing '--help' to go
+   * from stderr to stdout, and changing the return code from 1 to 0.
+   * Thus we need to fold stdout and stderr together, and ignore the
+   * return code.
+   */
+  ignore_value (commandf (NULL, &err, COMMAND_FLAG_FOLD_STDOUT_ON_STDERR,
+                          "mkswap", "--help", NULL));
 
   av = strstr (err, "-U") != NULL;
   free (err);
@@ -53,12 +63,12 @@ mkswap (const char *device, const char *flag, const char *value)
   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 ("mkswap: %s", err);
+    reply_with_error ("%s", err);
     free (err);
     return -1;
   }
@@ -77,6 +87,12 @@ do_mkswap (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);
 }
 
@@ -115,26 +131,31 @@ swaponoff (const char *cmd, const char *flag, const char *value)
     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);
 
+  /* 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
@@ -149,7 +170,7 @@ do_swapon_file (const char *path)
     return -1;
   }
 
-  r = swaponoff ("/sbin/swapon", NULL, buf);
+  r = swaponoff ("swapon", NULL, buf);
   free (buf);
   return r;
 }
@@ -166,7 +187,7 @@ do_swapoff_file (const char *path)
     return -1;
   }
 
-  r = swaponoff ("/sbin/swapoff", NULL, buf);
+  r = swaponoff ("swapoff", NULL, buf);
   free (buf);
   return r;
 }
@@ -174,23 +195,35 @@ do_swapoff_file (const char *path)
 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);
 }