summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--usr.sbin/sade/menus.c36
-rw-r--r--usr.sbin/sysinstall/menus.c36
2 files changed, 40 insertions, 32 deletions
diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c
index ad785f4..1bb348d 100644
--- a/usr.sbin/sade/menus.c
+++ b/usr.sbin/sade/menus.c
@@ -518,19 +518,15 @@ DMenu MenuMediaFTP = {
VAR_FTP_PATH "=ftp://ftp.freebsd.org" },
{ "URL", "Specify some other ftp site by URL", NULL, dmenuSetVariable, NULL,
VAR_FTP_PATH "=other" },
- { " 5.0 SNAP Server", "current.freebsd.org", NULL, dmenuSetVariable, NULL,
- VAR_FTP_PATH "=ftp://current.freebsd.org" },
- { " 4.x SNAP Server", "releng4.freebsd.org", NULL, dmenuSetVariable, NULL,
- VAR_FTP_PATH "=ftp://releng4.freebsd.org" },
- { " jp.FreeBSD.org SNAP Server", "snapshots.jp.freebsd.org", NULL, dmenuSetVariable, NULL,
+ { "Snapshots Server", "snapshots.jp.freebsd.org", NULL, dmenuSetVariable, NULL,
VAR_FTP_PATH "=ftp://snapshots.jp.freebsd.org" },
- { "IPv6 Ready", "ftp4.us.freebsd.org", NULL, dmenuSetVariable, NULL,
- VAR_FTP_PATH "=ftp://ftp4.us.freebsd.org" },
- { " IPv6 Ready #2", "ftp2.jp.freebsd.org", NULL, dmenuSetVariable, NULL,
- VAR_FTP_PATH "=ftp://ftp2.jp.freebsd.org" },
- { " IPv6 Ready #3", "ftp3.ie.freebsd.org", NULL, dmenuSetVariable, NULL,
+ { "IPv6 Ireland", "ftp3.ie.freebsd.org", NULL, dmenuSetVariable, NULL,
VAR_FTP_PATH "=ftp://ftp3.ie.freebsd.org" },
+ { " IPv6 Japan", "ftp2.jp.freebsd.org", NULL, dmenuSetVariable, NULL,
+ VAR_FTP_PATH "=ftp://ftp2.jp.freebsd.org" },
+ { " IPv6 USA", "ftp4.us.freebsd.org", NULL, dmenuSetVariable, NULL,
+ VAR_FTP_PATH "=ftp://ftp4.us.freebsd.org" },
{ "Primary", "ftp1.freebsd.org", NULL, dmenuSetVariable, NULL,
VAR_FTP_PATH "=ftp://ftp1.freebsd.org" },
@@ -568,6 +564,8 @@ DMenu MenuMediaFTP = {
VAR_FTP_PATH "=ftp://ftp.au.freebsd.org" },
{ " Australia #2","ftp2.au.freebsd.org", NULL, dmenuSetVariable, NULL,
VAR_FTP_PATH "=ftp://ftp2.au.freebsd.org" },
+ { " Australia #3","ftp3.au.freebsd.org", NULL, dmenuSetVariable, NULL,
+ VAR_FTP_PATH "=ftp://ftp3.au.freebsd.org" },
{ "Austria","ftp.at.freebsd.org", NULL, dmenuSetVariable, NULL,
VAR_FTP_PATH "=ftp://ftp.at.freebsd.org" },
@@ -724,10 +722,14 @@ DMenu MenuMediaFTP = {
VAR_FTP_PATH "=ftp://ftp.ru.freebsd.org" },
{ " Russia #2", "ftp2.ru.freebsd.org", NULL, dmenuSetVariable, NULL,
VAR_FTP_PATH "=ftp://ftp2.ru.freebsd.org" },
- { " Russia #3", "ftp3.ru.freebsd.org", NULL, dmenuSetVariable, NULL,
- VAR_FTP_PATH "=ftp://ftp3.ru.freebsd.org" },
- { " Russia #4", "ftp4.ru.freebsd.org", NULL, dmenuSetVariable, NULL,
- VAR_FTP_PATH "=ftp://ftp4.ru.freebsd.org" },
+ { " Russia #5", "ftp5.ru.freebsd.org", NULL, dmenuSetVariable, NULL,
+ VAR_FTP_PATH "=ftp://ftp5.ru.freebsd.org" },
+ { " Russia #7", "ftp7.ru.freebsd.org", NULL, dmenuSetVariable, NULL,
+ VAR_FTP_PATH "=ftp://ftp7.ru.freebsd.org" },
+ { " Russia #8", "ftp8.ru.freebsd.org", NULL, dmenuSetVariable, NULL,
+ VAR_FTP_PATH "=ftp://ftp8.ru.freebsd.org" },
+ { " Russia #9", "ftp9.ru.freebsd.org", NULL, dmenuSetVariable, NULL,
+ VAR_FTP_PATH "=ftp://ftp9.ru.freebsd.org" },
{ "Singapore", "ftp.sg.freebsd.org", NULL, dmenuSetVariable, NULL,
VAR_FTP_PATH "=ftp://ftp.sg.freebsd.org" },
@@ -800,12 +802,14 @@ DMenu MenuMediaFTP = {
VAR_FTP_PATH "=ftp://ftp.ua.freebsd.org" },
{ " Ukraine #2", "ftp2.ua.freebsd.org", NULL, dmenuSetVariable, NULL,
VAR_FTP_PATH "=ftp://ftp2.ua.freebsd.org" },
- { " Ukraine #3", "ftp3.ua.freebsd.org", NULL, dmenuSetVariable, NULL,
- VAR_FTP_PATH "=ftp://ftp3.ua.freebsd.org" },
+ { " Ukraine #5", "ftp5.ua.freebsd.org", NULL, dmenuSetVariable, NULL,
+ VAR_FTP_PATH "=ftp://ftp5.ua.freebsd.org" },
{ " Ukraine #6", "ftp6.ua.freebsd.org", NULL, dmenuSetVariable, NULL,
VAR_FTP_PATH "=ftp://ftp6.ua.freebsd.org" },
{ " Ukraine #7", "ftp7.ua.freebsd.org", NULL, dmenuSetVariable, NULL,
VAR_FTP_PATH "=ftp://ftp7.ua.freebsd.org" },
+ { " Ukraine #8", "ftp8.ua.freebsd.org", NULL, dmenuSetVariable, NULL,
+ VAR_FTP_PATH "=ftp://ftp8.ua.freebsd.org" },
{ "USA #1", "ftp1.us.freebsd.org", NULL, dmenuSetVariable, NULL,
VAR_FTP_PATH "=ftp://ftp1.us.freebsd.org" },
diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c
index ad785f4..1bb348d 100644
--- a/usr.sbin/sysinstall/menus.c
+++ b/usr.sbin/sysinstall/menus.c
@@ -518,19 +518,15 @@ DMenu MenuMediaFTP = {
VAR_FTP_PATH "=ftp://ftp.freebsd.org" },
{ "URL", "Specify some other ftp site by URL", NULL, dmenuSetVariable, NULL,
VAR_FTP_PATH "=other" },
- { " 5.0 SNAP Server", "current.freebsd.org", NULL, dmenuSetVariable, NULL,
- VAR_FTP_PATH "=ftp://current.freebsd.org" },
- { " 4.x SNAP Server", "releng4.freebsd.org", NULL, dmenuSetVariable, NULL,
- VAR_FTP_PATH "=ftp://releng4.freebsd.org" },
- { " jp.FreeBSD.org SNAP Server", "snapshots.jp.freebsd.org", NULL, dmenuSetVariable, NULL,
+ { "Snapshots Server", "snapshots.jp.freebsd.org", NULL, dmenuSetVariable, NULL,
VAR_FTP_PATH "=ftp://snapshots.jp.freebsd.org" },
- { "IPv6 Ready", "ftp4.us.freebsd.org", NULL, dmenuSetVariable, NULL,
- VAR_FTP_PATH "=ftp://ftp4.us.freebsd.org" },
- { " IPv6 Ready #2", "ftp2.jp.freebsd.org", NULL, dmenuSetVariable, NULL,
- VAR_FTP_PATH "=ftp://ftp2.jp.freebsd.org" },
- { " IPv6 Ready #3", "ftp3.ie.freebsd.org", NULL, dmenuSetVariable, NULL,
+ { "IPv6 Ireland", "ftp3.ie.freebsd.org", NULL, dmenuSetVariable, NULL,
VAR_FTP_PATH "=ftp://ftp3.ie.freebsd.org" },
+ { " IPv6 Japan", "ftp2.jp.freebsd.org", NULL, dmenuSetVariable, NULL,
+ VAR_FTP_PATH "=ftp://ftp2.jp.freebsd.org" },
+ { " IPv6 USA", "ftp4.us.freebsd.org", NULL, dmenuSetVariable, NULL,
+ VAR_FTP_PATH "=ftp://ftp4.us.freebsd.org" },
{ "Primary", "ftp1.freebsd.org", NULL, dmenuSetVariable, NULL,
VAR_FTP_PATH "=ftp://ftp1.freebsd.org" },
@@ -568,6 +564,8 @@ DMenu MenuMediaFTP = {
VAR_FTP_PATH "=ftp://ftp.au.freebsd.org" },
{ " Australia #2","ftp2.au.freebsd.org", NULL, dmenuSetVariable, NULL,
VAR_FTP_PATH "=ftp://ftp2.au.freebsd.org" },
+ { " Australia #3","ftp3.au.freebsd.org", NULL, dmenuSetVariable, NULL,
+ VAR_FTP_PATH "=ftp://ftp3.au.freebsd.org" },
{ "Austria","ftp.at.freebsd.org", NULL, dmenuSetVariable, NULL,
VAR_FTP_PATH "=ftp://ftp.at.freebsd.org" },
@@ -724,10 +722,14 @@ DMenu MenuMediaFTP = {
VAR_FTP_PATH "=ftp://ftp.ru.freebsd.org" },
{ " Russia #2", "ftp2.ru.freebsd.org", NULL, dmenuSetVariable, NULL,
VAR_FTP_PATH "=ftp://ftp2.ru.freebsd.org" },
- { " Russia #3", "ftp3.ru.freebsd.org", NULL, dmenuSetVariable, NULL,
- VAR_FTP_PATH "=ftp://ftp3.ru.freebsd.org" },
- { " Russia #4", "ftp4.ru.freebsd.org", NULL, dmenuSetVariable, NULL,
- VAR_FTP_PATH "=ftp://ftp4.ru.freebsd.org" },
+ { " Russia #5", "ftp5.ru.freebsd.org", NULL, dmenuSetVariable, NULL,
+ VAR_FTP_PATH "=ftp://ftp5.ru.freebsd.org" },
+ { " Russia #7", "ftp7.ru.freebsd.org", NULL, dmenuSetVariable, NULL,
+ VAR_FTP_PATH "=ftp://ftp7.ru.freebsd.org" },
+ { " Russia #8", "ftp8.ru.freebsd.org", NULL, dmenuSetVariable, NULL,
+ VAR_FTP_PATH "=ftp://ftp8.ru.freebsd.org" },
+ { " Russia #9", "ftp9.ru.freebsd.org", NULL, dmenuSetVariable, NULL,
+ VAR_FTP_PATH "=ftp://ftp9.ru.freebsd.org" },
{ "Singapore", "ftp.sg.freebsd.org", NULL, dmenuSetVariable, NULL,
VAR_FTP_PATH "=ftp://ftp.sg.freebsd.org" },
@@ -800,12 +802,14 @@ DMenu MenuMediaFTP = {
VAR_FTP_PATH "=ftp://ftp.ua.freebsd.org" },
{ " Ukraine #2", "ftp2.ua.freebsd.org", NULL, dmenuSetVariable, NULL,
VAR_FTP_PATH "=ftp://ftp2.ua.freebsd.org" },
- { " Ukraine #3", "ftp3.ua.freebsd.org", NULL, dmenuSetVariable, NULL,
- VAR_FTP_PATH "=ftp://ftp3.ua.freebsd.org" },
+ { " Ukraine #5", "ftp5.ua.freebsd.org", NULL, dmenuSetVariable, NULL,
+ VAR_FTP_PATH "=ftp://ftp5.ua.freebsd.org" },
{ " Ukraine #6", "ftp6.ua.freebsd.org", NULL, dmenuSetVariable, NULL,
VAR_FTP_PATH "=ftp://ftp6.ua.freebsd.org" },
{ " Ukraine #7", "ftp7.ua.freebsd.org", NULL, dmenuSetVariable, NULL,
VAR_FTP_PATH "=ftp://ftp7.ua.freebsd.org" },
+ { " Ukraine #8", "ftp8.ua.freebsd.org", NULL, dmenuSetVariable, NULL,
+ VAR_FTP_PATH "=ftp://ftp8.ua.freebsd.org" },
{ "USA #1", "ftp1.us.freebsd.org", NULL, dmenuSetVariable, NULL,
VAR_FTP_PATH "=ftp://ftp1.us.freebsd.org" },
OpenPOWER on IntegriCloud