Displaying 3 results from an estimated 3 matches for "9d7839e".
Did you mean:
937839
2015 Oct 05
0
Re: [PATCH] Remove multiple hacks that only apply to RHEL 5.
...t; We don't support RHEL 5 upstream (see the 'oldlinux' branch for a
> version that works with RHEL 5). Therefore remove a bunch of hacks
> that were only needed on RHEL 5.
> ---
Mostly LGTM, just two notes:
> diff --git a/daemon/swap.c b/daemon/swap.c
> index 26fe30d..9d7839e 100644
> --- a/daemon/swap.c
> +++ b/daemon/swap.c
> @@ -38,26 +38,10 @@ GUESTFSD_EXT_CMD(str_swaplabel, swaplabel);
> /* Confirmed this is true for Linux swap partitions from the Linux sources. */
> #define SWAP_LABEL_MAX 16
>
> -/* Convenient place to test for the later v...
2015 Oct 05
2
[PATCH] Remove multiple hacks that only apply to RHEL 5.
...)
* partition type info.
* Use traditional style.
*/
- CLEANUP_FREE char *out = print_partition_table (device, PARTED_OPT_NO_M);
+ CLEANUP_FREE char *out = print_partition_table (device, false);
if (!out)
return NULL;
diff --git a/daemon/swap.c b/daemon/swap.c
index 26fe30d..9d7839e 100644
--- a/daemon/swap.c
+++ b/daemon/swap.c
@@ -38,26 +38,10 @@ GUESTFSD_EXT_CMD(str_swaplabel, swaplabel);
/* 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-li...
2016 Nov 25
3
[PATCH 1/2] daemon: allow to change the labels of swap partitions
...);
+ else if (STREQ (vfs_type, "swap"))
+ r = swap_set_label (mountable->device, label);
+
else
NOT_SUPPORTED (-1, "don't know how to set the label for '%s' filesystems",
vfs_type);
diff --git a/daemon/swap.c b/daemon/swap.c
index 9d7839e..028bc1e 100644
--- a/daemon/swap.c
+++ b/daemon/swap.c
@@ -239,3 +239,24 @@ swap_set_uuid (const char *device, const char *uuid)
return 0;
}
+
+int
+swap_set_label (const char *device, const char *label)
+{
+ int r;
+ CLEANUP_FREE char *err = NULL;
+
+ if (strlen (label) > SWAP_LABEL_M...