d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

I shouldn't have incremented PART_OFF; it was wrong and broke label

Browse Source 
display to boot.  Also fix some various warning fluff while I'm in
here cleaning up.
This commit is contained in:
Jordan K. Hubbard 1999-12-12 04:58:02 +00:00
parent e0b0c6aad5
commit 404f4d4100
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=54473
14 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
release/sysinstall/disks.c
View File

@ -651,7 +651,6 @@ diskPartitionWrite(dialogMenuItem *self)
return DITEM_SUCCESS;
for (i = 0; devs[i]; i++) {
Chunk *c1;
Disk *d = (Disk *)devs[i]->private;
static u_char *boot1;
#ifndef __alpha__

2
release/sysinstall/install.c
View File

@ -749,7 +749,7 @@ installFixupBin(dialogMenuItem *self)
/* Snapshot any boot -c changes back to the new kernel */
cp = variable_get(VAR_KGET);
if (cp && (*cp == 'Y' || *cp == 'y')) {
if (kstat = kget("/boot/kernel.conf")) {
if ((kstat = kget("/boot/kernel.conf")) != NULL) {
msgConfirm("Kernel copied OK, but unable to save boot -c changes\n"
"to it. See the debug screen (ALT-F2) for details.");
}

2
release/sysinstall/label.c
View File

@ -426,7 +426,7 @@ getNewfsCmd(PartInfo *p)
#define PART_MOUNT_COL 10
#define PART_SIZE_COL (PART_MOUNT_COL + MAX_MOUNT_NAME + 3)
#define PART_NEWFS_COL (PART_SIZE_COL + 8)
#define PART_OFF 40
#define PART_OFF 38
#define TOTAL_AVAIL_LINES (10)
#define PSLICE_SHOWABLE (4)

2
release/sysinstall/system.c
View File

@ -259,6 +259,8 @@ systemChangeTerminal(char *color, const u_char c_term[],
char *mono, const u_char m_term[])
{
if (OnVTY) {
int setupterm(char *color, int, int *);
if (ColorDisplay) {
setenv("TERM", color, 1);
setenv("TERMCAP", c_term, 1);

2
release/sysinstall/tcpip.c
View File

@ -219,8 +219,6 @@ tcpOpenDialog(Device *devp)
/* First try a DHCP scan if such behavior is desired */
if (!variable_cmp(VAR_TRY_DHCP, "YES") || !msgYesNo("Do you want to try DHCP configuration of the interface?")) {
int k;
Mkdir("/var/db");
Mkdir("/var/run");
Mkdir("/tmp");

1
usr.sbin/sade/disks.c
View File

@ -651,7 +651,6 @@ diskPartitionWrite(dialogMenuItem *self)
return DITEM_SUCCESS;
for (i = 0; devs[i]; i++) {
Chunk *c1;
Disk *d = (Disk *)devs[i]->private;
static u_char *boot1;
#ifndef __alpha__

2
usr.sbin/sade/install.c
View File

@ -749,7 +749,7 @@ installFixupBin(dialogMenuItem *self)
/* Snapshot any boot -c changes back to the new kernel */
cp = variable_get(VAR_KGET);
if (cp && (*cp == 'Y' || *cp == 'y')) {
if (kstat = kget("/boot/kernel.conf")) {
if ((kstat = kget("/boot/kernel.conf")) != NULL) {
msgConfirm("Kernel copied OK, but unable to save boot -c changes\n"
"to it. See the debug screen (ALT-F2) for details.");
}

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

@ -426,7 +426,7 @@ getNewfsCmd(PartInfo *p)
#define PART_MOUNT_COL 10
#define PART_SIZE_COL (PART_MOUNT_COL + MAX_MOUNT_NAME + 3)
#define PART_NEWFS_COL (PART_SIZE_COL + 8)
#define PART_OFF 40
#define PART_OFF 38
#define TOTAL_AVAIL_LINES (10)
#define PSLICE_SHOWABLE (4)

2
usr.sbin/sade/system.c
View File

@ -259,6 +259,8 @@ systemChangeTerminal(char *color, const u_char c_term[],
char *mono, const u_char m_term[])
{
if (OnVTY) {
int setupterm(char *color, int, int *);
if (ColorDisplay) {
setenv("TERM", color, 1);
setenv("TERMCAP", c_term, 1);

1
usr.sbin/sysinstall/disks.c
View File

@ -651,7 +651,6 @@ diskPartitionWrite(dialogMenuItem *self)
return DITEM_SUCCESS;
for (i = 0; devs[i]; i++) {
Chunk *c1;
Disk *d = (Disk *)devs[i]->private;
static u_char *boot1;
#ifndef __alpha__

2
usr.sbin/sysinstall/install.c
View File

@ -749,7 +749,7 @@ installFixupBin(dialogMenuItem *self)
/* Snapshot any boot -c changes back to the new kernel */
cp = variable_get(VAR_KGET);
if (cp && (*cp == 'Y' || *cp == 'y')) {
if (kstat = kget("/boot/kernel.conf")) {
if ((kstat = kget("/boot/kernel.conf")) != NULL) {
msgConfirm("Kernel copied OK, but unable to save boot -c changes\n"
"to it. See the debug screen (ALT-F2) for details.");
}

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

@ -426,7 +426,7 @@ getNewfsCmd(PartInfo *p)
#define PART_MOUNT_COL 10
#define PART_SIZE_COL (PART_MOUNT_COL + MAX_MOUNT_NAME + 3)
#define PART_NEWFS_COL (PART_SIZE_COL + 8)
#define PART_OFF 40
#define PART_OFF 38
#define TOTAL_AVAIL_LINES (10)
#define PSLICE_SHOWABLE (4)

2
usr.sbin/sysinstall/system.c
View File

@ -259,6 +259,8 @@ systemChangeTerminal(char *color, const u_char c_term[],
char *mono, const u_char m_term[])
{
if (OnVTY) {
int setupterm(char *color, int, int *);
if (ColorDisplay) {
setenv("TERM", color, 1);
setenv("TERMCAP", c_term, 1);

2
usr.sbin/sysinstall/tcpip.c
View File

@ -219,8 +219,6 @@ tcpOpenDialog(Device *devp)
/* First try a DHCP scan if such behavior is desired */
if (!variable_cmp(VAR_TRY_DHCP, "YES") || !msgYesNo("Do you want to try DHCP configuration of the interface?")) {
int k;
Mkdir("/var/db");
Mkdir("/var/run");
Mkdir("/tmp");