at 22.05-pre 2.2 kB view raw
1--- a/src/plugins/part.c 2+++ b/src/plugins/part.c 3@@ -146,7 +146,7 @@ static GMutex deps_check_lock; 4 #define DEPS_LAST 2 5 6 static const UtilDep deps[DEPS_LAST] = { 7- {"sgdisk", "0.8.6", NULL, "GPT fdisk \\(sgdisk\\) version ([\\d\\.]+)"}, 8+ {"@sgdisk@", "0.8.6", NULL, "GPT fdisk \\(sgdisk\\) version ([\\d\\.]+)"}, 9 {"sfdisk", NULL, NULL, NULL}, 10 }; 11 12@@ -355,7 +355,7 @@ gboolean bd_part_create_table (const gchar *disk, BDPartTableType type, gboolean 13 } 14 15 static gchar* get_part_type_guid_and_gpt_flags (const gchar *device, int part_num, guint64 *flags, GError **error) { 16- const gchar *args[4] = {"sgdisk", NULL, device, NULL}; 17+ const gchar *args[4] = {"@sgdisk@", NULL, device, NULL}; 18 gchar *output = NULL; 19 gchar **lines = NULL; 20 gchar **line_p = NULL; 21@@ -1325,7 +1325,7 @@ gboolean bd_part_resize_part (const gchar *disk, const gchar *part, guint64 size 22 23 24 static gboolean set_gpt_flag (const gchar *device, int part_num, BDPartFlag flag, gboolean state, GError **error) { 25- const gchar *args[5] = {"sgdisk", "--attributes", NULL, device, NULL}; 26+ const gchar *args[5] = {"@sgdisk@", "--attributes", NULL, device, NULL}; 27 int bit_num = 0; 28 gboolean success = FALSE; 29 30@@ -1351,7 +1351,7 @@ static gboolean set_gpt_flag (const gchar *device, int part_num, BDPartFlag flag 31 } 32 33 static gboolean set_gpt_flags (const gchar *device, int part_num, guint64 flags, GError **error) { 34- const gchar *args[5] = {"sgdisk", "--attributes", NULL, device, NULL}; 35+ const gchar *args[5] = {"@sgdisk@", "--attributes", NULL, device, NULL}; 36 guint64 real_flags = 0; 37 gchar *mask_str = NULL; 38 gboolean success = FALSE; 39@@ -1791,7 +1791,7 @@ gboolean bd_part_set_part_name (const gchar *disk, const gchar *part, const gcha 40 * Tech category: %BD_PART_TECH_GPT-%BD_PART_TECH_MODE_MODIFY_PART 41 */ 42 gboolean bd_part_set_part_type (const gchar *disk, const gchar *part, const gchar *type_guid, GError **error) { 43- const gchar *args[5] = {"sgdisk", "--typecode", NULL, disk, NULL}; 44+ const gchar *args[5] = {"@sgdisk@", "--typecode", NULL, disk, NULL}; 45 const gchar *part_num_str = NULL; 46 gboolean success = FALSE; 47 guint64 progress_id = 0;