Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=94ce485888b51961634dba3294abd19a3c21dc0d

commit 94ce485888b51961634dba3294abd19a3c21dc0d
Author: Elentir <elen...@mailoo.org>
Date:   Wed Dec 30 22:05:25 2009 +0100

some fix to partdisk plugin

* fix a segfault
* use copy of g_lists in run() to keep the originals without
* modifications (if the user go back)

diff --git a/src/plugins/partdisk.c b/src/plugins/partdisk.c
index 08ec472..decd7b6 100644
--- a/src/plugins/partdisk.c
+++ b/src/plugins/partdisk.c
@@ -786,7 +786,7 @@ void set_root_part(GtkWidget *widget, gpointer data)
if(requestformat(namedev) == -1)
return;

-               if(rootpart_selected->mount) {
+               if(rootpart_selected && rootpart_selected->mount) {
free(rootpart_selected->mount);
rootpart_selected->mount = NULL;
}
@@ -1095,7 +1095,7 @@ int run(GList **config)
// add all mounts points into fstab from the root to the leafs
for(i=0; i<g_list_length(allparts_device); i++) {
partition = (GList*)(((data_t*)g_list_nth_data(allparts_device, i))->data);
-               globallist = g_list_concat(globallist, partition);
+               globallist = g_list_concat(globallist, g_list_copy(partition));
}

/* Sorting mountspoints, if a is more close of the root
@@ -1112,7 +1112,9 @@ int run(GList **config)
mountdev(info->dev, info->mount, FALSE, config);
}
}
-
+
+       g_list_free(globallist);
+
// Copy files into new locations
chdir(TARGETDIR);
makepath(g_strdup_printf("%s/%s", TARGETDIR, "/etc/profile.d"));
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to