From sjr@home.net Tue Aug 31 19:42:14 1999
Return-Path: <sjr@home.net>
Received: from cc158233-a.catv1.md.home.com (cc158233-a.catv1.md.home.com [24.3.25.17])
	by hub.freebsd.org (Postfix) with ESMTP id 349CF154EE
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 31 Aug 1999 19:41:55 -0700 (PDT)
	(envelope-from sjr@home.net)
Received: (from sjr@localhost)
	by cc158233-a.catv1.md.home.com (8.9.3/8.9.3) id WAA09272;
	Tue, 31 Aug 1999 22:41:21 -0400 (EDT)
	(envelope-from sjr)
Message-Id: <199909010241.WAA09272@cc158233-a.catv1.md.home.com>
Date: Tue, 31 Aug 1999 22:41:21 -0400 (EDT)
From: sjr@home.com
Sender: sjr@home.net
Reply-To: sjr@home.com
To: FreeBSD-gnats-submit@freebsd.org
Subject: Wrong fixit CDROM in sysinstall
X-Send-Pr-Version: 3.2

>Number:         13508
>Category:       misc
>Synopsis:       Wrong fixit CDROM in sysinstall
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    jkh
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Aug 31 19:50:01 PDT 1999
>Closed-Date:    Wed Sep 1 01:59:07 PDT 1999
>Last-Modified:  Wed Sep  1 01:59:56 PDT 1999
>Originator:     Stephen J. Roznowski
>Release:        FreeBSD 4.0-CURRENT i386
>Organization:
>Environment:

	Installing from the 3.2 CDROMs.

>Description:

	After choosing the fixit option, you are prompted to install
	the 2nd CDROM for the fixit filesystem. If you do, you get an
	error that it is for the Alpha.

>How-To-Repeat:

	Select the CDROM fixit option after booting from a CDROM
	and install the 2nd CDROM as prompted.

>Fix:
	
--- release/sysinstall/menus.c.orig	Tue Aug 31 22:28:24 1999
+++ release/sysinstall/menus.c	Tue Aug 31 22:34:38 1999
@@ -1576,8 +1576,9 @@
     DMENU_NORMAL_TYPE,
     "Please choose a fixit option",
     "There are three ways of going into \"fixit\" mode:\n"
-    "- you can use the 2nd FreeBSD CDROM, in which case there will be\n"
-    "  full access to the complete set of FreeBSD commands and utilities,\n"
+    "- you can use the 1st FreeBSD CDROM (x86) or 2nd FreeBSD CDROM (alpha)\n"
+    "  in which case there will be full access to the complete set of\n"
+    "  FreeBSD commands and utilities,\n"
     "- you can use the more limited (but perhaps customized) fixit floppy,\n"
     "- or you can start an Emergency Holographic Shell now, which is\n"
     "  limited to the subset of commands that is already available right now.",

>Release-Note:
>Audit-Trail:

From: "Stephen J. Roznowski" <sjr@home.net>
To: FreeBSD-gnats-submit@FreeBSD.ORG
Cc:  
Subject: Re: misc/13508: Wrong fixit CDROM in sysinstall
Date: Tue, 31 Aug 1999 23:05:43 -0400 (EDT)

 Sorry, first patch was slightly incomplete... Try this one.
 
 
 --- release/sysinstall/menus.c.orig	Tue Aug 31 23:02:53 1999 +++
 release/sysinstall/menus.c	Tue Aug 31 23:03:30 1999 @@ -1576,14
 +1576,15 @@ DMENU_NORMAL_TYPE, "Please choose a fixit option", "There
      are three ways of going into \"fixit\" mode:\n" -    "- you can use
 the 2nd FreeBSD CDROM, in which case there will be\n" -    "  full
 access to the complete set of FreeBSD commands and utilities,\n" +    "-
 you can use the 1st FreeBSD CDROM (x86) or 2nd FreeBSD CDROM (alpha)\n"
 +    "  in which case there will be full access to the complete set of\n"
 +    "  FreeBSD commands and utilities,\n"
      "- you can use the more limited (but perhaps customized) fixit floppy,\n"
      "- or you can start an Emergency Holographic Shell now, which is\n"
      "  limited to the subset of commands that is already available right now.",
      "Press F1 for more detailed repair instructions",
      "fixit",
 -{ { "1 CDROM",	"Use the 2nd \"live\" CDROM from the distribution",	NULL, installFixitCDROM },
 +{ { "1 CDROM",	"Use the 1st/2nd \"live\" CDROM from the distribution",	NULL, installFixitCDROM },
    { "2 Floppy",	"Use a floppy generated from the fixit image",		NULL, installFixitFloppy },
    { "3 Shell",	"Start an Emergency Holographic Shell",			NULL, installFixitHoloShell },
    { NULL } },
 
 
 
Responsible-Changed-From-To: freebsd-bugs->jkh 
Responsible-Changed-By: sheldonh 
Responsible-Changed-When: Wed Sep 1 01:30:40 PDT 1999 
Responsible-Changed-Why:  
Jordan might be interested in this one for 3.3-RELEASE. 
State-Changed-From-To: open->closed 
State-Changed-By: jkh 
State-Changed-When: Wed Sep 1 01:59:07 PDT 1999 
State-Changed-Why:  
This doesn't require a patch, it simply requires a different cdrom.inf 
file for CD #2, this being an error I made on that specific release. 
It won't reoccur on subsequent releases. 
>Unformatted:
