1. Set a path to /stand by default.
2. Don't clear() when I can dialog_clear().
This commit is contained in:
jkh
parent
073284dfb5
commit
ba4ac01f69
@ -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.19 1995/05/16 11:37:10 jkh Exp $
|
||||
* $Id: disks.c,v 1.20 1995/05/17 14:39:38 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -79,7 +79,7 @@ print_chunks(Disk *d)
|
||||
int row;
|
||||
int i;
|
||||
|
||||
clear();
|
||||
dialog_clear();
|
||||
attrset(A_NORMAL);
|
||||
mvaddstr(0, 0, "Disk name:\t");
|
||||
attrset(A_REVERSE); addstr(d->name); attrset(A_NORMAL);
|
||||
@ -244,12 +244,10 @@ diskPartition(Disk *d)
|
||||
|
||||
case 'W':
|
||||
if (!msgYesNo("Are you sure you want to go into Wizard mode?\nNo seat belts whatsoever are provided!")) {
|
||||
clear();
|
||||
dialog_clear();
|
||||
end_dialog();
|
||||
DialogActive = FALSE;
|
||||
slice_wizard(d);
|
||||
clear();
|
||||
dialog_clear();
|
||||
DialogActive = TRUE;
|
||||
record_chunks(d);
|
||||
@ -273,7 +271,7 @@ diskPartition(Disk *d)
|
||||
msgConfirm(p);
|
||||
free(p);
|
||||
}
|
||||
clear();
|
||||
dialog_clear();
|
||||
refresh();
|
||||
variable_set2(DISK_PARTITIONED, "yes");
|
||||
return d;
|
||||
|
||||
@ -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.18 1995/05/16 11:37:14 jkh Exp $
|
||||
* $Id: install.c,v 1.19 1995/05/17 14:39:43 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -135,7 +135,6 @@ make_filesystems(void)
|
||||
continue;
|
||||
sprintf(dname, "/dev/%sa", disk->name);
|
||||
if (p->newfs) {
|
||||
msgDebug("newfs %s", dname);
|
||||
if (vsystem("newfs %s", dname)) {
|
||||
msgConfirm("Unable to make new root filesystem!");
|
||||
return;
|
||||
|
||||
@ -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.3 1995/05/17 14:39:45 jkh Exp $
|
||||
* $Id: label.c,v 1.4 1995/05/17 15:41:52 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -292,7 +292,7 @@ print_label_chunks(void)
|
||||
int i, j, srow, prow, pcol;
|
||||
int sz;
|
||||
|
||||
clear();
|
||||
dialog_clear();
|
||||
attrset(A_REVERSE);
|
||||
mvaddstr(0, 25, "FreeBSD Disklabel Editor");
|
||||
attrset(A_NORMAL);
|
||||
@ -608,7 +608,7 @@ diskLabelEditor(char *str)
|
||||
}
|
||||
}
|
||||
variable_set2(DISK_LABELLED, "yes");
|
||||
clear();
|
||||
dialog_clear();
|
||||
refresh();
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -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.10 1995/05/11 09:01:35 jkh Exp $
|
||||
* $Id: system.c,v 1.11 1995/05/16 11:37:26 jkh Exp $
|
||||
*
|
||||
* Jordan Hubbard
|
||||
*
|
||||
@ -69,6 +69,7 @@ systemInitialize(int argc, char **argv)
|
||||
|
||||
ioctl(0, TIOCSCTTY, (char *)NULL);
|
||||
setlogin("root");
|
||||
setenv("PATH", "/stand:/mnt/bin:/mnt/sbin:/mnt/usr/sbin:/mnt/usr/bin", 1);
|
||||
setbuf(stdin, 0);
|
||||
setbuf(stdout, 0);
|
||||
setbuf(stderr, 0);
|
||||
@ -133,7 +134,6 @@ systemShellEscape(void)
|
||||
msgWarn("No shell available, sorry!");
|
||||
return 1;
|
||||
}
|
||||
setenv("PATH", "/stand", 1);
|
||||
setenv("PS1", "freebsd% ", 1);
|
||||
dialog_clear();
|
||||
dialog_update();
|
||||
|
||||
@ -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.19 1995/05/16 11:37:10 jkh Exp $
|
||||
* $Id: disks.c,v 1.20 1995/05/17 14:39:38 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -79,7 +79,7 @@ print_chunks(Disk *d)
|
||||
int row;
|
||||
int i;
|
||||
|
||||
clear();
|
||||
dialog_clear();
|
||||
attrset(A_NORMAL);
|
||||
mvaddstr(0, 0, "Disk name:\t");
|
||||
attrset(A_REVERSE); addstr(d->name); attrset(A_NORMAL);
|
||||
@ -244,12 +244,10 @@ diskPartition(Disk *d)
|
||||
|
||||
case 'W':
|
||||
if (!msgYesNo("Are you sure you want to go into Wizard mode?\nNo seat belts whatsoever are provided!")) {
|
||||
clear();
|
||||
dialog_clear();
|
||||
end_dialog();
|
||||
DialogActive = FALSE;
|
||||
slice_wizard(d);
|
||||
clear();
|
||||
dialog_clear();
|
||||
DialogActive = TRUE;
|
||||
record_chunks(d);
|
||||
@ -273,7 +271,7 @@ diskPartition(Disk *d)
|
||||
msgConfirm(p);
|
||||
free(p);
|
||||
}
|
||||
clear();
|
||||
dialog_clear();
|
||||
refresh();
|
||||
variable_set2(DISK_PARTITIONED, "yes");
|
||||
return d;
|
||||
|
||||
@ -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.18 1995/05/16 11:37:14 jkh Exp $
|
||||
* $Id: install.c,v 1.19 1995/05/17 14:39:43 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -135,7 +135,6 @@ make_filesystems(void)
|
||||
continue;
|
||||
sprintf(dname, "/dev/%sa", disk->name);
|
||||
if (p->newfs) {
|
||||
msgDebug("newfs %s", dname);
|
||||
if (vsystem("newfs %s", dname)) {
|
||||
msgConfirm("Unable to make new root filesystem!");
|
||||
return;
|
||||
|
||||
@ -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.3 1995/05/17 14:39:45 jkh Exp $
|
||||
* $Id: label.c,v 1.4 1995/05/17 15:41:52 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -292,7 +292,7 @@ print_label_chunks(void)
|
||||
int i, j, srow, prow, pcol;
|
||||
int sz;
|
||||
|
||||
clear();
|
||||
dialog_clear();
|
||||
attrset(A_REVERSE);
|
||||
mvaddstr(0, 25, "FreeBSD Disklabel Editor");
|
||||
attrset(A_NORMAL);
|
||||
@ -608,7 +608,7 @@ diskLabelEditor(char *str)
|
||||
}
|
||||
}
|
||||
variable_set2(DISK_LABELLED, "yes");
|
||||
clear();
|
||||
dialog_clear();
|
||||
refresh();
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -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.10 1995/05/11 09:01:35 jkh Exp $
|
||||
* $Id: system.c,v 1.11 1995/05/16 11:37:26 jkh Exp $
|
||||
*
|
||||
* Jordan Hubbard
|
||||
*
|
||||
@ -69,6 +69,7 @@ systemInitialize(int argc, char **argv)
|
||||
|
||||
ioctl(0, TIOCSCTTY, (char *)NULL);
|
||||
setlogin("root");
|
||||
setenv("PATH", "/stand:/mnt/bin:/mnt/sbin:/mnt/usr/sbin:/mnt/usr/bin", 1);
|
||||
setbuf(stdin, 0);
|
||||
setbuf(stdout, 0);
|
||||
setbuf(stderr, 0);
|
||||
@ -133,7 +134,6 @@ systemShellEscape(void)
|
||||
msgWarn("No shell available, sorry!");
|
||||
return 1;
|
||||
}
|
||||
setenv("PATH", "/stand", 1);
|
||||
setenv("PS1", "freebsd% ", 1);
|
||||
dialog_clear();
|
||||
dialog_update();
|
||||
|
||||
@ -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.19 1995/05/16 11:37:10 jkh Exp $
|
||||
* $Id: disks.c,v 1.20 1995/05/17 14:39:38 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -79,7 +79,7 @@ print_chunks(Disk *d)
|
||||
int row;
|
||||
int i;
|
||||
|
||||
clear();
|
||||
dialog_clear();
|
||||
attrset(A_NORMAL);
|
||||
mvaddstr(0, 0, "Disk name:\t");
|
||||
attrset(A_REVERSE); addstr(d->name); attrset(A_NORMAL);
|
||||
@ -244,12 +244,10 @@ diskPartition(Disk *d)
|
||||
|
||||
case 'W':
|
||||
if (!msgYesNo("Are you sure you want to go into Wizard mode?\nNo seat belts whatsoever are provided!")) {
|
||||
clear();
|
||||
dialog_clear();
|
||||
end_dialog();
|
||||
DialogActive = FALSE;
|
||||
slice_wizard(d);
|
||||
clear();
|
||||
dialog_clear();
|
||||
DialogActive = TRUE;
|
||||
record_chunks(d);
|
||||
@ -273,7 +271,7 @@ diskPartition(Disk *d)
|
||||
msgConfirm(p);
|
||||
free(p);
|
||||
}
|
||||
clear();
|
||||
dialog_clear();
|
||||
refresh();
|
||||
variable_set2(DISK_PARTITIONED, "yes");
|
||||
return d;
|
||||
|
||||
@ -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.18 1995/05/16 11:37:14 jkh Exp $
|
||||
* $Id: install.c,v 1.19 1995/05/17 14:39:43 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -135,7 +135,6 @@ make_filesystems(void)
|
||||
continue;
|
||||
sprintf(dname, "/dev/%sa", disk->name);
|
||||
if (p->newfs) {
|
||||
msgDebug("newfs %s", dname);
|
||||
if (vsystem("newfs %s", dname)) {
|
||||
msgConfirm("Unable to make new root filesystem!");
|
||||
return;
|
||||
|
||||
@ -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.3 1995/05/17 14:39:45 jkh Exp $
|
||||
* $Id: label.c,v 1.4 1995/05/17 15:41:52 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -292,7 +292,7 @@ print_label_chunks(void)
|
||||
int i, j, srow, prow, pcol;
|
||||
int sz;
|
||||
|
||||
clear();
|
||||
dialog_clear();
|
||||
attrset(A_REVERSE);
|
||||
mvaddstr(0, 25, "FreeBSD Disklabel Editor");
|
||||
attrset(A_NORMAL);
|
||||
@ -608,7 +608,7 @@ diskLabelEditor(char *str)
|
||||
}
|
||||
}
|
||||
variable_set2(DISK_LABELLED, "yes");
|
||||
clear();
|
||||
dialog_clear();
|
||||
refresh();
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -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.10 1995/05/11 09:01:35 jkh Exp $
|
||||
* $Id: system.c,v 1.11 1995/05/16 11:37:26 jkh Exp $
|
||||
*
|
||||
* Jordan Hubbard
|
||||
*
|
||||
@ -69,6 +69,7 @@ systemInitialize(int argc, char **argv)
|
||||
|
||||
ioctl(0, TIOCSCTTY, (char *)NULL);
|
||||
setlogin("root");
|
||||
setenv("PATH", "/stand:/mnt/bin:/mnt/sbin:/mnt/usr/sbin:/mnt/usr/bin", 1);
|
||||
setbuf(stdin, 0);
|
||||
setbuf(stdout, 0);
|
||||
setbuf(stderr, 0);
|
||||
@ -133,7 +134,6 @@ systemShellEscape(void)
|
||||
msgWarn("No shell available, sorry!");
|
||||
return 1;
|
||||
}
|
||||
setenv("PATH", "/stand", 1);
|
||||
setenv("PS1", "freebsd% ", 1);
|
||||
dialog_clear();
|
||||
dialog_update();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user