Fix mtab creation for grub installation.

[people/pmueller/ipfire-2.x.git] / src / install+setup / install / main.c

diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index 66a134442a39ba522d87fd7a80b1184794f25148..9cf1bd5e3776223ea0df5d2dcfa79f35819b2b38 100644 (file)
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -29,14 +29,15 @@ struct  nic  nics[20] = { { "" , "" , "" } }; // only defined for compile
 struct knic knics[20] = { { "" , "" , "" , "" } }; // only defined for compile
 
 extern char *en_tr[];
 struct knic knics[20] = { { "" , "" , "" , "" } }; // only defined for compile
 
 extern char *en_tr[];

+extern char *es_tr[];

 extern char *de_tr[];
 extern char *fr_tr[];
 
 int main(int argc, char *argv[])
 {
 extern char *de_tr[];
 extern char *fr_tr[];
 
 int main(int argc, char *argv[])
 {

-       char *langnames[] = { "Deutsch", "English", "Français", NULL };
-       char *shortlangnames[] = { "de", "en", "fr" ,NULL };
-       char **langtrs[] = { de_tr, en_tr, fr_tr,NULL };
+       char *langnames[] = { "Deutsch", "English", "Français", "Español", NULL };
+       char *shortlangnames[] = { "de", "en", "fr", "es", NULL };
+       char **langtrs[] = { de_tr, en_tr, fr_tr, es_tr, NULL };

        char hdletter;
        char harddrive[30], sourcedrive[5];     /* Device holder. */
        struct devparams hdparams, cdromparams; /* Params for CDROM and HD */
        char hdletter;
        char harddrive[30], sourcedrive[5];     /* Device holder. */
        struct devparams hdparams, cdromparams; /* Params for CDROM and HD */


@@ -541,7 +542,7 @@ int main(int argc, char *argv[])
        replace( "/harddisk/boot/grub/grub.conf", "root=ROOT", string);
        mysystem("ln -s grub.conf /harddisk/boot/grub/menu.lst");
 
        replace( "/harddisk/boot/grub/grub.conf", "root=ROOT", string);
        mysystem("ln -s grub.conf /harddisk/boot/grub/menu.lst");
 

-       system("sed -e 's#harddisk\\/##g' < /proc/mounts > /harddisk/etc/mtab");
+       system("sed -e 's#/harddisk#/#g' -e 's#//#/#g'  < /proc/mounts > /harddisk/etc/mtab");

 
        snprintf(commandstring, STRING_SIZE, 
                 "/sbin/chroot /harddisk /usr/sbin/grub-install --no-floppy %s", hdparams.devnode_disk);
 
        snprintf(commandstring, STRING_SIZE, 
                 "/sbin/chroot /harddisk /usr/sbin/grub-install --no-floppy %s", hdparams.devnode_disk);