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

Sync with sys/i386/i386/userconfig.c revision 1.102.

Browse Source
This commit is contained in:
kato 1998-02-10 08:03:42 +00:00
parent 5689fa645e
commit daf9d560a6
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/pc98/i386/userconfig.c
View File

@ -46,7 +46,7 @@
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
**
** $Id: userconfig.c,v 1.44 1998/01/22 14:26:34 kato Exp $
** $Id: userconfig.c,v 1.45 1998/01/26 09:18:18 kato Exp $
**/
/**
@ -116,6 +116,7 @@
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/reboot.h>
#include <machine/cons.h>
#include <machine/md_var.h>
@ -136,6 +137,7 @@ static struct isa_device *isa_devlist; /* list read by dset to extract changes *
#ifdef USERCONFIG_BOOT
char userconfig_from_boot[512] = "";
static int userconfig_boot_parsing; /* set if we are reading from the boot instructions */
static int
getchar(void)
@ -151,8 +153,10 @@ getchar(void)
}
}
if (*next) {
userconfig_boot_parsing = 1;
return (*next++);
} else {
userconfig_boot_parsing = 0;
return cngetc();
}
}
@ -2387,7 +2391,7 @@ visuserconfig(void)
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: userconfig.c,v 1.44 1998/01/22 14:26:34 kato Exp $
* $Id: userconfig.c,v 1.45 1998/01/26 09:18:18 kato Exp $
*/
#include "scbus.h"
@ -2854,6 +2858,15 @@ set_num_eisa_slots(CmdParm *parms)
static int
quitfunc(CmdParm *parms)
{
#ifdef USERCONFIG_BOOT
/*
* If kernel config supplied, and we are parsing it, and -c also supplied,
* ignore a quit command, This provides a safety mechanism to allow
* recovery from a damaged/buggy kernel config.
*/
if ((boothowto & RB_CONFIG) && userconfig_boot_parsing)
return 0;
#endif
return 1;
}