system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-11-05 18:22:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Round 2.5

Browse source
This commit is contained in:
Jordan K. Hubbard 1996-10-01 14:08:28 +00:00
parent b6b15dde45
commit 7972a1c191
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=18621
8 changed files with 70 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
release/sysinstall/install.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: install.c,v 1.119 1996/09/29 10:03:30 jkh Exp $
* $Id: install.c,v 1.120 1996/10/01 04:56:32 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -618,6 +618,10 @@ installFixup(dialogMenuItem *self)
return DITEM_FAILURE;
}
}
/* Snapshot the dset changes back */
vsystem("/sbin/dset -v -k /kernel");
/* Resurrect /dev after bin distribution screws it up */
if (RunningAsInit) {
msgNotify("Remaking all devices.. Please wait!");

10
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.58 1996/08/03 10:11:10 jkh Exp $
* $Id: label.c,v 1.59 1996/10/01 12:13:13 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -264,8 +264,8 @@ get_mountpoint(struct chunk *old)
else
tmp = NULL;
if (!old) {
DialogX = 13;
DialogY = 17;
DialogX = 14;
DialogY = 16;
}
val = msgGetInput(tmp ? tmp->mountpoint : NULL, "Please specify a mount point for the partition");
DialogX = DialogY = 0;
@ -326,7 +326,7 @@ get_partition_type(void)
"A swap partition.",
};
DialogX = 7;
DialogY = 9;
DialogY = 8;
i = dialog_menu("Please choose a partition type",
"If you want to use this partition for swap space, select Swap.\n"
"If you want to put a filesystem on it, choose FS.",
@ -670,7 +670,7 @@ diskLabel(char *str)
sprintf(osize, "%d", sz);
DialogX = 3;
DialogY = 1;
DialogY = 2;
val = msgGetInput(osize,
"Please specify the partition size in blocks or append a trailing M for\n"
"megabytes or C for cylinders. %d blocks (%dMB) are free.",

28
release/sysinstall/media.c
View file

@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated to essentially a complete rewrite.
*
* $Id: media.c,v 1.53 1996/09/26 22:07:32 pst Exp $
* $Id: media.c,v 1.54 1996/10/01 12:13:19 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -259,7 +259,7 @@ mediaSetFTP(dialogMenuItem *self)
static Device ftpDevice;
char *cp, *hostname, *dir;
extern int FtpPort;
int what;
int what = DITEM_RESTORE;
cp = variable_get(VAR_FTP_PATH);
if (!cp) {
@ -270,13 +270,25 @@ mediaSetFTP(dialogMenuItem *self)
cp = variable_get(VAR_FTP_PATH);
what = DITEM_RECREATE;
}
else
what = DITEM_RESTORE;
if (!cp) {
dialog_clear_norefresh();
msgConfirm("%s not set! Not setting an FTP installation path, OK?", VAR_FTP_PATH);
return DITEM_FAILURE | what;
else {
static int first_time = 1;
if (first_time)
first_time = 0;
else {
dialog_clear_norefresh();
if (msgYesNo("Do you want to use your old FTP path value of\n%s?", cp)) {
dialog_clear_norefresh();
if (!dmenuOpenSimple(&MenuMediaFTP, FALSE))
return DITEM_FAILURE | DITEM_RECREATE;
else
cp = variable_get(VAR_FTP_PATH);
what = DITEM_RECREATE;
}
}
}
if (!cp)
return DITEM_FAILURE | what;
else if (!strcmp(cp, "other")) {
variable_set2(VAR_FTP_PATH, "ftp://");
dialog_clear_norefresh();

6
usr.sbin/sade/install.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: install.c,v 1.119 1996/09/29 10:03:30 jkh Exp $
* $Id: install.c,v 1.120 1996/10/01 04:56:32 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -618,6 +618,10 @@ installFixup(dialogMenuItem *self)
return DITEM_FAILURE;
}
}
/* Snapshot the dset changes back */
vsystem("/sbin/dset -v -k /kernel");
/* Resurrect /dev after bin distribution screws it up */
if (RunningAsInit) {
msgNotify("Remaking all devices.. Please wait!");

10
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.58 1996/08/03 10:11:10 jkh Exp $
* $Id: label.c,v 1.59 1996/10/01 12:13:13 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -264,8 +264,8 @@ get_mountpoint(struct chunk *old)
else
tmp = NULL;
if (!old) {
DialogX = 13;
DialogY = 17;
DialogX = 14;
DialogY = 16;
}
val = msgGetInput(tmp ? tmp->mountpoint : NULL, "Please specify a mount point for the partition");
DialogX = DialogY = 0;
@ -326,7 +326,7 @@ get_partition_type(void)
"A swap partition.",
};
DialogX = 7;
DialogY = 9;
DialogY = 8;
i = dialog_menu("Please choose a partition type",
"If you want to use this partition for swap space, select Swap.\n"
"If you want to put a filesystem on it, choose FS.",
@ -670,7 +670,7 @@ diskLabel(char *str)
sprintf(osize, "%d", sz);
DialogX = 3;
DialogY = 1;
DialogY = 2;
val = msgGetInput(osize,
"Please specify the partition size in blocks or append a trailing M for\n"
"megabytes or C for cylinders. %d blocks (%dMB) are free.",

6
usr.sbin/sysinstall/install.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: install.c,v 1.119 1996/09/29 10:03:30 jkh Exp $
* $Id: install.c,v 1.120 1996/10/01 04:56:32 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -618,6 +618,10 @@ installFixup(dialogMenuItem *self)
return DITEM_FAILURE;
}
}
/* Snapshot the dset changes back */
vsystem("/sbin/dset -v -k /kernel");
/* Resurrect /dev after bin distribution screws it up */
if (RunningAsInit) {
msgNotify("Remaking all devices.. Please wait!");

10
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.58 1996/08/03 10:11:10 jkh Exp $
* $Id: label.c,v 1.59 1996/10/01 12:13:13 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -264,8 +264,8 @@ get_mountpoint(struct chunk *old)
else
tmp = NULL;
if (!old) {
DialogX = 13;
DialogY = 17;
DialogX = 14;
DialogY = 16;
}
val = msgGetInput(tmp ? tmp->mountpoint : NULL, "Please specify a mount point for the partition");
DialogX = DialogY = 0;
@ -326,7 +326,7 @@ get_partition_type(void)
"A swap partition.",
};
DialogX = 7;
DialogY = 9;
DialogY = 8;
i = dialog_menu("Please choose a partition type",
"If you want to use this partition for swap space, select Swap.\n"
"If you want to put a filesystem on it, choose FS.",
@ -670,7 +670,7 @@ diskLabel(char *str)
sprintf(osize, "%d", sz);
DialogX = 3;
DialogY = 1;
DialogY = 2;
val = msgGetInput(osize,
"Please specify the partition size in blocks or append a trailing M for\n"
"megabytes or C for cylinders. %d blocks (%dMB) are free.",

28
usr.sbin/sysinstall/media.c
View file

@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated to essentially a complete rewrite.
*
* $Id: media.c,v 1.53 1996/09/26 22:07:32 pst Exp $
* $Id: media.c,v 1.54 1996/10/01 12:13:19 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -259,7 +259,7 @@ mediaSetFTP(dialogMenuItem *self)
static Device ftpDevice;
char *cp, *hostname, *dir;
extern int FtpPort;
int what;
int what = DITEM_RESTORE;
cp = variable_get(VAR_FTP_PATH);
if (!cp) {
@ -270,13 +270,25 @@ mediaSetFTP(dialogMenuItem *self)
cp = variable_get(VAR_FTP_PATH);
what = DITEM_RECREATE;
}
else
what = DITEM_RESTORE;
if (!cp) {
dialog_clear_norefresh();
msgConfirm("%s not set! Not setting an FTP installation path, OK?", VAR_FTP_PATH);
return DITEM_FAILURE | what;
else {
static int first_time = 1;
if (first_time)
first_time = 0;
else {
dialog_clear_norefresh();
if (msgYesNo("Do you want to use your old FTP path value of\n%s?", cp)) {
dialog_clear_norefresh();
if (!dmenuOpenSimple(&MenuMediaFTP, FALSE))
return DITEM_FAILURE | DITEM_RECREATE;
else
cp = variable_get(VAR_FTP_PATH);
what = DITEM_RECREATE;
}
}
}
if (!cp)
return DITEM_FAILURE | what;
else if (!strcmp(cp, "other")) {
variable_set2(VAR_FTP_PATH, "ftp://");
dialog_clear_norefresh();