diff options
| author | jkh <jkh@FreeBSD.org> | 1997-06-18 05:11:37 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1997-06-18 05:11:37 +0000 |
| commit | 3c30be4b409d77562e7cc8c79edb4bf99916cdcb (patch) | |
| tree | 08dd958cb16566653d69d3fb9d634c2f15d63bf0 /release/sysinstall/install.c | |
| parent | afb7547b1d249b68744bfbd3888d2af97dc45b72 (diff) | |
| download | FreeBSD-src-3c30be4b409d77562e7cc8c79edb4bf99916cdcb.zip FreeBSD-src-3c30be4b409d77562e7cc8c79edb4bf99916cdcb.tar.gz | |
1. Add a noWarn flag so that scripts can turn warnings off.
2. If hostname not set from script, bring up interactive dialog anyway.
Diffstat (limited to 'release/sysinstall/install.c')
| -rw-r--r-- | release/sysinstall/install.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c index 0557f21..314fea4 100644 --- a/release/sysinstall/install.c +++ b/release/sysinstall/install.c @@ -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.187 1997/05/30 01:03:09 jkh Exp $ + * $Id: install.c,v 1.188 1997/06/13 07:11:54 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -70,6 +70,10 @@ checkLabels(Boolean whinge, Chunk **rdev, Chunk **sdev, Chunk **udev, Chunk **vd Chunk *c1, *c2, *rootdev, *swapdev, *usrdev, *vardev; int i; + /* Don't allow whinging if noWarn is set */ + if (variable_get(VAR_NO_WARN)) + whinge = FALSE; + status = TRUE; *rdev = *sdev = *udev = *vdev = rootdev = swapdev = usrdev = vardev = NULL; |
