Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=cc111d422fbf5c3b401d57bdb3e9d038acbeb9e9
commit cc111d422fbf5c3b401d57bdb3e9d038acbeb9e9
Author: Elentir <elen...@mailoo.org>
Date: Wed Dec 30 20:21:39 2009 +0100
rewrite partdisk plugin
* fix this mess a little
* mount mountpoints in the right order
* fix some memleaks
diff --git a/src/plugins/partdisk.c b/src/plugins/partdisk.c
index 1bf54ad..08ec472 100644
--- a/src/plugins/partdisk.c
+++ b/src/plugins/partdisk.c
@@ -1,9 +1,9 @@
/*
* partdisk.c for Fwife
- *
+ *
* Copyright (c) 2005 by Miklos Vajna <vmik...@frugalware.org>
* Copyright (c) 2008, 2009 by Albar Boris <bori...@cegetel.net>
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
@@ -16,10 +16,10 @@
*
* 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
* USA.
*/
-
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -35,18 +35,27 @@
#include "common.h"
-//* Lists for preloading partition *//
+/* Lists for preloading partition */
static GList *parts=NULL;
-static GList *allparts=NULL;
+/* A list of list than contain a list of all partitions of a device */
+static GList *allparts_device=NULL;
+/* A list of devices */
static GList *devs=NULL;
-//* Current root partition selected */
-static GList* rootpart = NULL;
+struct fwife_part_info_t {
+ char *dev;
+ char *mount;
+ char *type;
+ char *size;
+};
+
+/* Current root partition selected */
+struct fwife_part_info_t *rootpart_selected = NULL;
static GtkWidget *comboparts = NULL;
static GtkWidget *partview = NULL;
-enum
+enum
{
PIXBUF_COL,
TEXT_COL
@@ -69,7 +78,7 @@ PedExceptionOption peh(PedException* ex)
plugin_t plugin =
{
- "formatdisk",
+ "formatdisk",
desc,
35,
load_gtk_widget,
@@ -91,14 +100,26 @@ char *desc()
return _("Partitioning the disk drives");
}
+void free_info_part(void *info)
+{
+ struct fwife_part_info_t *infot = (struct fwife_part_info_t*) info;
+ if(infot) {
+ free(infot->mount);
+ free(infot->dev);
+ free(infot->type);
+ free(infot->size);
+ }
+ free(infot);
+}
+
int partdetails(PedPartition *part, int noswap)
{
- char *pname, *ptype, *ptr;
- PedFileSystemType *type;
-
+ char *pname, *ptype, *size;
+ PedFileSystemType *type;
+ struct fwife_part_info_t *partinfo = NULL;
+
if ((type = ped_file_system_probe (&part->geom)) == NULL)
- // prevent a nice segfault
- ptype = strdup("unknown");
+ ptype = "unknown";
else
ptype = (char*)type->name;
@@ -108,19 +129,22 @@ int partdetails(PedPartition *part, int noswap)
pname = ped_partition_get_path(part);
// remove the unnecessary "p-1" suffix from sw raid device names
- if((ptr = strstr(pname, "p-1"))!=NULL)
- *ptr='\0';
-
- // for dialog menus
- parts = g_list_append(parts, pname);
- ptr = fsize(part->geom.length);
- parts = g_list_append(parts, g_strdup_printf("%s", ptr));
- parts = g_list_append(parts, g_strdup_printf("%s", ptype));
- // used for stock mounts points
- parts = g_list_append(parts, NULL);
-
- FREE(ptr);
-
+ if((size = strstr(pname, "p-1"))!=NULL)
+ *size='\0';
+
+ size = fsize(part->geom.length);
+
+ partinfo = malloc(sizeof(struct fwife_part_info_t));
+ memset(partinfo, 0, sizeof(struct fwife_part_info_t));
+
+ partinfo->dev = pname;
+ partinfo->size = strdup(size);
+ partinfo->type = strdup(ptype);
+
+ parts = g_list_append(parts, partinfo);
+
+ free(size);
+
return(0);
}
@@ -160,26 +184,23 @@ int detect_raids()
return(1);
}
MALLOC(line, PATH_MAX);
- while(!feof(fp))
- {
+ while(!feof(fp)) {
if(fgets(line, PATH_MAX, fp) == NULL)
break;
- if(strstr(line, "md")==line)
- {
+ if(strstr(line, "md")==line) {
ptr = line;
while(*ptr!=' ')
ptr++;
*ptr='\0';
dev = ped_device_get(g_strdup_printf("/dev/%s", line));
disk = ped_disk_new_fresh(dev, ped_disk_type_get ("loop"));
- if(disk)
- {
+ if(disk) {
part=ped_disk_next_partition(disk, NULL);
partdetails(part, 0);
}
}
}
- FREE(line);
+ free(line);
fclose(fp);
return(0);
}
@@ -192,17 +213,15 @@ char *findmount(char *dev, int mode)
char line[PATH_MAX], *ptr;
int i;
- if ((fp = fopen("/proc/mounts", "r"))== NULL)
- {
+ if ((fp = fopen("/proc/mounts", "r"))== NULL) {
perror("Could not open /proc/mounts output file for reading");
return(NULL);
}
- while(!feof(fp))
- {
+
+ while(!feof(fp)) {
if(fgets(line, PATH_MAX, fp) == NULL)
break;
- if(strstr(line, dev)==line)
- {
+ if(strstr(line, dev)==line) {
ptr = strstr(line, " ")+1;
if(!mode)
ptr = strstr(ptr, " ")+1;
@@ -221,27 +240,27 @@ int detect_parts(int noswap)
{
PedDevice *dev = NULL;
PedDisk *disk = NULL;
+ int i;
ped_device_free_all();
chdir("/");
ped_exception_set_handler(peh);
ped_device_probe_all();
-
- if(allparts != NULL)
- {
- int i;
- for(i=0;i<g_list_length(allparts);i++)
- {
- data_t *dat = (data_t*)g_list_nth_data(allparts, i);
- if(dat->data)
+
+ /* if not NULL free all the parts_infos, and clean the tree */
+ if(allparts_device != NULL) {
+ for(i=0;i<g_list_length(allparts_device);i++) {
+ data_t *dat = (data_t*)g_list_nth_data(allparts_device,
i);
+ if(dat->data) {
+ g_list_foreach(dat->data,
(GFunc)free_info_part, NULL);
g_list_free(dat->data);
+ }
+ g_list_free(allparts_device);
+ allparts_device = NULL;
+ parts=NULL;
+
gtk_list_store_clear(GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(partview))));
}
- g_list_free(allparts);
- allparts = NULL;
- parts=NULL;
-
gtk_list_store_clear(GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(partview))));
-
}
if(ped_device_get_next(NULL)==NULL)
@@ -249,17 +268,16 @@ int detect_parts(int noswap)
// the user about this
return(1);
- for(dev=ped_device_get_next(NULL);dev!=NULL;dev=dev->next)
- {
+ for(dev=ped_device_get_next(NULL);dev!=NULL;dev=dev->next) {
if(dev->read_only)
// we don't want to partition cds ;-)
continue;
disk = ped_disk_new(dev);
- if(disk)
- {
+ if(disk) {
listparts(disk, noswap);
- data_put(&allparts, dev->path, parts);
- parts = NULL;
+ /* put the list of the parts into the list of list */
+ data_put(&allparts_device, dev->path, parts);
+ parts = NULL;
}
}
@@ -276,16 +294,16 @@ int buggy_md0()
fp = fopen("/proc/mdstat", "r");
if(!fp)
return(1);
- while(!feof(fp))
- {
+
+ while(!feof(fp)) {
if(fgets(line, 255, fp) == NULL)
break;
- if(!strncmp(line, "md", 2))
- {
+ if(!strncmp(line, "md", 2)) {
fclose(fp);
return(0);
}
}
+
return(1);
}
@@ -293,7 +311,7 @@ int listdevs(void)
{
PedDevice *dev=NULL;
char *ptr;
-
+
// silly raid autodetect, md0 always created
if(buggy_md0())
unlink("/dev/md0");
@@ -304,21 +322,20 @@ int listdevs(void)
if(ped_device_get_next(NULL)==NULL)
return(-1);
- for(dev=ped_device_get_next(NULL);dev!=NULL;dev=dev->next)
- {
+ for(dev=ped_device_get_next(NULL);dev!=NULL;dev=dev->next) {
if(dev->read_only)
// we don't want to partition cds ;-)
continue;
devs = g_list_append(devs, strdup(dev->path));
ptr = fsize(dev->length);
devs = g_list_append(devs, g_strdup_printf("%s\t%s", ptr, dev->model));
- FREE(ptr);
+ free(ptr);
}
return(0);
}
-//* Create combolist with nice icons *//
+/* Create combolist with nice icons */
GtkTreeModel *create_stock_icon_store ()
{
GtkStockItem item;
@@ -329,11 +346,10 @@ GtkTreeModel *create_stock_icon_store ()
gint i;
cellview = gtk_cell_view_new ();
-
+
store = gtk_list_store_new (2, GDK_TYPE_PIXBUF, G_TYPE_STRING);
- for (i = 0; i < g_list_length(devs); i+=2)
- {
+ for (i = 0; i < g_list_length(devs); i+=2) {
pixbuf = gtk_widget_render_icon (cellview, GTK_STOCK_HARDDISK,
GTK_ICON_SIZE_BUTTON, NULL);
gtk_stock_lookup (GTK_STOCK_HARDDISK, &item);
@@ -343,88 +359,102 @@ GtkTreeModel *create_stock_icon_store ()
}
gtk_widget_destroy (cellview);
-
+
return GTK_TREE_MODEL (store);
}
-//* Add a mountpoint into fstab file *//
+/* Add a mountpoint into fstab file */
int mountdev(char *dev, char *mountpoint, gboolean isswap, GList **config)
{
char *type=NULL;
FILE* fp;
+ char *ptr;
// open fstab
- if ((fp = fopen((char*)data_get(*config, "fstab"), "a")) == NULL)
- {
+ if ((fp = fopen((char*)data_get(*config, "fstab"), "a")) == NULL) {
perror("Could not open fstab output file for writing");
return(1);
}
-
- if(isswap == TRUE)
- {
+
+ if(isswap == TRUE) {
fprintf(fp, "%-16s %-16s %-11s %-16s %-3s %s\n",dev, "swap", "swap",
"defaults", "0", "0");
+ } else {
+ // mount
+ ptr = g_strdup_printf("%s/%s", TARGETDIR, mountpoint);
+ makepath(ptr);
+ free(ptr);
+ umount_if_needed(mountpoint);
+ fw_system(g_strdup_printf("mount %s %s/%s",
+ dev, TARGETDIR, mountpoint));
+ // unlink a possible stale lockfile
+ ptr = g_strdup_printf("%s/%s/tmp/pacman-g2.lck", TARGETDIR,
mountpoint);
+ unlink(ptr);
+ free(ptr);
+
+ // make fstab entry
+ type = findmount(dev, 0);
+ fprintf(fp, "%-16s %-16s %-11s %-16s %-3s %s\n", dev,
mountpoint,
+ type, "defaults", "1", "1");
}
- else
- {
- // mount
- makepath(g_strdup_printf("%s/%s", TARGETDIR, mountpoint));
- umount_if_needed(mountpoint);
- fw_system(g_strdup_printf("mount %s %s/%s",
- dev, TARGETDIR, mountpoint));
- // unlink a possible stale lockfile
- unlink(g_strdup_printf("%s/%s/tmp/pacman-g2.lck", TARGETDIR,
mountpoint));
-
- // make fstab entry
- type = findmount(dev, 0);
- fprintf(fp, "%-16s %-16s %-11s %-16s %-3s %s\n", dev, mountpoint,
- type, "defaults", "1", "1");
- }
-
+
fclose(fp);
return(0);
}
-//* Foramt a partition and create filesystem on it *//
+/* Foramt a partition and create filesystem on it */
int mkfss(char *dev, char *fs, gboolean checked)
{
char *opts=NULL;
- // TOFIX : Memory leaks
+ int ret = 0;
+ char *ptr = NULL;
+
if(checked == TRUE)
opts = strdup("-c");
else
opts = strdup("");
umount(findmount(dev, 1));
- if(!strcmp(fs, "ext2"))
- return(fw_system(g_strdup_printf("mke2fs %s %s", opts, dev)));
- else if(!strcmp(fs, "ext3"))
- return(fw_system(g_strdup_printf("mke2fs -j %s %s", opts,
dev)));
- else if(!strcmp(fs, "ext4"))
- return(fw_system(g_strdup_printf("mkfs.ext4 %s %s", opts,
dev)));
- else if(!strcmp(fs, "reiserfs"))
- return(fw_system(g_strdup_printf("echo y |mkreiserfs %s",
dev)));
- else if(!strcmp(fs, "jfs"))
- return(fw_system(g_strdup_printf("mkfs.jfs -q %s %s", opts,
dev)));
- else if(!strcmp(fs, "xfs"))
- return(fw_system(g_strdup_printf("mkfs.xfs -f %s", dev)));
- else if(!strcmp(fs, "swap"))
- {
- fw_system(g_strdup_printf("%s %s %s", MKSWAP, opts, dev));
- fw_system(g_strdup_printf("%s %s", SWAPON, dev));
- return(0);
+ if(!strcmp(fs, "ext2")) {
+ ptr = g_strdup_printf("mke2fs %s %s", opts, dev);
+ ret = fw_system(ptr);
+ } else if(!strcmp(fs, "ext3")) {
+ ptr = g_strdup_printf("mke2fs -j %s %s", opts, dev);
+ ret = fw_system(ptr);
+ } else if(!strcmp(fs, "ext4")) {
+ ptr = g_strdup_printf("mkfs.ext4 %s %s", opts, dev);
+ ret = fw_system(ptr);
+ } else if(!strcmp(fs, "reiserfs")) {
+ ptr = g_strdup_printf("mkreiserfs -q %s", dev);
+ ret = fw_system(ptr);
+ } else if(!strcmp(fs, "jfs")) {
+ ptr = g_strdup_printf("mkfs.jfs -q %s %s", opts, dev);
+ ret = fw_system(ptr);
+ } else if(!strcmp(fs, "xfs")) {
+ ptr = g_strdup_printf("mkfs.xfs -f %s", dev);
+ ret = fw_system(ptr);
+ } else if(!strcmp(fs, "swap")) {
+ ptr = g_strdup_printf("%s %s %s", MKSWAP, opts, dev);
+ fw_system(ptr);
+ free(ptr);
+ ptr = g_strdup_printf("%s %s", SWAPON, dev);
+ fw_system(ptr);
+ ret = 0;
}
-
- // never reached
- return(-1);
+
+ free(ptr);
+ free(opts);
+ return ret;
}
-//* A cell has been edited *//
+/* A cell has been edited */
void cell_edited(GtkCellRendererText *cell, const gchar *path_string, gchar
*new_text, gpointer data)
{
GtkTreeModel *model = (GtkTreeModel *)data;
GtkTreePath *path = gtk_tree_path_new_from_string (path_string);
GtkTreeIter iter;
-
+ gchar *old_text = NULL;
+ int i;
+
gint column = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (cell), "column"));
gtk_tree_model_get_iter (model, &iter, path);
@@ -433,24 +463,17 @@ void cell_edited(GtkCellRendererText *cell, const gchar
*path_string, gchar *new
{
case MOUNT_COLUMN:
{
- gint i;
- gchar *old_text = NULL;
-
gtk_tree_model_get (model, &iter, column, &old_text, -1);
-
+
if(new_text && old_text && !strcmp(new_text, old_text))
return;
-
- i = gtk_tree_path_get_indices (path)[0];
- if(old_text)
- {
- if(!strcmp(old_text, "/"))
- {
+
+ i = gtk_tree_path_get_indices (path)[0];
+ if(old_text) {
+ if(!strcmp(old_text, "/")) {
fwife_error(_("If you want to change your root partition, select the new
partition and use \"Set root partition\" button!"));
return;
- }
- else if(!strcmp(old_text, "swap"))
- {
+ } else if(!strcmp(old_text, "swap")) {
switch(fwife_question(_("Unselect this swap partition?")))
{
case GTK_RESPONSE_YES:
@@ -460,80 +483,71 @@ void cell_edited(GtkCellRendererText *cell, const gchar
*path_string, gchar *new
return;
}
}
-
}
- if(new_text && (!strcmp(new_text, "/") ||
!strcmp(new_text, "swap")))
- {
+
+ if(new_text && (!strcmp(new_text, "/") ||
!strcmp(new_text, "swap"))) {
fwife_error(_("Use the suitable button to perform this action!"));
- }
- else if(new_text)
- {
- if(old_text)
- g_free (old_text);
-
- GList *point = g_list_nth(parts, 4*i+3);
- gchar *text = g_strdup(new_text);
- point->data = text;
+ } else if(new_text) {
+ struct fwife_part_info_t *info = (struct
fwife_part_info_t*)g_list_nth_data(parts, i);
+ if(info->mount)
+ free(info->mount);
+ info->mount = strdup(new_text);
gtk_list_store_set (GTK_LIST_STORE (model), &iter, MOUNT_COLUMN, new_text, -1);
}
}
break;
}
-
gtk_tree_path_free (path);
}
-
-//* Update partview (partition list) *//
+/* Update partview (partition list) */
void update_treeview_list()
{
int i;
GtkTreeIter iter;
-
+ struct fwife_part_info_t *info;
+ GtkWidget *cellview;
+ GdkPixbuf *pixbuf;
+
gtk_list_store_clear(GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(partview))));
-
- if(parts != NULL)
- {
- for(i=0; i < g_list_length(parts); i+=4 )
- {
- char *mount = (char*)g_list_nth_data(parts,i+3);
+
+ if(parts != NULL) {
+ for(i=0; i < g_list_length(parts); i++ ) {
+ info = (struct fwife_part_info_t*)
g_list_nth_data(parts,i);
+
gtk_list_store_append(GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(partview))),
&iter);
-
-
gtk_list_store_set(GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(partview))),
&iter, NAME_COLUMN, (char*)g_list_nth_data(parts, i), SIZE_COLUMN,
(char*)g_list_nth_data(parts, i+1), FS_COLUMN,(char*)g_list_nth_data(parts,
i+2), -1);
- if(mount)
- {
- if(!strcmp(mount, "/"))
- {
- GtkWidget *cellview = gtk_cell_view_new
();
- GdkPixbuf *pixbuf =
gtk_widget_render_icon (cellview, GTK_STOCK_HOME, GTK_ICON_SIZE_BUTTON, NULL);
+
gtk_list_store_set(GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(partview))),
&iter, NAME_COLUMN, info->dev, SIZE_COLUMN, info->size, FS_COLUMN, info->type,
-1);
+
+ if(info->mount) {
+ if(!strcmp(info->mount, "/")) {
+ cellview = gtk_cell_view_new ();
+ pixbuf = gtk_widget_render_icon
(cellview, GTK_STOCK_HOME, GTK_ICON_SIZE_BUTTON, NULL);
gtk_widget_destroy (cellview);
- gtk_list_store_set
(GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(partview))), &iter,
TYPE_COLUMN, pixbuf,MOUNT_COLUMN, mount,-1);
- }
- else if(!strcmp(mount, "swap"))
- {
- GtkWidget *cellview = gtk_cell_view_new
();
- GdkPixbuf *pixbuf =
gtk_widget_render_icon (cellview, GTK_STOCK_CONVERT, GTK_ICON_SIZE_BUTTON,
NULL);
+ gtk_list_store_set
(GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(partview))), &iter,
TYPE_COLUMN, pixbuf, MOUNT_COLUMN, info->mount,-1);
+ } else if(!strcmp(info->mount, "swap")) {
+ cellview = gtk_cell_view_new ();
+ pixbuf = gtk_widget_render_icon
(cellview, GTK_STOCK_CONVERT, GTK_ICON_SIZE_BUTTON, NULL);
gtk_widget_destroy (cellview);
- gtk_list_store_set
(GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(partview))), &iter,
TYPE_COLUMN, pixbuf,MOUNT_COLUMN, mount,-1);
+ gtk_list_store_set
(GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(partview))), &iter,
TYPE_COLUMN, pixbuf, MOUNT_COLUMN, info->mount, -1);
+ } else {
+ gtk_list_store_set
(GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(partview))), &iter,
MOUNT_COLUMN, info->mount, -1);
}
- else
- {
- gtk_list_store_set
(GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(partview))), &iter,
MOUNT_COLUMN, mount,-1);
- }
- }
+ }
}
}
}
-//* Create a dialog box for formatting namedev device *//
+/* Create a dialog box for formatting namedev device */
int requestformat(char *namedev)
{
-
+
GSList *pList;
char *sLabel = NULL;
char *fs = NULL;
extern GtkWidget *assistant;
-
+ int i;
+ struct fwife_part_info_t *info = NULL;
+
GtkWidget* pBoite = gtk_dialog_new_with_buttons(_("Do you want to format
partition?"),
GTK_WINDOW(assistant),
GTK_DIALOG_MODAL,
@@ -544,26 +558,24 @@ int requestformat(char *namedev)
gtk_window_set_position(GTK_WINDOW(pBoite), GTK_WIN_POS_CENTER_ON_PARENT);
GtkWidget *pVBox = GTK_DIALOG(pBoite)->vbox;
-
- GtkWidget *pLabelInfo=gtk_label_new(NULL);
- /* On utilise les balises */
- gtk_label_set_markup(GTK_LABEL(pLabelInfo), _("<span face=\"Courier
New\" foreground=\"#f90909\"><b>!!! NOTE: This will erase all data on it. Would
you like to format this partition? !!!</b></span>\n"));
-
+ GtkWidget *pLabelInfo = gtk_label_new(NULL);
+ gtk_label_set_markup(GTK_LABEL(pLabelInfo), _("<span font=\"11\"
foreground=\"#f90909\"><b>!!! NOTE: This will erase all data on it. Would you
like to format this partition? !!!</b></span>\n"));
gtk_box_pack_start(GTK_BOX(pVBox), pLabelInfo, FALSE, FALSE, 0);
- GtkWidget *pLabel = gtk_label_new(_("Choose filesystem :"));
+ GtkWidget *pLabel = gtk_label_new(NULL);
+ gtk_label_set_markup(GTK_LABEL(pLabel), _("<span font=\"11\"><b>Choose
filesystem :</b></span>\n"));
gtk_box_pack_start(GTK_BOX(pVBox), pLabel, FALSE, FALSE, 2);
-
+
/* Ext3 filesystem - default*/
GtkWidget *pRadio1 = gtk_radio_button_new_with_label(NULL, _("ext3 -
Journalising version of the ext2 filesystem"));
/* Ext2 filesystem */
GtkWidget *pRadio2 =
gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON (pRadio1), _("ext2
- Standard Linux ext2 filesystem"));
-
+
/* Ext4 filesystem , experimental by now */
GtkWidget *pRadio3 =
gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON (pRadio1), _("ext4
- The evolution of the ext3 filesystem (EXPERIMENTAL!)"));
-
+
gtk_box_pack_start(GTK_BOX (pVBox), pRadio3, FALSE, FALSE, 2);
gtk_box_pack_start(GTK_BOX (pVBox), pRadio2, FALSE, FALSE, 2);
gtk_box_pack_start(GTK_BOX (pVBox), pRadio1, FALSE, FALSE, 2);
@@ -575,19 +587,20 @@ int requestformat(char *namedev)
/* XFS */
GtkWidget *pRadio5 =
gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON (pRadio1), _("xfs
- SGI's journalising filesystem"));
gtk_box_pack_start(GTK_BOX (pVBox), pRadio5, FALSE, FALSE, 2);
-
+
GtkWidget *pRadio6 =
gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON (pRadio1),
_("Noformat - keep filesystem"));
gtk_box_pack_start(GTK_BOX (pVBox), pRadio6, FALSE, FALSE, 2);
-
+
GtkWidget *separator = gtk_hseparator_new();
gtk_box_pack_start (GTK_BOX (pVBox), separator, FALSE, FALSE, 5);
-
- GtkWidget *pLabel2 = gtk_label_new(_("Options :"));
+
+ GtkWidget *pLabel2 = gtk_label_new(NULL);
+ gtk_label_set_markup(GTK_LABEL(pLabel2), _("<span
font=\"11\"><b>Options :</b></span>\n"));
gtk_box_pack_start(GTK_BOX(pVBox), pLabel2, FALSE, FALSE, 5);
-
+
GtkWidget *check = gtk_check_button_new_with_label(_("Check for bad blocks -
slowly"));
gtk_box_pack_start(GTK_BOX (pVBox), check, FALSE, FALSE, 5);
-
+
/* Show vbox */
gtk_widget_show_all(GTK_DIALOG(pBoite)->vbox);
@@ -595,29 +608,22 @@ int requestformat(char *namedev)
switch (gtk_dialog_run(GTK_DIALOG(pBoite)))
{
/* Formatting */
- case GTK_RESPONSE_OK:
-
- /* Recuperation de la liste des boutons */
+ case GTK_RESPONSE_OK:
+ /* get button list */
pList = gtk_radio_button_get_group(GTK_RADIO_BUTTON(pRadio1));
-
- /* Parcours de la liste */
- while(pList)
- {
+ while(pList) {
/* button selected? */
-
if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(pList->data)))
- {
+
if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(pList->data))) {
/* get button label */
sLabel = strdup((char*)gtk_button_get_label(GTK_BUTTON(pList->data)));
- /* Get out */
+ /* Get out */
pList = NULL;
- }
- else
- {
+ } else {
/* next button */
pList = g_slist_next(pList);
}
}
-
+
if(!strcmp(sLabel, _("ext2 - Standard Linux ext2 filesystem")))
fs = "ext2";
else if(!strcmp(sLabel, _("ext3 - Journalising version of the ext2
filesystem")))
@@ -630,20 +636,17 @@ int requestformat(char *namedev)
fs = "xfs";
else
fs = NULL;
-
-
-
- if(fs == NULL)
- {
+
+
+
+ if(fs == NULL) {
gtk_widget_destroy(pBoite);
- FREE(sLabel);
+ free(sLabel);
return 0;
- }
- else
- {
+ } else {
gboolean checked = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(check));
// change label
- gtk_label_set_markup(GTK_LABEL(pLabelInfo), _("<span
face=\"Courier New\"><b>Creating filesystem... Please wait ... </b></span>\n"));
+ gtk_label_set_markup(GTK_LABEL(pLabelInfo), _("<span
font=\"11\"><b>Creating filesystem... Please wait ... </b></span>\n"));
// hide all widgets
gtk_widget_hide(pLabel);
gtk_widget_hide(pLabel2);
@@ -658,25 +661,23 @@ int requestformat(char *namedev)
while (gtk_events_pending())
gtk_main_iteration ();
- //* if sucessfull, replace into glist and update
treeview *//
- if(mkfss(namedev, fs, checked) == 0)
- {
- int i;
- for(i=0; i<g_list_length(parts); i+=4)
- {
-
if(!strcmp((char*)g_list_nth_data(parts, i), namedev))
+ /* if sucessfull, replace into glist and update
treeview */
+ if(mkfss(namedev, fs, checked) == 0) {
+ for(i=0; i<g_list_length(parts); i++) {
+ info = (struct
fwife_part_info_t*)g_list_nth_data(parts, i);
+ if(!strcmp(info->dev, namedev))
break;
}
-
- GList *elem = g_list_nth(parts, i+2);
- if(elem)
- {
- FREE(elem->data);
- elem->data = strdup(fs);
+
+ if(!info)
+ break;
+
+ if(info->type) {
+ free(info->type);
}
+ info->type = strdup(fs);
update_treeview_list();
- }
-
+ }
}
break;
/* Exit */
@@ -684,19 +685,22 @@ int requestformat(char *namedev)
case GTK_RESPONSE_NONE:
default:
gtk_widget_destroy(pBoite);
- FREE(sLabel);
+ free(sLabel);
return -1;
}
- FREE(sLabel);
+
+ free(sLabel);
gtk_widget_destroy(pBoite);
return 0;
}
-//* Set the partition "namedev" as a swap partition *//
+/* Set the partition "namedev" as a swap partition */
int swapformat(char *namedev)
{
extern GtkWidget *assistant;
-
+ struct fwife_part_info_t *info = NULL;
+ int i;
+
GtkWidget* pBoite = gtk_dialog_new_with_buttons(_("Do you want to format
partition?"),
GTK_WINDOW(assistant),
GTK_DIALOG_MODAL,
@@ -707,14 +711,14 @@ int swapformat(char *namedev)
/* Creation de la zone de saisie */
GtkWidget *pVBox = GTK_DIALOG(pBoite)->vbox;
-
+
GtkWidget *pLabelInfo=gtk_label_new(NULL);
/* On utilise les balises */
- gtk_label_set_markup(GTK_LABEL(pLabelInfo), _("<span face=\"Courier
New\" foreground=\"#f90909\"><b>You need to format is you want to use it as a
swap partition!\nThis will erase all your data on that partition !\n\n Do you
want to continue? </b></span>\n"));
-
+ gtk_label_set_markup(GTK_LABEL(pLabelInfo), _("<span font=\"11\"
foreground=\"#f90909\"><b>You need to format is you want to use it as a swap
partition!\nThis will erase all your data on that partition !\n\n Do you want
to continue? </b></span>\n"));
+
gtk_box_pack_start(GTK_BOX(pVBox), pLabelInfo, FALSE, FALSE, 0);
-
+
/* Affichage des elements de la boite de dialogue */
gtk_widget_show_all(GTK_DIALOG(pBoite)->vbox);
@@ -723,23 +727,22 @@ int swapformat(char *namedev)
{
/* L utilisateur valide */
case GTK_RESPONSE_OK:
- if(mkfss(namedev, "swap", FALSE) == 0)
- {
- int i;
- for(i=0; i<g_list_length(parts); i+=4)
- {
-
if(!strcmp((char*)g_list_nth_data(parts, i), namedev))
+ if(mkfss(namedev, "swap", FALSE) == 0) {
+ for(i=0; i<g_list_length(parts); i++) {
+ info = (struct
fwife_part_info_t*)g_list_nth_data(parts, i);
+ if(!strcmp(info->dev, namedev))
break;
}
-
- GList *elem = g_list_nth(parts, i+2);
- if(elem)
- {
- FREE(elem->data);
- elem->data = strdup("linux-swap");
+
+ if(!info)
+ break;
+
+ if(info->type) {
+ free(info->type);
}
+ info->type = strdup("linux-swap");
update_treeview_list();
- }
+ }
break;
/* L utilisateur annule */
case GTK_RESPONSE_CANCEL:
@@ -749,61 +752,56 @@ int swapformat(char *namedev)
return (-1);
break;
}
+
gtk_widget_destroy(pBoite);
return 0;
}
-//* Button set as root partition clicked *//
+/* Button set as root partition clicked */
void set_root_part(GtkWidget *widget, gpointer data)
{
- GtkTreeModel *model = NULL;
+ GtkTreeModel *model;
GtkTreeIter iter;
char* namedev;
- GtkTreeSelection *selection =
gtk_tree_view_get_selection(GTK_TREE_VIEW(partview));
+ struct fwife_part_info_t *info;
+
+ GtkTreeSelection *selection =
gtk_tree_view_get_selection(GTK_TREE_VIEW(partview));
model = gtk_tree_view_get_model(GTK_TREE_VIEW(GTK_TREE_VIEW(partview)));
-
- if(gtk_tree_selection_get_selected(selection, &model, &iter))
- {
+
+ if(gtk_tree_selection_get_selected(selection, &model, &iter)) {
// one root partition as been selected before ; ask for changing
- if(rootpart)
- {
- switch(fwife_question(_("Select this partition as root
partition?")))
- {
+ if(rootpart_selected) {
+ switch(fwife_question(_("Select this partition as root
partition?"))) {
case GTK_RESPONSE_YES:
- if(rootpart->data)
- {
- g_free(rootpart->data);
- rootpart->data = NULL;
- }
break;
case GTK_RESPONSE_NO:
return;
}
}
-
+
GtkTreePath *path = gtk_tree_model_get_path(model, &iter);
gint i = gtk_tree_path_get_indices (path)[0];
gtk_tree_model_get (model, &iter, NAME_COLUMN, &namedev, -1);
-
+
if(requestformat(namedev) == -1)
return;
- gchar *mount = g_strdup("/");
- // get list mount element for new root partition
- GList *point = g_list_nth(parts, 4*i+3);
- if(point->data)
- g_free(point->data);
- point->data = mount;
-
- rootpart = point;
-
- // check if at least one swap partition and one root partition
is selected
- if(rootpart)
- {
- set_page_completed();
+
+ if(rootpart_selected->mount) {
+ free(rootpart_selected->mount);
+ rootpart_selected->mount = NULL;
}
-
+
+ // get list mount element for new root partition
+ info = g_list_nth_data(parts, i);
+ if(info->mount)
+ free(info->mount);
+ info->mount= strdup("/");
+
+ rootpart_selected = info;
+ set_page_completed();
+
update_treeview_list();
- }
+ }
}
void set_format_part(GtkWidget *widget, gpointer data)
@@ -811,12 +809,12 @@ void set_format_part(GtkWidget *widget, gpointer data)
GtkTreeModel *model = NULL;
GtkTreeIter iter;
char* namedev;
- GtkTreeSelection *selection =
gtk_tree_view_get_selection(GTK_TREE_VIEW(partview));
+
+ GtkTreeSelection *selection =
gtk_tree_view_get_selection(GTK_TREE_VIEW(partview));
model = gtk_tree_view_get_model(GTK_TREE_VIEW(GTK_TREE_VIEW(partview)));
-
+
//get partition name
- if(gtk_tree_selection_get_selected(selection, &model, &iter))
- {
+ if(gtk_tree_selection_get_selected(selection, &model, &iter)) {
gtk_tree_model_get (model, &iter, NAME_COLUMN, &namedev, -1);
}
@@ -824,72 +822,70 @@ void set_format_part(GtkWidget *widget, gpointer data)
requestformat(namedev);
}
-//* Idem for swap *//
+/* Idem for swap */
void set_swap_part(GtkWidget *widget, gpointer data)
{
GtkTreeModel *model = NULL;
+ GtkTreePath *path = NULL;
GtkTreeIter iter;
char* namedev;
- GtkTreeSelection *selection =
gtk_tree_view_get_selection(GTK_TREE_VIEW(partview));
-
- model = gtk_tree_view_get_model(GTK_TREE_VIEW(GTK_TREE_VIEW(partview)));
- if(gtk_tree_selection_get_selected(selection, &model, &iter))
- {
- GtkTreePath *path = gtk_tree_model_get_path(model, &iter);
- gchar *mount = strdup("swap");
- gint i = gtk_tree_path_get_indices (path)[0];
- GList *point = g_list_nth (parts, 4*i+3);
+ int i;
+ struct fwife_part_info_t *info;
+
+ GtkTreeSelection *selection =
gtk_tree_view_get_selection(GTK_TREE_VIEW(partview));
+ model = gtk_tree_view_get_model(GTK_TREE_VIEW(GTK_TREE_VIEW(partview)));
+
+ if(gtk_tree_selection_get_selected(selection, &model, &iter)) {
+ path = gtk_tree_model_get_path(model, &iter);
+ i = gtk_tree_path_get_indices (path)[0];
+ info = (struct fwife_part_info_t*) g_list_nth_data(parts, i);
gtk_tree_model_get (model, &iter, NAME_COLUMN, &namedev, -1);
-
+
// Case if we want to change the root partition to a swap one
- if(point->data && !strcmp((char*)point->data,"/"))
- {
- fwife_error(_("Can't do this operation directly! Change
your root partition first."));
+ if(info->mount && !strcmp(info->mount,"/")) {
+ fwife_error(_("Can't do this operation directly! Change
your root partition first."));
return;
}
+
if(swapformat(namedev) == -1)
return;
// Free old pointer
- if(point->data)
- g_free(point->data);
- // add new
- point->data = mount;
- // check if completed page conditions are verified
- if(rootpart)
- {
- set_page_completed();
- }
+ if(info->mount)
+ free(info->mount);
+ info->mount = strdup("swap");
+
+ update_treeview_list();
}
- update_treeview_list();
}
-//* Change combo so load correct glist and refresh treeview *//
+/* Change combo so load correct glist and refresh treeview */
void change_part_list(GtkComboBox *combo, gpointer data)
{
char *selected;
GtkTreeIter iter;
GtkTreeModel *model;
+ int pos;
+
if(gtk_combo_box_get_active_iter(combo, &iter) == TRUE) {
model = gtk_combo_box_get_model(combo);
gtk_tree_model_get (model, &iter, TEXT_COL, &selected, -1);
-
+
GList *elem = g_list_find_custom(devs, selected, cmp_str);
- if(elem != NULL)
- {
- int pos = g_list_position(devs, elem);
+ if(elem != NULL) {
+ pos = g_list_position(devs, elem);
gtk_label_set_label(GTK_LABEL(data), (char*)g_list_nth_data(devs, pos+1));
- }
- else
+ } else {
gtk_label_set_label(GTK_LABEL(data), "");
-
- if (allparts)
- parts = (GList*)data_get(allparts, selected);
-
+ }
+
+ if (allparts_device)
+ parts = (GList*)data_get(allparts_device, selected);
+
update_treeview_list();
}
}
-//* Launch gparted *//
+/* Launch gparted */
void run_gparted(GtkWidget *widget, gpointer data)
{
switch(fwife_question(_("Do you want to run gparted to create/modify
partitions?")))
@@ -899,8 +895,7 @@ void run_gparted(GtkWidget *widget, gpointer data)
detect_parts(0);
gtk_combo_box_set_active (GTK_COMBO_BOX (comboparts), 0);
change_part_list(GTK_COMBO_BOX (comboparts), data);
- //* Mountpoint are reset *//
- rootpart = NULL;
+ // Mountpoint are reset
set_page_incompleted();
break;
case GTK_RESPONSE_NO:
@@ -908,35 +903,35 @@ void run_gparted(GtkWidget *widget, gpointer data)
}
}
-//* Load gtk widget for this plugin *//
+/* Load gtk widget for this plugin */
GtkWidget *load_gtk_widget()
{
GtkWidget *pVBox, *pHBox, *info;
- GtkWidget *diskinfo, *device;
+ GtkWidget *diskinfo, *device;
+
+ listdevs();
+
+ /* Combobox containing devices */
+ pVBox = gtk_vbox_new(FALSE, 5);
- listdevs();
-
- //* Combobox containing devices *//
- pVBox = gtk_vbox_new(FALSE, 5);
-
info = gtk_label_new(NULL);
- gtk_label_set_markup(GTK_LABEL(info), _("<span face=\"Courier
New\"><b>Select and format your partitions or launch GParted to modify
them.</b></span>\n"));
+ gtk_label_set_markup(GTK_LABEL(info), _("<span font=\"11\"><b>Select
and format your partitions or launch GParted to modify them.</b></span>\n"));
gtk_box_pack_start (GTK_BOX (pVBox),info, FALSE, FALSE, 10);
-
+
/* HBox for disk information and selection */
pHBox = gtk_hbox_new(FALSE,5);
gtk_box_pack_start (GTK_BOX (pVBox), pHBox, FALSE, FALSE, 0);
-
+
device = gtk_label_new(_(" Devices : "));
- gtk_box_pack_start (GTK_BOX (pHBox), device, FALSE, FALSE, 0);
-
+ gtk_box_pack_start (GTK_BOX (pHBox), device, FALSE, FALSE, 0);
+
/*GTK Widget for selecting harddisk */
GtkTreeModel *model = create_stock_icon_store (devs);
comboparts = gtk_combo_box_new_with_model (model);
g_object_unref (model);
gtk_widget_set_size_request(comboparts, 120, 40);
gtk_box_pack_start (GTK_BOX (pHBox), comboparts, FALSE, FALSE, 10);
-
+
GtkCellRenderer *renderer = gtk_cell_renderer_pixbuf_new();
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (comboparts), renderer, FALSE);
gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (comboparts), renderer,
"pixbuf", PIXBUF_COL, NULL);
@@ -947,45 +942,45 @@ GtkWidget *load_gtk_widget()
diskinfo = gtk_label_new("");
gtk_box_pack_start (GTK_BOX (pHBox), diskinfo, FALSE, TRUE, 50);
-
+
/* List of device partition with mountpoints and other*/
-
+
GtkListStore *store;
GtkTreeViewColumn *col;
GtkWidget *pScrollbar;
GtkTreeSelection *selection;
GtkWidget *hboxlist;
-
+
hboxlist = gtk_hbox_new(TRUE, 5);
- gtk_box_pack_start (GTK_BOX (pVBox), hboxlist, TRUE, TRUE, 10);
-
+ gtk_box_pack_start (GTK_BOX (pVBox), hboxlist, TRUE, TRUE, 10);
+
store = gtk_list_store_new(NUM_COLUMN, GDK_TYPE_PIXBUF, G_TYPE_STRING,
G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
model = GTK_TREE_MODEL(store);
-
+
partview = gtk_tree_view_new_with_model(model);
g_object_unref (model);
gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(partview), TRUE);
-
+
// a small icon for swap and root partition
renderer = gtk_cell_renderer_pixbuf_new();
col = gtk_tree_view_column_new_with_attributes ("", renderer, "pixbuf",
TYPE_COLUMN, NULL);
- gtk_tree_view_append_column(GTK_TREE_VIEW(partview), col);
-
+ gtk_tree_view_append_column(GTK_TREE_VIEW(partview), col);
+
// partition name
renderer = gtk_cell_renderer_text_new();
col = gtk_tree_view_column_new_with_attributes (_("Partition"), renderer,
"text", NAME_COLUMN, NULL);
gtk_tree_view_append_column(GTK_TREE_VIEW(partview), col);
-
+
// partition size
renderer = gtk_cell_renderer_text_new();
col = gtk_tree_view_column_new_with_attributes (_("Size"), renderer, "text",
SIZE_COLUMN, NULL);
gtk_tree_view_append_column(GTK_TREE_VIEW(partview), col);
-
+
// current filesystem
renderer = gtk_cell_renderer_text_new();
col = gtk_tree_view_column_new_with_attributes (_("Filesystem"), renderer,
"text", FS_COLUMN, NULL);
gtk_tree_view_append_column(GTK_TREE_VIEW(partview), col);
-
+
// mountpoint
renderer = gtk_cell_renderer_text_new();
col = gtk_tree_view_column_new_with_attributes (_("Mountpoint"), renderer,
"text", MOUNT_COLUMN, NULL);
@@ -996,28 +991,28 @@ GtkWidget *load_gtk_widget()
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (partview));
gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
-
+
pScrollbar = gtk_scrolled_window_new(NULL, NULL);
-
+
gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(pScrollbar),
partview);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(pScrollbar),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gtk_box_pack_start(GTK_BOX(hboxlist), pScrollbar, FALSE, TRUE, 0);
-
- //* Buttons at end page *//
+
+ /* Buttons at end page */
GtkWidget *mainpart, *swappart, *format, *buttonlist, *gparted;
GtkWidget *image;
-
+
buttonlist = gtk_hbox_new(TRUE, 10);
gtk_box_pack_start (GTK_BOX (pVBox), buttonlist, FALSE, FALSE, 10);
-
- //* Set buttons *//
+
+ /* Set buttons */
mainpart = gtk_button_new_with_label(_("Set as root partition"));
swappart = gtk_button_new_with_label(_("Set as swap partition"));
format = gtk_button_new_with_label(_("Format partition"));
gparted = gtk_button_new_with_label(_("Run Gparted"));
-
- //* Set images *//
+
+ /* Set images */
image = gtk_image_new_from_file(g_strdup_printf("%s/clean.png", IMAGEDIR));
gtk_button_set_image(GTK_BUTTON(format), image);
image = gtk_image_new_from_file(g_strdup_printf("%s/home.png", IMAGEDIR));
@@ -1026,40 +1021,52 @@ GtkWidget *load_gtk_widget()
gtk_button_set_image(GTK_BUTTON(swappart), image);
image = gtk_image_new_from_file(g_strdup_printf("%s/gparted.png", IMAGEDIR));
gtk_button_set_image(GTK_BUTTON(gparted), image);
-
- //* connect button to the select root part function *//
+
+ /* connect button to the select root part function */
g_signal_connect (mainpart, "clicked",G_CALLBACK (set_root_part), NULL);
g_signal_connect (swappart, "clicked", G_CALLBACK (set_swap_part), NULL);
g_signal_connect (format, "clicked", G_CALLBACK (set_format_part), partview);
g_signal_connect (gparted, "clicked", G_CALLBACK (run_gparted), diskinfo);
- g_signal_connect(G_OBJECT(comboparts), "changed",
G_CALLBACK(change_part_list), diskinfo);
-
- //* Add them to the box *//
+ g_signal_connect(G_OBJECT(comboparts), "changed",
G_CALLBACK(change_part_list), diskinfo);
+
+ /* Add them to the box */
gtk_box_pack_start (GTK_BOX (buttonlist), mainpart, TRUE, FALSE, 10);
gtk_box_pack_start (GTK_BOX (buttonlist), swappart, TRUE, FALSE, 10);
gtk_box_pack_start (GTK_BOX (buttonlist), format, TRUE, FALSE, 10);
gtk_box_pack_start (GTK_BOX (buttonlist), gparted, TRUE, FALSE, 10);
-
+
return pVBox;
}
int prerun(GList **config)
{
- if(allparts == NULL)
- {
+ if(allparts_device == NULL) {
detect_parts(0);
gtk_combo_box_set_active (GTK_COMBO_BOX (comboparts), 0);
}
return 0;
}
-//* Run plugin and create fstab file *//
+gint compare_mount_points(gconstpointer a, gconstpointer b)
+{
+ struct fwife_part_info_t *info1 = (struct fwife_part_info_t*) a;
+ struct fwife_part_info_t *info2 = (struct fwife_part_info_t*) b;
+
+ if(info1->mount && info2->mount)
+ return (gint)(strlen(info1->mount) - strlen(info2->mount));
+ else
+ return 0; /* don't care if no mount points */
+}
+
+/* Run plugin and create fstab file */
int run(GList **config)
{
- char *fn, *dev, *mount, *type, *op, *np;
+ char *fn, *op, *np;
+ struct fwife_part_info_t *info;
GList *partition;
FILE* fp;
- int i, j;
+ int i;
+ GList *globallist = NULL;
// create an initial fstab
fn = strdup("/tmp/setup_XXXXXX");
@@ -1079,31 +1086,33 @@ int run(GList **config)
"usbfs", "/proc/bus/usb", "usbfs", "devgid=23,devmode=664", "0", "0");
fprintf(fp, "%-16s %-16s %-11s %-16s %-3s %s\n",
"tmpfs", "/dev/shm", "tmpfs", "defaults", "0", "0");
-
+
fclose(fp);
-
+
// save fstab location for later
- data_put(config, "fstab", fn);
-
- // add all mounts points into fstab
- for(i=0; i<g_list_length(allparts); i++)
- {
- partition = (GList*)(((data_t*)g_list_nth_data(allparts,
i))->data);
- for(j=0; j<g_list_length(partition); j+=4)
- {
- if((char*)g_list_nth_data(partition, j+3) != NULL)
- {
- dev = (char*)g_list_nth_data(partition, j);
- mount = (char*)g_list_nth_data(partition, j+3);
- type = (char*)g_list_nth_data(partition, j+2);
- if(!strcmp(mount, "swap") || !strcmp(type,
"linux-swap"))
- mountdev(dev, mount, TRUE, config);
- else
- mountdev(dev, mount, FALSE, config);
- }
+ data_put(config, "fstab", fn);
+
+ // 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);
+ }
+
+ /* Sorting mountspoints, if a is more close of the root
+ * than b then a's mount path is shorter than b's.
+ * So the devices are always mounted in the right order */
+ globallist = g_list_sort(globallist, compare_mount_points);
+
+ for(i = 0; i < g_list_length(globallist); i++) {
+ info = (struct fwife_part_info_t*) g_list_nth_data(globallist,
i);
+ if(info->mount) {
+ if(!strcmp(info->mount, "swap") || !strcmp(info->type,
"linux-swap"))
+ mountdev(info->dev, info->mount, TRUE, config);
+ else
+ mountdev(info->dev, info->mount, FALSE, config);
}
}
-
+
// Copy files into new locations
chdir(TARGETDIR);
makepath(g_strdup_printf("%s/%s", TARGETDIR, "/etc/profile.d"));
@@ -1113,30 +1122,30 @@ int run(GList **config)
unlink(op);
chmod (np, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);
data_put(config, "fstab", strdup(np));
- FREE(np);
+ free(np);
op = (char*)data_get(*config, "lang.sh");
np = g_strdup_printf("%s/%s", TARGETDIR, "/etc/profile.d/lang.sh");
copyfile(op, np);
unlink(op);
chmod(np, S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH);
- FREE(np);
-
+ free(np);
+
makepath(g_strdup_printf("%s/%s", TARGETDIR, "/etc/sysconfig"));
op = (char*)data_get(*config, "keymap");
np = g_strdup_printf("%s/%s", TARGETDIR, "/etc/sysconfig/keymap");
copyfile(op, np);
unlink(op);
chmod (np, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);
- FREE(np);
-
+ free(np);
+
return(0);
}
GtkWidget *load_help_widget()
{
GtkWidget *help = gtk_label_new(_("You must select at least one root partition
to continue to the next stage.\n For example, to assign a root partition,
select the device in list located in top of the page,\n then select a partition
and use suitable button to make it as a root partition.\n\nYou may use your
other partitions to distribute your Linux system across more than one
partition.\n You might want to mount directories such as /boot, /home or
/usr/local on separate partitions.\n You should not try to mount /usr, /etc,
/sbin or /bin on their own partitions\n since they contain utilities needed to
bring the system up and mount partitions.\n Also, do not reuse a partition that
you've already entered before.\n To set a mountpoint for a partition, edit the
cell in the table of the partitions (column \"Mountpoint\") by double-clicking
on it.\n\nIf you want to modify partition table (create or modify
partitions),\n you can run GParted but this will erase all your selected parti
tions."));
-
+
return help;
}
-
+
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
