Add support for fetching using http (by specifying http URL to ftp)
Remove a 'Press <enter> to continue' message that was accidently left in by a previous commit. Fixes PR/18555 (and a recent discussion on a mailing list)
This commit is contained in:
dsl
parent
9d819ed558
commit
7d6407147b
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: defs.h,v 1.119 2004/08/14 16:06:36 dsl Exp $ */
|
||||
/* $NetBSD: defs.h,v 1.120 2004/11/11 21:24:40 dsl Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -319,7 +319,7 @@ int get_real_geom(const char *, struct disklabel *);
|
|||
|
||||
/* from net.c */
|
||||
extern char net_namesvr6[STRSIZE];
|
||||
int get_via_ftp(void);
|
||||
int get_via_ftp(const char *);
|
||||
int get_via_nfs(void);
|
||||
int config_network(void);
|
||||
void mnt_net_config(void);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: menus.mi,v 1.18 2004/08/14 16:06:37 dsl Exp $ */
|
||||
/* $NetBSD: menus.mi,v 1.19 2004/11/11 21:24:40 dsl Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2003 The NetBSD Foundation, Inc.
|
||||
|
|
@ -210,9 +210,10 @@ menu sizechoice, sub menu, y=0, title MSG_Choose_your_size_specifier;
|
|||
|
||||
menu distmedium, title MSG_Select_medium;
|
||||
display action { umount_mnt2(); msg_display(MSG_distmedium); };
|
||||
option MSG_ftp, exit, action { *(int *)arg = get_via_ftp(); };
|
||||
option MSG_nfs, exit, action { *(int *)arg = get_via_nfs(); };
|
||||
option MSG_cdrom, exit, action { *(int *)arg = get_via_cdrom(); };
|
||||
option MSG_ftp, exit, action { *(int *)arg = get_via_ftp("ftp"); };
|
||||
option MSG_http, exit, action { *(int *)arg = get_via_ftp("http"); };
|
||||
option MSG_nfs, exit, action { *(int *)arg = get_via_nfs(); };
|
||||
option MSG_floppy, exit, action { *(int *)arg = get_via_floppy(); };
|
||||
option MSG_local_fs, exit, action { *(int *)arg = get_via_localfs(); };
|
||||
option MSG_local_dir, exit, action { *(int *)arg = get_via_localdir();};
|
||||
|
|
@ -226,7 +227,7 @@ menu distset, title MSG_Select_your_distribution;
|
|||
menu ftpsource, title MSG_Change;
|
||||
display action {
|
||||
msg_clear();
|
||||
msg_table_add(MSG_ftpsource, ftp_host, ftp_dir, set_dir,
|
||||
msg_table_add(MSG_ftpsource, arg, ftp_host, ftp_dir, set_dir,
|
||||
ftp_user, strcmp(ftp_user, "ftp") == 0 || ftp_pass[0] == 0
|
||||
? ftp_pass : msg_string(MSG_hidden),
|
||||
ftp_proxy);
|
||||
|
|
@ -257,10 +258,13 @@ menu ftpsource, title MSG_Change;
|
|||
option MSG_Proxy, action
|
||||
{ msg_prompt_win(MSG_Proxy, -1, 12, 0, 0,
|
||||
ftp_proxy, ftp_proxy, sizeof ftp_proxy);
|
||||
if (strcmp(ftp_proxy, "") == 0)
|
||||
if (strcmp(ftp_proxy, "") == 0) {
|
||||
unsetenv("ftp_proxy");
|
||||
else
|
||||
unsetenv("http_proxy");
|
||||
} else {
|
||||
setenv("ftp_proxy", ftp_proxy, 1);
|
||||
setenv("http_proxy", ftp_proxy, 1);
|
||||
}
|
||||
};
|
||||
option MSG_Get_Distribution, exit;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: msg.mi.de,v 1.15 2004/10/21 12:14:21 martin Exp $ */
|
||||
/* $NetBSD: msg.mi.de,v 1.16 2004/11/11 21:24:40 dsl Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -372,8 +372,6 @@ Partitionen formatiert (newfs'ed) sowie auf Fehler
|
|||
|
||||
Im nächsten Schritt werden nun die Distributionssets (Basissystem + Kernel)
|
||||
geladen und auf die Festplatte kopiert.
|
||||
|
||||
Drücken Sie die Eingabetaste um fortzufahren.
|
||||
}
|
||||
|
||||
message disksetupdoneupdate
|
||||
|
|
@ -383,8 +381,6 @@ Partition auf Fehler
|
|||
|
||||
Im nächsten Schritt werden nun die Distributionssets (Basissystem + Kernel)
|
||||
geladen und auf die Festplatte kopiert.
|
||||
|
||||
Drücken Sie die Eingabetaste um fortzufahren.
|
||||
}
|
||||
|
||||
message openfail
|
||||
|
|
@ -499,7 +495,7 @@ wollen.
|
|||
|
||||
message ftpsource
|
||||
{
|
||||
Dies sind die Daten zum Aufbau einer ftp Verbindung.
|
||||
Dies sind die Daten zum Aufbau einer %s Verbindung.
|
||||
Falls der Benutzer "ftp" ist, benötigen Sie kein Passwort.
|
||||
|
||||
Server: %s
|
||||
|
|
@ -676,7 +672,11 @@ message delete_dist_files
|
|||
oder zu erneuern.)}
|
||||
|
||||
message verboseextract
|
||||
{Was wollen Sie während des Extrahierens sehen?
|
||||
{
|
||||
Im nächste Schritt werden nun die Distributionssets (Basissystem + Kernel)
|
||||
geladen und auf die Festplatte kopiert.
|
||||
|
||||
Was wollen Sie während des Extrahierens sehen?
|
||||
}
|
||||
|
||||
message notarfile
|
||||
|
|
@ -1030,6 +1030,7 @@ message Cylinders {Zylinder}
|
|||
message Sectors {Sektoren}
|
||||
message Select_medium {Medium auswählen}
|
||||
message ftp {FTP}
|
||||
message http {HTTP}
|
||||
message nfs {NFS}
|
||||
message cdrom {CD-ROM / DVD}
|
||||
message floppy {Diskette}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: msg.mi.en,v 1.131 2004/08/20 21:23:08 hubertf Exp $ */
|
||||
/* $NetBSD: msg.mi.en,v 1.132 2004/11/11 21:24:40 dsl Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -358,18 +358,12 @@ message disksetupdone
|
|||
{Okay, the first part of the procedure is finished. Sysinst has
|
||||
written a disklabel to the target disk, and newfs'ed and fsck'ed
|
||||
the new partitions you specified for the target disk.
|
||||
|
||||
The next step is to fetch and unpack the distribution filesets.
|
||||
Press <return> to proceed.
|
||||
}
|
||||
|
||||
message disksetupdoneupdate
|
||||
{Okay, the first part of the procedure is finished. Sysinst has
|
||||
written a disklabel to the target disk, and fsck'ed the new
|
||||
partitions you specified for the target disk.
|
||||
|
||||
The next step is to fetch and unpack the distribution filesets.
|
||||
Press <return> to proceed.
|
||||
}
|
||||
|
||||
message openfail
|
||||
|
|
@ -476,8 +470,8 @@ select from the optional distribution sets.
|
|||
}
|
||||
|
||||
message ftpsource
|
||||
{The following is the ftp site, directory, user, and password currently
|
||||
ready to use. If "user" is "ftp", then the password is not needed.
|
||||
{The following are the %s site, directory, user, and password that
|
||||
will be used. If "user" is "ftp", then the password is not needed.
|
||||
|
||||
host: %s
|
||||
base directory: %s
|
||||
|
|
@ -649,7 +643,10 @@ message delete_dist_files
|
|||
(You can keep them to install/upgrade a second system.)}
|
||||
|
||||
message verboseextract
|
||||
{During the extraction process, what do you want to see as
|
||||
{
|
||||
The next step is to fetch and unpack the distribution filesets.
|
||||
|
||||
During the extraction process, what do you want to see as
|
||||
each file is extracted?
|
||||
}
|
||||
|
||||
|
|
@ -987,6 +984,7 @@ message Cylinders {Cylinders}
|
|||
message Sectors {Sectors}
|
||||
message Select_medium {Select medium}
|
||||
message ftp {FTP}
|
||||
message http {HTTP}
|
||||
message nfs {NFS}
|
||||
message cdrom {CD-ROM / DVD}
|
||||
message floppy {Floppy}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: msg.mi.fr,v 1.81 2004/08/20 21:23:08 hubertf Exp $ */
|
||||
/* $NetBSD: msg.mi.fr,v 1.82 2004/11/11 21:24:40 dsl Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -362,18 +362,12 @@ message disksetupdone
|
|||
{La première partie de la procédure est terminée.
|
||||
Sysinst a écrit, sur votre disque de destination, un disklabel,
|
||||
créé (via newfs) et testé (via fsck) vos nouvelles partitions.
|
||||
|
||||
L'étape suivant consiste a recopier les différents composants.
|
||||
Appuyer sur <entrée> pour continuer.
|
||||
}
|
||||
|
||||
message disksetupdoneupdate
|
||||
{La première partie de la procédure est terminée.
|
||||
Sysinst a écrit, sur votre disque de destination, un disklabel
|
||||
et testé (via fsck) vos nouvelles partitions.
|
||||
|
||||
L'étape suivant consiste a recopier les différents composants.
|
||||
Appuyer sur <entrée> pour continuer.
|
||||
}
|
||||
|
||||
message openfail
|
||||
|
|
@ -479,7 +473,7 @@ composants optionnels.
|
|||
}
|
||||
|
||||
message ftpsource
|
||||
{Vous trouverez ci dessous le site ftp, le répertoire, le code utilisateur
|
||||
{Vous trouverez ci dessous le site %s, le répertoire, le code utilisateur
|
||||
et le mot de passe prêt à l'emplois actuellement.
|
||||
Si l'utilisateur est ftp, alors le mot de passe n'est pas nécessaire.
|
||||
Le répertoire des composants est relatif au répertoire de base, et
|
||||
|
|
@ -662,7 +656,10 @@ message delete_dist_files
|
|||
Vous pouvez les conserver pour installer ou mettre a jour d'autre systèmes.}
|
||||
|
||||
message verboseextract
|
||||
{Pendant la procédure d'extraction des fichiers,
|
||||
{
|
||||
L'étape suivant consiste a recopier les différents composants.
|
||||
|
||||
Pendant la procédure d'extraction des fichiers,
|
||||
voulez-vous voir les noms de fichiers au fur et à mesure ?
|
||||
voir pendant qu'ils seront extraits ?
|
||||
}
|
||||
|
|
@ -1009,6 +1006,7 @@ message Cylinders {Cylindres}
|
|||
message Sectors {Secteurs}
|
||||
message Select_medium {Sélection du media d'installation}
|
||||
message ftp {FTP}
|
||||
message http {HTTP}
|
||||
message nfs {NFS}
|
||||
message cdrom {CD-ROM / DVD}
|
||||
message floppy {Disquette}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: msg.mi.pl,v 1.42 2004/08/20 21:23:08 hubertf Exp $ */
|
||||
/* $NetBSD: msg.mi.pl,v 1.43 2004/11/11 21:24:41 dsl Exp $ */
|
||||
/* Based on english version: */
|
||||
/* NetBSD: msg.mi.pl,v 1.36 2004/04/17 18:55:35 atatat Exp */
|
||||
|
||||
|
|
@ -354,18 +354,12 @@ message disksetupdone
|
|||
{Okej, pierwsza czesc procedury zostala zakonczona. Sysinst zapisal
|
||||
disklabel na dysk doceloway, oraz utworzyl system plikow i sprawdzil
|
||||
nowe partycje, ktore podales jako docelowe.
|
||||
|
||||
Kolejny krok to sciagniecie i rozpakowanie pakietow dystrybucji.
|
||||
Nacisnij <enter> aby kontynuowac.
|
||||
}
|
||||
|
||||
message disksetupdoneupdate
|
||||
{Okej, pierwsza czesc procedury zostala zakonczona. Sysinst zapisal
|
||||
disklabel na dysk docelowy, oraz sprawdzil nowe partycje, ktore
|
||||
podales jako docelowe.
|
||||
|
||||
Kolejny krok to sciagniecie i rozpakowanie pakietow dystrybucji.
|
||||
Nacisnij <enter> aby kontynuowac.
|
||||
}
|
||||
|
||||
message openfail
|
||||
|
|
@ -466,7 +460,7 @@ wszystkie (Pelna instalacja) lub wybrac z opcjonalnych pakietow.
|
|||
}
|
||||
|
||||
message ftpsource
|
||||
{Ponizej masz site ftp, katalog, uzytkownika, oraz haslo gotowe do uzycia.
|
||||
{Ponizej masz site %s, katalog, uzytkownika, oraz haslo gotowe do uzycia.
|
||||
Jesli "uzytkownik" to "ftp", wtedy haslo nie jest wymagane.
|
||||
|
||||
host: %s
|
||||
|
|
@ -638,7 +632,10 @@ message delete_dist_files
|
|||
(Mozesz je zachowac aby zainstalowac/zaktualizowac kolejny system.)}
|
||||
|
||||
message verboseextract
|
||||
{Czy w trakcie rozpakowywania plikow, chcesz widziec nazwe aktualnie
|
||||
{
|
||||
Kolejny krok to sciagniecie i rozpakowanie pakietow dystrybucji.
|
||||
|
||||
Czy w trakcie rozpakowywania plikow, chcesz widziec nazwe aktualnie
|
||||
wypakowywanego pliku ?
|
||||
}
|
||||
|
||||
|
|
@ -969,6 +966,7 @@ message Cylinders {Cylindry}
|
|||
message Sectors {Sektory}
|
||||
message Select_medium {Wybierz medium}
|
||||
message ftp {FTP}
|
||||
message http {HTTP}
|
||||
message nfs {NFS}
|
||||
message cdrom {CD-ROM / DVD}
|
||||
message floppy {Dyskietka}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: net.c,v 1.102 2004/06/05 21:19:00 dsl Exp $ */
|
||||
/* $NetBSD: net.c,v 1.103 2004/11/11 21:24:41 dsl Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -752,7 +752,7 @@ again:
|
|||
}
|
||||
|
||||
int
|
||||
get_via_ftp(void)
|
||||
get_via_ftp(const char *xfer_type)
|
||||
{
|
||||
distinfo *list;
|
||||
char ftp_user_encoded[STRSIZE];
|
||||
|
|
@ -780,7 +780,7 @@ get_via_ftp(void)
|
|||
cwd = open(".", O_RDONLY);
|
||||
cd_dist_dir("ftp");
|
||||
|
||||
process_menu(MENU_ftpsource, NULL);
|
||||
process_menu(MENU_ftpsource, deconst(xfer_type));
|
||||
|
||||
list = dist_list;
|
||||
while (list->desc) {
|
||||
|
|
@ -828,8 +828,8 @@ get_via_ftp(void)
|
|||
RFC1738_SAFE_LESS_SHELL_PLUS_SLASH, 0),
|
||||
|
||||
ret = run_program(RUN_DISPLAY | RUN_PROGRESS,
|
||||
"/usr/bin/ftp %sftp://%s%s/%s/%s%s",
|
||||
ftp_opt, ftp_user_encoded, ftp_host,
|
||||
"/usr/bin/ftp %s%s://%s%s/%s/%s%s",
|
||||
ftp_opt, xfer_type, ftp_user_encoded, ftp_host,
|
||||
ftp_dir_encoded, list->name, dist_postfix);
|
||||
|
||||
if (ret == 0) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue