talexander
/
freebsd_amp_hwpstate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make intro command a NO-OP if no VISUAL_USERCONFIG

This commit is contained in:
Poul-Henning Kamp 1996-11-27 22:53:10 +00:00
parent f8d8dfe86e
commit be2806f309
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/i386/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.68 1996/11/12 20:00:24 bde Exp $
** $Id: userconfig.c,v 1.69 1996/11/14 13:57:23 jkh Exp $
**/
/**
@ -2219,7 +2219,7 @@ visuserconfig(void)
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: userconfig.c,v 1.68 1996/11/12 20:00:24 bde Exp $
* $Id: userconfig.c,v 1.69 1996/11/14 13:57:23 jkh Exp $
*/
#include "scbus.h"
@ -2273,7 +2273,7 @@ static int set_device_enable(CmdParm *);
static int set_device_disable(CmdParm *);
static int quitfunc(CmdParm *);
static int helpfunc(CmdParm *);
#if defined(USERCONFIG_BOOT) && defined(VISUAL_USERCONFIG)
#if defined(USERCONFIG_BOOT)
static int introfunc(CmdParm *);
#endif
@ -2304,7 +2304,7 @@ static Cmd CmdList[] = {
{ "ex", quitfunc, NULL }, /* exit (quit) */
{ "f", set_device_flags, int_parms }, /* flags dev mask */
{ "h", helpfunc, NULL }, /* help */
#if defined(USERCONFIG_BOOT) && defined(VISUAL_USERCONFIG)
#if defined(USERCONFIG_BOOT)
{ "intro", introfunc, NULL }, /* intro screen */
#endif
{ "iom", set_device_mem, addr_parms }, /* iomem dev addr */
@ -2565,17 +2565,20 @@ helpfunc(CmdParm *parms)
return 0;
}
#if defined(USERCONFIG_BOOT) && defined(VISUAL_USERCONFIG)
#if defined(USERCONFIG_BOOT)
#if defined (VISUAL_USERCONFIG)
static void
center(int y, char *str)
{
putxy((80 - strlen(str)) / 2, y, str);
}
#endif
static int
introfunc(CmdParm *parms)
{
#if defined (VISUAL_USERCONFIG)
int curr_item, first_time;
static char *choices[] = {
" Skip kernel configuration and continue with installation ",
@ -2669,6 +2672,7 @@ introfunc(CmdParm *parms)
}
}
}
#endif
}
#endif