jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-12-04 10:19:26 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

o Use larger minimum root size on alpha.

Browse Source 
o Use proper architecture subdir when fetching bits from snapshot servers.

Submitted by:	Doug Rabson <dfr@nlsystems.com>
This commit is contained in:
Jordan K. Hubbard 1999-03-09 12:36:28 +00:00
parent d0194c03fb
commit fca8402bb3
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=44601
6 changed files with 69 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
release/sysinstall/label.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: label.c,v 1.85 1999/01/29 11:39:04 jkh Exp $
* $Id: label.c,v 1.86 1999/02/05 22:15:49 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -55,7 +55,18 @@
#define FS_MIN_SIZE ONE_MEG
/* The smallest root filesystem we're willing to create */
#ifdef __alpha__
#define ROOT_MIN_SIZE 32
#else
#define ROOT_MIN_SIZE 20
#endif
/* The default root filesystem size */
#ifdef __alpha__
#define ROOT_DEFAULT_SIZE 48
#else
#define ROOT_DEFAULT_SIZE 32
#endif
/* The smallest swap partition we want to create by default */
#define SWAP_MIN_SIZE 16
@ -782,7 +793,7 @@ diskLabel(Device *dev)
if (!rootdev) {
cp = variable_get(VAR_ROOT_SIZE);
tmp = Create_Chunk_DWIM(label_chunk_info[here].c->disk, label_chunk_info[here].c,
(cp ? atoi(cp) : 32) * ONE_MEG, part, FS_BSDFFS, CHUNK_IS_ROOT);
(cp ? atoi(cp) : ROOT_DEFAULT_SIZE) * ONE_MEG, part, FS_BSDFFS, CHUNK_IS_ROOT);
if (!tmp) {
msgConfirm("Unable to create the root partition. Too big?");
clear_wins();

14
release/sysinstall/menus.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: menus.c,v 1.190 1999/02/14 20:14:07 jkh Exp $
* $Id: menus.c,v 1.191 1999/02/14 21:35:02 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -36,6 +36,12 @@
#include "sysinstall.h"
#ifdef __alpha__
#define _AR(str) str "alpha/"
#else /* i386 */
#define _AR(str) str "i386/"
#endif
/* Miscellaneous work routines for menus */
static int
setSrc(dialogMenuItem *self)
@ -482,13 +488,13 @@ DMenu MenuMediaFTP = {
"Select a site that's close!",
"install",
{ { "Primary Site", "ftp.freebsd.org", NULL, dmenuSetVariable, NULL,
VAR_FTP_PATH "=ftp://ftp.freebsd.org/pub/FreeBSD/" },
VAR_FTP_PATH _AR("=ftp://ftp.freebsd.org/pub/FreeBSD/releases/") },
{ "URL", "Specify some other ftp site by URL", NULL, dmenuSetVariable, NULL,
VAR_FTP_PATH "=other" },
{ "4.0 SNAP Server", "current.freebsd.org", NULL, dmenuSetVariable, NULL,
VAR_FTP_PATH "=ftp://current.freebsd.org/pub/FreeBSD/" },
VAR_FTP_PATH _AR("=ftp://current.freebsd.org/pub/FreeBSD/snapshots/") },
{ "3.0 SNAP Server", "releng3.freebsd.org", NULL, dmenuSetVariable, NULL,
VAR_FTP_PATH "=ftp://releng3.freebsd.org/pub/FreeBSD/" },
VAR_FTP_PATH _AR("=ftp://releng3.freebsd.org/pub/FreeBSD/snapshots/") },
{ "Argentina", "ftp.ar.freebsd.org", NULL, dmenuSetVariable, NULL,
VAR_FTP_PATH "=ftp://ftp.ar.freebsd.org/pub/FreeBSD/" },
{ "Australia", "ftp.au.freebsd.org", NULL, dmenuSetVariable, NULL,

15
usr.sbin/sade/label.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: label.c,v 1.85 1999/01/29 11:39:04 jkh Exp $
* $Id: label.c,v 1.86 1999/02/05 22:15:49 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -55,7 +55,18 @@
#define FS_MIN_SIZE ONE_MEG
/* The smallest root filesystem we're willing to create */
#ifdef __alpha__
#define ROOT_MIN_SIZE 32
#else
#define ROOT_MIN_SIZE 20
#endif
/* The default root filesystem size */
#ifdef __alpha__
#define ROOT_DEFAULT_SIZE 48
#else
#define ROOT_DEFAULT_SIZE 32
#endif
/* The smallest swap partition we want to create by default */
#define SWAP_MIN_SIZE 16
@ -782,7 +793,7 @@ diskLabel(Device *dev)
if (!rootdev) {
cp = variable_get(VAR_ROOT_SIZE);
tmp = Create_Chunk_DWIM(label_chunk_info[here].c->disk, label_chunk_info[here].c,
(cp ? atoi(cp) : 32) * ONE_MEG, part, FS_BSDFFS, CHUNK_IS_ROOT);
(cp ? atoi(cp) : ROOT_DEFAULT_SIZE) * ONE_MEG, part, FS_BSDFFS, CHUNK_IS_ROOT);
if (!tmp) {
msgConfirm("Unable to create the root partition. Too big?");
clear_wins();

14
usr.sbin/sade/menus.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: menus.c,v 1.190 1999/02/14 20:14:07 jkh Exp $
* $Id: menus.c,v 1.191 1999/02/14 21:35:02 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -36,6 +36,12 @@
#include "sysinstall.h"
#ifdef __alpha__
#define _AR(str) str "alpha/"
#else /* i386 */
#define _AR(str) str "i386/"
#endif
/* Miscellaneous work routines for menus */
static int
setSrc(dialogMenuItem *self)
@ -482,13 +488,13 @@ DMenu MenuMediaFTP = {
"Select a site that's close!",
"install",
{ { "Primary Site", "ftp.freebsd.org", NULL, dmenuSetVariable, NULL,
VAR_FTP_PATH "=ftp://ftp.freebsd.org/pub/FreeBSD/" },
VAR_FTP_PATH _AR("=ftp://ftp.freebsd.org/pub/FreeBSD/releases/") },
{ "URL", "Specify some other ftp site by URL", NULL, dmenuSetVariable, NULL,
VAR_FTP_PATH "=other" },
{ "4.0 SNAP Server", "current.freebsd.org", NULL, dmenuSetVariable, NULL,
VAR_FTP_PATH "=ftp://current.freebsd.org/pub/FreeBSD/" },
VAR_FTP_PATH _AR("=ftp://current.freebsd.org/pub/FreeBSD/snapshots/") },
{ "3.0 SNAP Server", "releng3.freebsd.org", NULL, dmenuSetVariable, NULL,
VAR_FTP_PATH "=ftp://releng3.freebsd.org/pub/FreeBSD/" },
VAR_FTP_PATH _AR("=ftp://releng3.freebsd.org/pub/FreeBSD/snapshots/") },
{ "Argentina", "ftp.ar.freebsd.org", NULL, dmenuSetVariable, NULL,
VAR_FTP_PATH "=ftp://ftp.ar.freebsd.org/pub/FreeBSD/" },
{ "Australia", "ftp.au.freebsd.org", NULL, dmenuSetVariable, NULL,

15
usr.sbin/sysinstall/label.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: label.c,v 1.85 1999/01/29 11:39:04 jkh Exp $
* $Id: label.c,v 1.86 1999/02/05 22:15:49 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -55,7 +55,18 @@
#define FS_MIN_SIZE ONE_MEG
/* The smallest root filesystem we're willing to create */
#ifdef __alpha__
#define ROOT_MIN_SIZE 32
#else
#define ROOT_MIN_SIZE 20
#endif
/* The default root filesystem size */
#ifdef __alpha__
#define ROOT_DEFAULT_SIZE 48
#else
#define ROOT_DEFAULT_SIZE 32
#endif
/* The smallest swap partition we want to create by default */
#define SWAP_MIN_SIZE 16
@ -782,7 +793,7 @@ diskLabel(Device *dev)
if (!rootdev) {
cp = variable_get(VAR_ROOT_SIZE);
tmp = Create_Chunk_DWIM(label_chunk_info[here].c->disk, label_chunk_info[here].c,
(cp ? atoi(cp) : 32) * ONE_MEG, part, FS_BSDFFS, CHUNK_IS_ROOT);
(cp ? atoi(cp) : ROOT_DEFAULT_SIZE) * ONE_MEG, part, FS_BSDFFS, CHUNK_IS_ROOT);
if (!tmp) {
msgConfirm("Unable to create the root partition. Too big?");
clear_wins();

14
usr.sbin/sysinstall/menus.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: menus.c,v 1.190 1999/02/14 20:14:07 jkh Exp $
* $Id: menus.c,v 1.191 1999/02/14 21:35:02 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -36,6 +36,12 @@
#include "sysinstall.h"
#ifdef __alpha__
#define _AR(str) str "alpha/"
#else /* i386 */
#define _AR(str) str "i386/"
#endif
/* Miscellaneous work routines for menus */
static int
setSrc(dialogMenuItem *self)
@ -482,13 +488,13 @@ DMenu MenuMediaFTP = {
"Select a site that's close!",
"install",
{ { "Primary Site", "ftp.freebsd.org", NULL, dmenuSetVariable, NULL,
VAR_FTP_PATH "=ftp://ftp.freebsd.org/pub/FreeBSD/" },
VAR_FTP_PATH _AR("=ftp://ftp.freebsd.org/pub/FreeBSD/releases/") },
{ "URL", "Specify some other ftp site by URL", NULL, dmenuSetVariable, NULL,
VAR_FTP_PATH "=other" },
{ "4.0 SNAP Server", "current.freebsd.org", NULL, dmenuSetVariable, NULL,
VAR_FTP_PATH "=ftp://current.freebsd.org/pub/FreeBSD/" },
VAR_FTP_PATH _AR("=ftp://current.freebsd.org/pub/FreeBSD/snapshots/") },
{ "3.0 SNAP Server", "releng3.freebsd.org", NULL, dmenuSetVariable, NULL,
VAR_FTP_PATH "=ftp://releng3.freebsd.org/pub/FreeBSD/" },
VAR_FTP_PATH _AR("=ftp://releng3.freebsd.org/pub/FreeBSD/snapshots/") },
{ "Argentina", "ftp.ar.freebsd.org", NULL, dmenuSetVariable, NULL,
VAR_FTP_PATH "=ftp://ftp.ar.freebsd.org/pub/FreeBSD/" },
{ "Australia", "ftp.au.freebsd.org", NULL, dmenuSetVariable, NULL,