X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=src%2Finstall%2Bsetup%2Finstall%2Fmain.c;h=daa1c3f26f2aa92787b390464895b234eb257923;hb=920b610fa0f0b404bb323c06b4f2e43105ce57c6;hp=b993133b1605b5b15339fd967b67c40881f30d0c;hpb=b6c9668f1e26e4e7a7d9dc3b862726f73f298afd;p=ipfire-2.x.git diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index b993133b16..daa1c3f26f 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -1,3 +1,4 @@ + /* SmoothWall install program. * * This program is distributed under the terms of the GNU General Public @@ -11,7 +12,7 @@ #include "install.h" #define _GNU_SOURCE -#define INST_FILECOUNT 8400 +#define INST_FILECOUNT 10700 #define UNATTENDED_CONF "/cdrom/boot/unattended.conf" #define EXT2 0 @@ -34,15 +35,16 @@ extern char *es_tr[]; extern char *de_tr[]; extern char *fr_tr[]; extern char *pl_tr[]; +extern char *ru_tr[]; int main(int argc, char *argv[]) { char discl_msg[40000] = "Disclaimer\n"; - char *langnames[] = { "Deutsch", "English", "Français", "Español", "Polski", NULL }; - char *shortlangnames[] = { "de", "en", "fr", "es", "pl", NULL }; - char **langtrs[] = { de_tr, en_tr, fr_tr, es_tr, pl_tr, NULL }; + char *langnames[] = { "Deutsch", "English", "Français", "Español", "Polski", "Русский", NULL }; + char *shortlangnames[] = { "de", "en", "fr", "es", "pl", "ru", NULL }; + char **langtrs[] = { de_tr, en_tr, fr_tr, es_tr, pl_tr, ru_tr, NULL }; char hdletter; char harddrive[30], sourcedrive[5]; /* Device holder. */ struct devparams hdparams, cdromparams; /* Params for CDROM and HD */ @@ -461,9 +463,6 @@ int main(int argc, char *argv[]) /* Save language und local settings */ write_lang_configs(shortlangname); - /* Rename uname */ - rename ("/harddisk/bin/uname.bak", "/harddisk/bin/uname"); - /* mount proc filesystem */ mysystem("mkdir /harddisk/proc"); mysystem("/bin/mount --bind /proc /harddisk/proc");