Attachment 5175 Details for Bug 12564 – file.diff

[patch] file.diff

file.diff (text/plain), 1.95 KB, created by Murray Stokely on 1999-07-08 19:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Murray Stokely

Created: 1999-07-08 19:40:01 UTC

Size: 1.95 KB

patch

obsolete

>diff -c -r sysinstall.old/cdrom.c sysinstall/cdrom.c
>*** sysinstall.old/cdrom.c	Thu May 20 08:57:41 1999
>--- sysinstall/cdrom.c	Thu Jul  8 10:59:35 1999
>***************
>*** 142,148 ****
>  		else
>  		    bogusCDOK = TRUE;
>  	    }
>! 	    if ((cp = property_find(cd_attr, "CD_MACHINE_ARCH")) != NULL) {
>  #ifdef __alpha__
>  		if (strcmp(cp, "alpha")) {
>  #else
>--- 142,149 ----
>  		else
>  		    bogusCDOK = TRUE;
>  	    }
>! 	    if (((cp = property_find(cd_attr, "CD_MACHINE_ARCH")) != NULL) &&
>! 		(!dev->flags & IGNOREARCH)) {
>  #ifdef __alpha__
>  		if (strcmp(cp, "alpha")) {
>  #else
>diff -c -r sysinstall.old/install.c sysinstall/install.c
>*** sysinstall.old/install.c	Wed Jul  7 04:26:44 1999
>--- sysinstall/install.c	Thu Jul  8 11:11:38 1999
>***************
>*** 257,263 ****
>      variable_set2(SYSTEM_STATE, "fixit", 0);
>      (void)unlink("/mnt2");
>      (void)rmdir("/mnt2");
>! 
>      while (1) {
>  	msgConfirm("Please insert a FreeBSD live filesystem CDROM and press return");
>  	if (DITEM_STATUS(mediaSetCDROM(NULL)) != DITEM_SUCCESS || !mediaDevice || !mediaDevice->init(mediaDevice)) {
>--- 257,264 ----
>      variable_set2(SYSTEM_STATE, "fixit", 0);
>      (void)unlink("/mnt2");
>      (void)rmdir("/mnt2");
>!     mediaDevice->flags |= IGNOREARCH; /* Set a flag to ignore the  */
>! 				      /* architecture of the CDROM */
>      while (1) {
>  	msgConfirm("Please insert a FreeBSD live filesystem CDROM and press return");
>  	if (DITEM_STATUS(mediaSetCDROM(NULL)) != DITEM_SUCCESS || !mediaDevice || !mediaDevice->init(mediaDevice)) {
>diff -c -r sysinstall.old/sysinstall.h sysinstall/sysinstall.h
>*** sysinstall.old/sysinstall.h	Wed Jul  7 04:26:45 1999
>--- sysinstall/sysinstall.h	Thu Jul  8 10:59:09 1999
>***************
>*** 238,243 ****
>--- 238,246 ----
>  #define CD_ALREADY_MOUNTED	1
>  #define CD_WE_MOUNTED_IT	2
>  
>+ /* DEVICE Flags */
>+ #define IGNOREARCH              1
>+ 
>  /* A "device" from sysinstall's point of view */
>  typedef struct _device {
>      char name[DEV_NAME_MAX];

Actions: View | Diff

Attachments on bug 12564: 5175