196c196
<     { N_("Select installation path"),	-1,		STEP_UPG_SCSI,
---
>     { N_("Select installation path"),	-1,		STEP_CLASS,
198c198,200
<     { N_("Setup SCSI"), 		STEP_PATH, 	STEP_UPG_PKGS,
---
>     { N_("Select installation class"),	STEP_PATH + 1,	STEP_UPG_SCSI + 1,
> 	selectInstallClass, 0, 0, 0 },
>     { N_("Setup SCSI"), 		STEP_CLASS, 	STEP_UPG_PKGS + 1,
200c202
<     { N_("Find installation files"),	STEP_PATH,	STEP_UPG_MTAB,
---
>     { N_("Find installation files"),	STEP_SCSI + 1,	STEP_UPG_MTAB + 1,
202c204
<     { N_("Find current installation"),	STEP_UPG_PKGS,	STEP_UPG_FFILES,
---
>     { N_("Find current installation"),	STEP_UPG_PKGS + 1,STEP_UPG_FFILES + 1,
204c206
<     { N_("Choose packages to upgrade"),	STEP_UPG_FFILES,STEP_UPG_DOIT,
---
>     { N_("Choose packages to upgrade"),	STEP_UPG_FFILES + 1,STEP_UPG_DOIT + 1,
206c208
<     { N_("Upgrade system"),		STEP_UPG_FFILES,STEP_UPG_BOOTDISK,
---
>     { N_("Upgrade system"),		STEP_UPG_FFILES + 1,STEP_UPG_BOOTDISK + 1,
208c210
<     { N_("Create bootdisk"),		-1,		STEP_UPG_LILO,
---
>     { N_("Create bootdisk"),		-1,		STEP_UPG_LILO + 1,
321c323,329
< 	return kickstartPartitioning(&state->table, &state->fstab, drives);
---
> 	rc = kickstartPartitioning(&state->table, &state->fstab, drives);
> logMessage("\nrc:%i\n",rc);	
>         if (rc == INST_OKAY)
>             return rc;
> /* cjs	return kickstartPartitioning(&state->table, &state->fstab, drives);
>  cjs */
> 
429c437
< 
---
> logMessage("\ngot to setupswap, hints.flag is %i\n",state->hints.flags & HINT_AUTOSWAP);
834c842,847
< 	} else {
---
> 	    return 0;
> 	} else if (!ksGetCommand(KS_CMD_INSTALL, NULL, NULL, NULL)){ 
> 	    state->steps = installSteps;
> 	    return 0;
>         }
> /* cjs
836,837d848
< 	}
< 
838a850,851
> moved this return up to true part of if so that we fall thru on else
> cjs */
855,856c868,869
<     int rc, i;
<     static int choice = 2;
---
>     int rc,rc2, i;
>     static int choice = 0;
858,859d870
< 	N_("Workstation"),
< 	N_("Server"),
860a872,886
> 	N_("FermiStandAlone"),
> 	N_("CDF"),
> 	N_("CDFonline"),
> 	N_("D0"),
> 	N_("ODS"),
> 	N_("OSS"),
> 	N_("Theory"),
> 	N_("Astro"),
> 	N_("SDSS"),
> 	N_("Farms"),
> 	N_("RIP"),
> 	N_("FOCUS"),
> 	N_("PAT"),
> 	N_("ConsoleServer"),
> 	N_("testing"),
864c890,892
<     if (expert || kickstart) {
---
>     rc2 =  (!ksGetCommand(KS_CMD_KICKSTARTMODE, NULL, NULL, NULL)); 
> logMessage("Return code from ksGetCommand is %i",rc2);
>     if (expert || rc2 ) {
873,875c901,902
< 			_("What type of machine are you installing? For "
< 			  "maximum flexibility, choose \"Custom\"."), 30,
< 			10, 0, 5, transChoices, &choice, _("Ok"), _("Back"), 
---
> 			_("What WORKGROUP are you installing?  "), 30,
> 			10, 0, 8, transChoices, &choice, _("Ok"), _("Back"), 
878d904
< 
880c906,910
<     if (choice == 2) return 0;
---
> /* cjs   added following line to decrease questions
> cjs */
>     state->hints.flags = HINT_AUTOSWAP | HINT_SKIPPRINTER;
>     if (choice == 0) return INST_OKAY;
> /* cjs    if (choice == 2) return 0;
883c913,919
<     state->hints.flags = HINT_SKIPNTSYSV | HINT_AUTOFORMAT | 
---
> cjs */
>     
> /*  cjs
> added if so that can do real kickstart
> cjs */
>     if (!ksGetCommand(KS_CMD_KICKSTARTMODE, NULL, NULL, NULL)) {
>         state->hints.flags = HINT_SKIPNTSYSV | HINT_AUTOFORMAT | 
885a922,923
> 	state->hints.flags = HINT_AUTOSCSI;
>     }
886a925
> /* cjs
888d926
< 	/* server */
892d929
< 	/* workstation */
900c937
< 
---
> cjs */ 
960a998,1001
> 
> psSelectPackages(&state->ps, &state->cs, state->hints.component,
>                             0, 0);
> 
970c1011
<     return psSelectPackages(&state->ps, &state->cs, NULL, 0, 1);
---
>     return psSelectPackages(&state->ps, &state->cs, NULL , 0, 1);
1466a1508
> /* cjs
1467a1510,1514
> cjs */
> /*  cjs
> change if so that can do real kickstart
> cjs */
>     if (!ksGetCommand(KS_CMD_KICKSTARTMODE, NULL, NULL, NULL)) {
1488c1535,1536
<     if (kickstart)
---
>     if (kickstart) {
> 	winStatus(40, 4, _("Post Install"), _("Running Post Install Scripts..  This may take awhile."));
1490c1538,1539
< 
---
> 	winStatus(40, 4, _("Post done"), _("Post Install Done"));
>     }
1494c1543
< 	  "Remove the floppy from the drive and "
---
> 	  "Remove the floppy or cdrom from the drive and "
1500d1548
<