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

Reshuffle the network config code a little so that it's actually

Browse Source 
usable.  Also fix the package extraction code.
This commit is contained in:
jkh 1995-10-23 13:19:51 +00:00
parent e31a1930f7
commit 96a3af0e96
6 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
release/sysinstall/installFinal.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: installFinal.c,v 1.7 1995/10/22 17:39:14 jkh Exp $
* $Id: installFinal.c,v 1.9 1995/10/22 21:38:10 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard & Coranth Gryphon. All rights reserved.
@ -76,9 +76,9 @@ static DMenu MenuSamba = {
#define SMB_CONF "./smb.conf"
/* Do any final optional hackery */
/* Do any final network configuration hackery */
int
installFinal(char *unused)
installNetworking(char *unused)
{
int i, tval;
char tbuf[256];

6
release/sysinstall/installPreconfig.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: installPreconfig.c,v 1.10 1995/10/22 17:39:15 jkh Exp $
* $Id: installPreconfig.c,v 1.12 1995/10/22 21:38:12 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -84,7 +84,7 @@ static struct _word {
{ "installUpgrade", installUpgrade },
{ "installPreconfig", installPreconfig },
{ "installFixup", installFixup },
{ "installFinal", installFinal },
{ "installNetworking", installNetworking },
{ "installFilesystems", installFilesystems },
{ "mediaSetCDROM", mediaSetCDROM },
{ "mediaSetFloppy", mediaSetFloppy },
@ -209,7 +209,7 @@ installPreconfig(char *str)
}
close(fd);
safe_free(cattr);
unmount("/mnt2", 0);
unmount("/mnt2", MNT_FORCE);
break;
}
}

10
release/sysinstall/installUpgrade.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: installUpgrade.c,v 1.5 1995/10/20 14:24:52 jkh Exp $
* $Id: installUpgrade.c,v 1.7 1995/10/22 17:39:16 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -311,11 +311,11 @@ installUpgrade(char *str)
if (extractingBin)
configSysconfig();
if (installFinal("upgrade") == RET_FAIL) {
if (installNetworking("upgrade") == RET_FAIL) {
dialog_clear();
msgConfirm("Some of the final configuration stuff evidently failed, but\n"
"the first stage of the upgrade should otherwise be considered\n"
"a success!\n\n"
msgConfirm("Some of the networking configuration stuff evidently failed, but\n"
"the first stage of the upgrade should otherwise be considered a\n"
"success!\n\n"
"Next comes stage 2, where we attempt to resurrect your /etc\n"
"directory!");
}

10
release/sysinstall/package.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: package.c,v 1.15 1995/10/22 21:38:20 jkh Exp $
* $Id: package.c,v 1.16 1995/10/22 23:20:45 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -68,7 +68,7 @@ package_extract(Device *dev, char *name)
char path[511];
char pen[FILENAME_MAX];
char *where;
int i, fd, ret;
int fd, ret;
/* Check to make sure it's not already there */
if (!vsystem("pkg_info -e %s", name)) {
@ -84,7 +84,7 @@ package_extract(Device *dev, char *name)
ret = RET_FAIL;
sprintf(path, "packages/All/%s%s", name, strstr(name, ".tgz") ? "" : ".tgz");
msgNotify("pkg_extract: Attempting to fetch %s\nfrom %s", path, dev->name);
msgNotify("Adding %s from %s", path, dev->name);
fd = dev->get(dev, path, TRUE);
if (fd >= 0) {
pen[0] = '\0';
@ -97,8 +97,10 @@ package_extract(Device *dev, char *name)
msgConfirm("An error occurred while trying to pkg_add %s.\n"
"Please check debugging screen for possible further details.", name);
}
else
else {
msgNotify("Package %s added successfully!", name);
ret = RET_SUCCESS;
}
}
else {
dialog_clear();

10
usr.sbin/sysinstall/installUpgrade.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: installUpgrade.c,v 1.5 1995/10/20 14:24:52 jkh Exp $
* $Id: installUpgrade.c,v 1.7 1995/10/22 17:39:16 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -311,11 +311,11 @@ installUpgrade(char *str)
if (extractingBin)
configSysconfig();
if (installFinal("upgrade") == RET_FAIL) {
if (installNetworking("upgrade") == RET_FAIL) {
dialog_clear();
msgConfirm("Some of the final configuration stuff evidently failed, but\n"
"the first stage of the upgrade should otherwise be considered\n"
"a success!\n\n"
msgConfirm("Some of the networking configuration stuff evidently failed, but\n"
"the first stage of the upgrade should otherwise be considered a\n"
"success!\n\n"
"Next comes stage 2, where we attempt to resurrect your /etc\n"
"directory!");
}

10
usr.sbin/sysinstall/package.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: package.c,v 1.15 1995/10/22 21:38:20 jkh Exp $
* $Id: package.c,v 1.16 1995/10/22 23:20:45 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -68,7 +68,7 @@ package_extract(Device *dev, char *name)
char path[511];
char pen[FILENAME_MAX];
char *where;
int i, fd, ret;
int fd, ret;
/* Check to make sure it's not already there */
if (!vsystem("pkg_info -e %s", name)) {
@ -84,7 +84,7 @@ package_extract(Device *dev, char *name)
ret = RET_FAIL;
sprintf(path, "packages/All/%s%s", name, strstr(name, ".tgz") ? "" : ".tgz");
msgNotify("pkg_extract: Attempting to fetch %s\nfrom %s", path, dev->name);
msgNotify("Adding %s from %s", path, dev->name);
fd = dev->get(dev, path, TRUE);
if (fd >= 0) {
pen[0] = '\0';
@ -97,8 +97,10 @@ package_extract(Device *dev, char *name)
msgConfirm("An error occurred while trying to pkg_add %s.\n"
"Please check debugging screen for possible further details.", name);
}
else
else {
msgNotify("Package %s added successfully!", name);
ret = RET_SUCCESS;
}
}
else {
dialog_clear();