talexander
/
freebsd_amp_hwpstate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adapt sysinstall more fully to the alpha (deal with proper boot signatures, 

don't present label editor, etc).

Submitted by:	dfr
This commit is contained in:
Jordan K. Hubbard 1999-01-08 00:14:22 +00:00
parent 7306cb58a8
commit af61828f44
21 changed files with 183 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
release/sysinstall/Makefile
View File

@ -20,7 +20,10 @@ SRCS= anonFTP.c cdrom.c command.c config.c devices.c \
CFLAGS+= -Wall -I${.CURDIR}/../../gnu/lib/libdialog -I${.OBJDIR}
CFLAGS+= -I${.CURDIR}/../../sys
CFLAGS+= -DUC_PRIVATE -DKERN_NO_SYMBOLS -DSAVE_USERCONFIG # -DDO_SCSI
CFLAGS+= -DUC_PRIVATE -DKERN_NO_SYMBOLS # -DSAVE_USERCONFIG -DDO_SCSI
.if ${MACHINE_ARCH} == "i386"
CFLAGS+= -DSAVE_USERCONFIG
.endif
DPADD= ${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL} ${LIBDISK} ${LIBFTPIO}
LDADD= -ldialog -lncurses -lmytinfo -lutil -ldisk -lftpio

9
release/sysinstall/disks.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: disks.c,v 1.106 1998/10/13 09:49:16 jkh Exp $
* $Id: disks.c,v 1.107 1999/01/02 07:23:37 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -673,14 +673,21 @@ diskPartitionWrite(dialogMenuItem *self)
Chunk *c1;
Disk *d = (Disk *)devs[i]->private;
static u_char *boot1;
#ifndef __alpha__
static u_char *boot2;
#endif
if (!devs[i]->enabled)
continue;
#ifdef __alpha__
if (!boot1) boot1 = bootalloc("boot1");
Set_Boot_Blocks(d, boot1, NULL);
#else
if (!boot1) boot1 = bootalloc("boot1");
if (!boot2) boot2 = bootalloc("boot2");
Set_Boot_Blocks(d, boot1, boot2);
#endif
msgNotify("Writing partition information to drive %s", d->name);
if (!Fake && Write_Disk(d)) {

17
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.219 1998/11/24 00:18:55 jkh Exp $
* $Id: install.c,v 1.220 1998/12/06 10:13:57 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -455,8 +455,10 @@ installExpress(dialogMenuItem *self)
int i;
variable_set2(SYSTEM_STATE, "express");
#ifndef __alpha__
if (DITEM_STATUS((i = diskPartitionEditor(self))) == DITEM_FAILURE)
return i;
#endif
if (DITEM_STATUS((i = diskLabelEditor(self))) == DITEM_FAILURE)
return i;
@ -478,6 +480,7 @@ installNovice(dialogMenuItem *self)
Device **devs;
variable_set2(SYSTEM_STATE, "novice");
#ifndef __alpha__
dialog_clear_norefresh();
msgConfirm("In the next menu, you will need to set up a DOS-style (\"fdisk\") partitioning\n"
"scheme for your hard disk. If you simply wish to devote all disk space\n"
@ -496,14 +499,24 @@ nodisks:
++tries;
goto nodisks;
}
#endif
dialog_clear_norefresh();
msgConfirm("Next, you need to create BSD partitions inside of the fdisk partition(s)\n"
#ifdef __alpha__
msgConfirm("First, you need to create BSD partitions on the disk which you are\n"
"installing to. If you have a reasonable amount of disk space (200MB or more)\n"
"and don't have any special requirements, simply use the (A)uto command to\n"
"allocate space automatically. If you have more specific needs or just don't\n"
"care for the layout chosen by (A)uto, press F1 for more information on\n"
"manual layout.");
#else
msgConfirm("First, you need to create BSD partitions inside of the fdisk partition(s)\n"
"just created. If you have a reasonable amount of disk space (200MB or more)\n"
"and don't have any special requirements, simply use the (A)uto command to\n"
"allocate space automatically. If you have more specific needs or just don't\n"
"care for the layout chosen by (A)uto, press F1 for more information on\n"
"manual layout.");
#endif
if (DITEM_STATUS(diskLabelEditor(self)) == DITEM_FAILURE)
return DITEM_FAILURE;

13
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.82 1998/03/13 11:09:03 jkh Exp $
* $Id: label.c,v 1.83 1998/07/18 09:42:01 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -653,6 +653,9 @@ diskLabel(Device *dev)
PartInfo *p, *oldp;
PartType type;
Device **devs;
#ifdef __alpha__
int i;
#endif
label_focus = 0;
pslice_focus = 0;
@ -665,6 +668,11 @@ diskLabel(Device *dev)
}
labeling = TRUE;
keypad(stdscr, TRUE);
#ifdef __alpha__
for (i = 0; devs[i]; i++) {
All_FreeBSD((Disk*) devs[i]->private, 1);
}
#endif
record_label_chunks(devs, dev);
clear();
@ -1160,6 +1168,9 @@ diskLabelNonInteractive(Device *dev)
d = dev->private;
else
d = devs[0]->private;
#ifdef __alpha__
All_FreeBSD(d, 1);
#endif
record_label_chunks(devs, dev);
for (i = 0; label_chunk_info[i].c; i++) {
Chunk *c1 = label_chunk_info[i].c;

12
release/sysinstall/main.c
View File

@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated for what's essentially a complete rewrite.
*
* $Id: main.c,v 1.48 1998/02/22 09:54:17 jkh Exp $
* $Id: main.c,v 1.49 1998/03/10 13:42:02 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -123,8 +123,14 @@ main(int argc, char **argv)
while (1) {
choice = scroll = curr = max = 0;
dmenuOpen(&MenuInitial, &choice, &scroll, &curr, &max, TRUE);
if (getpid() != 1 || !msgYesNo("Are you sure you wish to exit? The system will reboot\n"
"(be sure to remove any floppies from the drives)."))
if (getpid() != 1
#ifdef __alpha__
|| !msgYesNo("Are you sure you wish to exit? The system will halt.")
#else
|| !msgYesNo("Are you sure you wish to exit? The system will reboot\n"
"(be sure to remove any floppies from the drives).")
#endif
)
break;
}

9
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.178 1998/12/25 21:57:06 jkh Exp $
* $Id: menus.c,v 1.179 1999/01/06 13:55:12 peter Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -1064,11 +1064,18 @@ DMenu MenuInstallCustom = {
"Press F1 to read the installation guide",
"install",
{ { "1 Options", "View/Set various installation options", NULL, optionsEditor },
#ifdef __alpha__
{ "2 Label", "Label disk partitions", NULL, diskLabelEditor },
{ "3 Distributions", "Select distribution(s) to extract", NULL, dmenuSubmenu, NULL, &MenuDistributions },
{ "4 Media", "Choose the installation media type", NULL, dmenuSubmenu, NULL, &MenuMedia },
{ "5 Commit", "Perform any pending Partition/Label/Extract actions", NULL, installCustomCommit },
#else
{ "2 Partition", "Allocate disk space for FreeBSD", NULL, diskPartitionEditor },
{ "3 Label", "Label allocated disk partitions", NULL, diskLabelEditor },
{ "4 Distributions", "Select distribution(s) to extract", NULL, dmenuSubmenu, NULL, &MenuDistributions },
{ "5 Media", "Choose the installation media type", NULL, dmenuSubmenu, NULL, &MenuMedia },
{ "6 Commit", "Perform any pending Partition/Label/Extract actions", NULL, installCustomCommit },
#endif
{ "0 Exit", "Exit this menu (returning to previous)", NULL, dmenuExit },
{ NULL } },
};

6
release/sysinstall/system.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: system.c,v 1.84 1998/09/30 13:36:53 jkh Exp $
* $Id: system.c,v 1.85 1998/11/03 03:38:56 jkh Exp $
*
* Jordan Hubbard
*
@ -160,7 +160,11 @@ systemShutdown(int status)
if (RunningAsInit) {
/* Put the console back */
ioctl(0, VT_ACTIVATE, 2);
#ifdef __alpha__
reboot(RB_HALT);
#else
reboot(0);
#endif
}
else
exit(status);

5
usr.sbin/sade/Makefile
View File

@ -20,7 +20,10 @@ SRCS= anonFTP.c cdrom.c command.c config.c devices.c \
CFLAGS+= -Wall -I${.CURDIR}/../../gnu/lib/libdialog -I${.OBJDIR}
CFLAGS+= -I${.CURDIR}/../../sys
CFLAGS+= -DUC_PRIVATE -DKERN_NO_SYMBOLS -DSAVE_USERCONFIG # -DDO_SCSI
CFLAGS+= -DUC_PRIVATE -DKERN_NO_SYMBOLS # -DSAVE_USERCONFIG -DDO_SCSI
.if ${MACHINE_ARCH} == "i386"
CFLAGS+= -DSAVE_USERCONFIG
.endif
DPADD= ${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL} ${LIBDISK} ${LIBFTPIO}
LDADD= -ldialog -lncurses -lmytinfo -lutil -ldisk -lftpio

9
usr.sbin/sade/disks.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: disks.c,v 1.106 1998/10/13 09:49:16 jkh Exp $
* $Id: disks.c,v 1.107 1999/01/02 07:23:37 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -673,14 +673,21 @@ diskPartitionWrite(dialogMenuItem *self)
Chunk *c1;
Disk *d = (Disk *)devs[i]->private;
static u_char *boot1;
#ifndef __alpha__
static u_char *boot2;
#endif
if (!devs[i]->enabled)
continue;
#ifdef __alpha__
if (!boot1) boot1 = bootalloc("boot1");
Set_Boot_Blocks(d, boot1, NULL);
#else
if (!boot1) boot1 = bootalloc("boot1");
if (!boot2) boot2 = bootalloc("boot2");
Set_Boot_Blocks(d, boot1, boot2);
#endif
msgNotify("Writing partition information to drive %s", d->name);
if (!Fake && Write_Disk(d)) {

17
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.219 1998/11/24 00:18:55 jkh Exp $
* $Id: install.c,v 1.220 1998/12/06 10:13:57 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -455,8 +455,10 @@ installExpress(dialogMenuItem *self)
int i;
variable_set2(SYSTEM_STATE, "express");
#ifndef __alpha__
if (DITEM_STATUS((i = diskPartitionEditor(self))) == DITEM_FAILURE)
return i;
#endif
if (DITEM_STATUS((i = diskLabelEditor(self))) == DITEM_FAILURE)
return i;
@ -478,6 +480,7 @@ installNovice(dialogMenuItem *self)
Device **devs;
variable_set2(SYSTEM_STATE, "novice");
#ifndef __alpha__
dialog_clear_norefresh();
msgConfirm("In the next menu, you will need to set up a DOS-style (\"fdisk\") partitioning\n"
"scheme for your hard disk. If you simply wish to devote all disk space\n"
@ -496,14 +499,24 @@ nodisks:
++tries;
goto nodisks;
}
#endif
dialog_clear_norefresh();
msgConfirm("Next, you need to create BSD partitions inside of the fdisk partition(s)\n"
#ifdef __alpha__
msgConfirm("First, you need to create BSD partitions on the disk which you are\n"
"installing to. If you have a reasonable amount of disk space (200MB or more)\n"
"and don't have any special requirements, simply use the (A)uto command to\n"
"allocate space automatically. If you have more specific needs or just don't\n"
"care for the layout chosen by (A)uto, press F1 for more information on\n"
"manual layout.");
#else
msgConfirm("First, you need to create BSD partitions inside of the fdisk partition(s)\n"
"just created. If you have a reasonable amount of disk space (200MB or more)\n"
"and don't have any special requirements, simply use the (A)uto command to\n"
"allocate space automatically. If you have more specific needs or just don't\n"
"care for the layout chosen by (A)uto, press F1 for more information on\n"
"manual layout.");
#endif
if (DITEM_STATUS(diskLabelEditor(self)) == DITEM_FAILURE)
return DITEM_FAILURE;

13
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.82 1998/03/13 11:09:03 jkh Exp $
* $Id: label.c,v 1.83 1998/07/18 09:42:01 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -653,6 +653,9 @@ diskLabel(Device *dev)
PartInfo *p, *oldp;
PartType type;
Device **devs;
#ifdef __alpha__
int i;
#endif
label_focus = 0;
pslice_focus = 0;
@ -665,6 +668,11 @@ diskLabel(Device *dev)
}
labeling = TRUE;
keypad(stdscr, TRUE);
#ifdef __alpha__
for (i = 0; devs[i]; i++) {
All_FreeBSD((Disk*) devs[i]->private, 1);
}
#endif
record_label_chunks(devs, dev);
clear();
@ -1160,6 +1168,9 @@ diskLabelNonInteractive(Device *dev)
d = dev->private;
else
d = devs[0]->private;
#ifdef __alpha__
All_FreeBSD(d, 1);
#endif
record_label_chunks(devs, dev);
for (i = 0; label_chunk_info[i].c; i++) {
Chunk *c1 = label_chunk_info[i].c;

12
usr.sbin/sade/main.c
View File

@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated for what's essentially a complete rewrite.
*
* $Id: main.c,v 1.48 1998/02/22 09:54:17 jkh Exp $
* $Id: main.c,v 1.49 1998/03/10 13:42:02 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -123,8 +123,14 @@ main(int argc, char **argv)
while (1) {
choice = scroll = curr = max = 0;
dmenuOpen(&MenuInitial, &choice, &scroll, &curr, &max, TRUE);
if (getpid() != 1 || !msgYesNo("Are you sure you wish to exit? The system will reboot\n"
"(be sure to remove any floppies from the drives)."))
if (getpid() != 1
#ifdef __alpha__
|| !msgYesNo("Are you sure you wish to exit? The system will halt.")
#else
|| !msgYesNo("Are you sure you wish to exit? The system will reboot\n"
"(be sure to remove any floppies from the drives).")
#endif
)
break;
}

9
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.178 1998/12/25 21:57:06 jkh Exp $
* $Id: menus.c,v 1.179 1999/01/06 13:55:12 peter Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -1064,11 +1064,18 @@ DMenu MenuInstallCustom = {
"Press F1 to read the installation guide",
"install",
{ { "1 Options", "View/Set various installation options", NULL, optionsEditor },
#ifdef __alpha__
{ "2 Label", "Label disk partitions", NULL, diskLabelEditor },
{ "3 Distributions", "Select distribution(s) to extract", NULL, dmenuSubmenu, NULL, &MenuDistributions },
{ "4 Media", "Choose the installation media type", NULL, dmenuSubmenu, NULL, &MenuMedia },
{ "5 Commit", "Perform any pending Partition/Label/Extract actions", NULL, installCustomCommit },
#else
{ "2 Partition", "Allocate disk space for FreeBSD", NULL, diskPartitionEditor },
{ "3 Label", "Label allocated disk partitions", NULL, diskLabelEditor },
{ "4 Distributions", "Select distribution(s) to extract", NULL, dmenuSubmenu, NULL, &MenuDistributions },
{ "5 Media", "Choose the installation media type", NULL, dmenuSubmenu, NULL, &MenuMedia },
{ "6 Commit", "Perform any pending Partition/Label/Extract actions", NULL, installCustomCommit },
#endif
{ "0 Exit", "Exit this menu (returning to previous)", NULL, dmenuExit },
{ NULL } },
};

6
usr.sbin/sade/system.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: system.c,v 1.84 1998/09/30 13:36:53 jkh Exp $
* $Id: system.c,v 1.85 1998/11/03 03:38:56 jkh Exp $
*
* Jordan Hubbard
*
@ -160,7 +160,11 @@ systemShutdown(int status)
if (RunningAsInit) {
/* Put the console back */
ioctl(0, VT_ACTIVATE, 2);
#ifdef __alpha__
reboot(RB_HALT);
#else
reboot(0);
#endif
}
else
exit(status);

5
usr.sbin/sysinstall/Makefile
View File

@ -20,7 +20,10 @@ SRCS= anonFTP.c cdrom.c command.c config.c devices.c \
CFLAGS+= -Wall -I${.CURDIR}/../../gnu/lib/libdialog -I${.OBJDIR}
CFLAGS+= -I${.CURDIR}/../../sys
CFLAGS+= -DUC_PRIVATE -DKERN_NO_SYMBOLS -DSAVE_USERCONFIG # -DDO_SCSI
CFLAGS+= -DUC_PRIVATE -DKERN_NO_SYMBOLS # -DSAVE_USERCONFIG -DDO_SCSI
.if ${MACHINE_ARCH} == "i386"
CFLAGS+= -DSAVE_USERCONFIG
.endif
DPADD= ${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL} ${LIBDISK} ${LIBFTPIO}
LDADD= -ldialog -lncurses -lmytinfo -lutil -ldisk -lftpio

9
usr.sbin/sysinstall/disks.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: disks.c,v 1.106 1998/10/13 09:49:16 jkh Exp $
* $Id: disks.c,v 1.107 1999/01/02 07:23:37 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -673,14 +673,21 @@ diskPartitionWrite(dialogMenuItem *self)
Chunk *c1;
Disk *d = (Disk *)devs[i]->private;
static u_char *boot1;
#ifndef __alpha__
static u_char *boot2;
#endif
if (!devs[i]->enabled)
continue;
#ifdef __alpha__
if (!boot1) boot1 = bootalloc("boot1");
Set_Boot_Blocks(d, boot1, NULL);
#else
if (!boot1) boot1 = bootalloc("boot1");
if (!boot2) boot2 = bootalloc("boot2");
Set_Boot_Blocks(d, boot1, boot2);
#endif
msgNotify("Writing partition information to drive %s", d->name);
if (!Fake && Write_Disk(d)) {

17
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.219 1998/11/24 00:18:55 jkh Exp $
* $Id: install.c,v 1.220 1998/12/06 10:13:57 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -455,8 +455,10 @@ installExpress(dialogMenuItem *self)
int i;
variable_set2(SYSTEM_STATE, "express");
#ifndef __alpha__
if (DITEM_STATUS((i = diskPartitionEditor(self))) == DITEM_FAILURE)
return i;
#endif
if (DITEM_STATUS((i = diskLabelEditor(self))) == DITEM_FAILURE)
return i;
@ -478,6 +480,7 @@ installNovice(dialogMenuItem *self)
Device **devs;
variable_set2(SYSTEM_STATE, "novice");
#ifndef __alpha__
dialog_clear_norefresh();
msgConfirm("In the next menu, you will need to set up a DOS-style (\"fdisk\") partitioning\n"
"scheme for your hard disk. If you simply wish to devote all disk space\n"
@ -496,14 +499,24 @@ nodisks:
++tries;
goto nodisks;
}
#endif
dialog_clear_norefresh();
msgConfirm("Next, you need to create BSD partitions inside of the fdisk partition(s)\n"
#ifdef __alpha__
msgConfirm("First, you need to create BSD partitions on the disk which you are\n"
"installing to. If you have a reasonable amount of disk space (200MB or more)\n"
"and don't have any special requirements, simply use the (A)uto command to\n"
"allocate space automatically. If you have more specific needs or just don't\n"
"care for the layout chosen by (A)uto, press F1 for more information on\n"
"manual layout.");
#else
msgConfirm("First, you need to create BSD partitions inside of the fdisk partition(s)\n"
"just created. If you have a reasonable amount of disk space (200MB or more)\n"
"and don't have any special requirements, simply use the (A)uto command to\n"
"allocate space automatically. If you have more specific needs or just don't\n"
"care for the layout chosen by (A)uto, press F1 for more information on\n"
"manual layout.");
#endif
if (DITEM_STATUS(diskLabelEditor(self)) == DITEM_FAILURE)
return DITEM_FAILURE;

13
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.82 1998/03/13 11:09:03 jkh Exp $
* $Id: label.c,v 1.83 1998/07/18 09:42:01 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -653,6 +653,9 @@ diskLabel(Device *dev)
PartInfo *p, *oldp;
PartType type;
Device **devs;
#ifdef __alpha__
int i;
#endif
label_focus = 0;
pslice_focus = 0;
@ -665,6 +668,11 @@ diskLabel(Device *dev)
}
labeling = TRUE;
keypad(stdscr, TRUE);
#ifdef __alpha__
for (i = 0; devs[i]; i++) {
All_FreeBSD((Disk*) devs[i]->private, 1);
}
#endif
record_label_chunks(devs, dev);
clear();
@ -1160,6 +1168,9 @@ diskLabelNonInteractive(Device *dev)
d = dev->private;
else
d = devs[0]->private;
#ifdef __alpha__
All_FreeBSD(d, 1);
#endif
record_label_chunks(devs, dev);
for (i = 0; label_chunk_info[i].c; i++) {
Chunk *c1 = label_chunk_info[i].c;

12
usr.sbin/sysinstall/main.c
View File

@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated for what's essentially a complete rewrite.
*
* $Id: main.c,v 1.48 1998/02/22 09:54:17 jkh Exp $
* $Id: main.c,v 1.49 1998/03/10 13:42:02 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -123,8 +123,14 @@ main(int argc, char **argv)
while (1) {
choice = scroll = curr = max = 0;
dmenuOpen(&MenuInitial, &choice, &scroll, &curr, &max, TRUE);
if (getpid() != 1 || !msgYesNo("Are you sure you wish to exit? The system will reboot\n"
"(be sure to remove any floppies from the drives)."))
if (getpid() != 1
#ifdef __alpha__
|| !msgYesNo("Are you sure you wish to exit? The system will halt.")
#else
|| !msgYesNo("Are you sure you wish to exit? The system will reboot\n"
"(be sure to remove any floppies from the drives).")
#endif
)
break;
}

9
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.178 1998/12/25 21:57:06 jkh Exp $
* $Id: menus.c,v 1.179 1999/01/06 13:55:12 peter Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -1064,11 +1064,18 @@ DMenu MenuInstallCustom = {
"Press F1 to read the installation guide",
"install",
{ { "1 Options", "View/Set various installation options", NULL, optionsEditor },
#ifdef __alpha__
{ "2 Label", "Label disk partitions", NULL, diskLabelEditor },
{ "3 Distributions", "Select distribution(s) to extract", NULL, dmenuSubmenu, NULL, &MenuDistributions },
{ "4 Media", "Choose the installation media type", NULL, dmenuSubmenu, NULL, &MenuMedia },
{ "5 Commit", "Perform any pending Partition/Label/Extract actions", NULL, installCustomCommit },
#else
{ "2 Partition", "Allocate disk space for FreeBSD", NULL, diskPartitionEditor },
{ "3 Label", "Label allocated disk partitions", NULL, diskLabelEditor },
{ "4 Distributions", "Select distribution(s) to extract", NULL, dmenuSubmenu, NULL, &MenuDistributions },
{ "5 Media", "Choose the installation media type", NULL, dmenuSubmenu, NULL, &MenuMedia },
{ "6 Commit", "Perform any pending Partition/Label/Extract actions", NULL, installCustomCommit },
#endif
{ "0 Exit", "Exit this menu (returning to previous)", NULL, dmenuExit },
{ NULL } },
};

6
usr.sbin/sysinstall/system.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: system.c,v 1.84 1998/09/30 13:36:53 jkh Exp $
* $Id: system.c,v 1.85 1998/11/03 03:38:56 jkh Exp $
*
* Jordan Hubbard
*
@ -160,7 +160,11 @@ systemShutdown(int status)
if (RunningAsInit) {
/* Put the console back */
ioctl(0, VT_ACTIVATE, 2);
#ifdef __alpha__
reboot(RB_HALT);
#else
reboot(0);
#endif
}
else
exit(status);