[Midnightbsd-cvs] src: usr.sbin/sysinstall: remove ppc

[laffer1 at midnightbsd.org]

Log Message:
-----------
remove ppc

Modified Files:
--------------
    src/usr.sbin/sysinstall:
        config.c (r1.8 -> r1.9)
        install.c (r1.3 -> r1.4)
        label.c (r1.5 -> r1.6)

-------------- next part --------------
Index: config.c
===================================================================
RCS file: /home/cvs/src/usr.sbin/sysinstall/config.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -L usr.sbin/sysinstall/config.c -L usr.sbin/sysinstall/config.c -u -r1.8 -r1.9
--- usr.sbin/sysinstall/config.c
+++ usr.sbin/sysinstall/config.c
@@ -208,11 +208,7 @@
 	if (!disk->chunks)
 	    msgFatal("No chunk list found for %s!", disk->name);
 	for (c1 = disk->chunks->part; c1; c1 = c1->next) {
-#ifdef __powerpc__
-	    if (c1->type == apple) {
-#else
 	    if (c1->type == freebsd) {
-#endif
 		for (c2 = c1->part; c2; c2 = c2->next) {
 		    if (c2->type == part && (c2->subtype == FS_SWAP || c2->private_data))
 			chunk_list[nchunks++] = c2;
Index: label.c
===================================================================
RCS file: /home/cvs/src/usr.sbin/sysinstall/label.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -L usr.sbin/sysinstall/label.c -L usr.sbin/sysinstall/label.c -u -r1.5 -r1.6
--- usr.sbin/sysinstall/label.c
+++ usr.sbin/sysinstall/label.c
@@ -292,13 +292,6 @@
 		label_chunk_info[j].c = c1;
 		++j;
 	    }
-#ifdef __powerpc__
-	    if (c1->type == apple) {
-    	        label_chunk_info[j].type = PART_SLICE;
-		label_chunk_info[j].c = c1;
-		++j;
-	    }
-#endif
 	}
     }
 
@@ -341,20 +334,6 @@
 		++j;
 	    }
 #endif
-#ifdef __powerpc__
-	    else if (c1->type == apple) {
-	        for (c2 = c1->part; c2; c2 = c2->next) {
-		    if (c2->type == part) {
-		        if (c2->subtype == FS_SWAP)
-			    label_chunk_info[j].type = PART_SWAP;
-			else
-			    label_chunk_info[j].type = PART_FILESYSTEM;
-			label_chunk_info[j].c = c2;
-			++j;
-		    }
-		}
-	    }
-#endif
 	}
     }
     label_chunk_info[j].c = NULL;
@@ -1008,12 +987,6 @@
 		char osize[80];
 		u_long flags = 0;
 
-#ifdef __powerpc__
-		/* Always use the maximum size for apple partitions */
-		if (label_chunk_info[here].c->type == apple)
-		    size = sz;
-		else {
-#endif
 		sprintf(osize, "%jd", (intmax_t)sz);
 		val = msgGetInput(osize,
 				  "Please specify the partition size in blocks or append a trailing G for\n"
@@ -1044,9 +1017,6 @@
 		    clear_wins();
 		    break;
 		}
-#ifdef __powerpc__
-		}
-#endif
 		type = get_partition_type();
 		if (type == PART_NONE) {
 		    clear_wins();
Index: install.c
===================================================================
RCS file: /home/cvs/src/usr.sbin/sysinstall/install.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -L usr.sbin/sysinstall/install.c -L usr.sbin/sysinstall/install.c -u -r1.3 -r1.4
--- usr.sbin/sysinstall/install.c
+++ usr.sbin/sysinstall/install.c
@@ -107,13 +107,8 @@
 	for (c1 = disk->chunks->part; c1; c1 = c1->next) {
 #ifdef __ia64__
 	    c2 = c1;
-#elif defined(__powerpc__)
-	    if (c1->type == apple) {
-		for (c2 = c1->part; c2; c2 = c2->next) {
-#else
 	    if (c1->type == freebsd) {
 		for (c2 = c1->part; c2; c2 = c2->next) {
-#endif
 
 		    pi = (PartInfo *)c2->private_data;
 		    if (c2->type == part && c2->subtype != FS_SWAP && pi != NULL) {
@@ -200,13 +195,8 @@
 
 #ifdef __ia64__
 	    c2 = c1;
-#elif defined(__powerpc__)
-	    if (c1->type == apple) {
-		for (c2 = c1->part; c2; c2 = c2->next) {
-#else
 	    if (c1->type == freebsd) {
 		for (c2 = c1->part; c2; c2 = c2->next) {
-#endif
 		    if (c2->type == part && c2->subtype == FS_SWAP && !SwapChunk) {
 			SwapChunk = c2;
 			if (isDebug())
@@ -1066,13 +1056,8 @@
 	if (c1->type == part) {
 		c2 = c1;
 		{
-#elif defined(__powerpc__)
-	    if (c1->type == apple) {
-		for (c2 = c1->part; c2; c2 = c2->next) {
-#else
 	    if (c1->type == freebsd) {
 		for (c2 = c1->part; c2; c2 = c2->next) {
-#endif
 		    if (c2->type == part && c2->subtype != FS_SWAP && c2->private_data) {
 			PartInfo *tmp = (PartInfo *)c2->private_data;