343c343
< 
---
> logMessage("we are in getStaticIPInfo");
601c601
< 		    newtWinMessage(_("kickstart"), _("Ok"), 
---
> /* cjs		    newtWinMessage(_("kickstart"), _("Ok"), 
602a603,604
> cjs */
> 		
611c613
< 	    newtWinMessage(_("kickstart"),  _("Ok"),
---
> /* cjs    newtWinMessage(_("kickstart"),  _("Ok"),
614a617
> cjs */
632c635
< 		newtWinMessage(_("Error"), _("Ok"), _("kickstart network "
---
> /* cjs		newtWinMessage(_("Error"), _("Ok"), _("kickstart network "
633a637
> cjs */
642c646,648
< 	    stage = 2;		/* do bootp/dhcp */
---
> /* cjs insert test for cdrom vs. network here; cdrom needs to be stage 0 */
> /*	    stage = 2;*/		/* do bootp/dhcp */
> 	    stage = 0;		/* do whole job */
651c657
<     while (stage < 3) {
---
>     while (stage < 3)  {
686a693
> logMessage("we are in setupNetworkInterface at stage 2,bootproto is %i",intf->bootProto);
689a697
> logMessage("in BOOTPROTO_DHCP");
718a727
> logMessage("Calling getStaticIPInfo now");
1388a1398,1400
> /*cjs added this test
> cjs */
> 	if (ksHasCommand(KS_CMD_NETWORK)) {
1391,1392c1403,1409
< 	*choice = CHECKNET_KEEP;
< 	return 0;
---
> logMessage("we made it to ksHasCommand cmd network");
> 	  *choice = CHECKNET_KEEP;
> 	  return 0;
>         }
> 	else {
> logMessage("We did not have a network entry");
>         }
1437,1440c1454,1460
< 	    if (!ksHasCommand(KS_CMD_NETWORK))
< 		return INST_OKAY;
< 
< 	    return doBringUpNetworking(intf, netc, intfFinal, netcFinal, 
---
> 	    if (!ksHasCommand(KS_CMD_NETWORK)) {
> /* cjs		return INST_OKAY;
> cjs */
> logMessage("testing for ks cmd network");
>             }
> 	    else
> 		return doBringUpNetworking(intf, netc, intfFinal, netcFinal, 
1448a1469
> logMessage("We are in stage %i",stage);