diff options
| author |   natano <natano@openbsd.org> | 2016-10-26 15:22:40 +0000 |
|---|---|---|
| committer | natano <natano@openbsd.org> | 2016-10-26 15:22:40 +0000 |
| commit | 4f3c7809d4013a2eb3e75fc5e7bd2d8ae1f41843 (patch) | |
| tree | 5756f5e173738b8644a509d11d6e7c285297bec4 /usr.sbin/makefs | |
| parent | Add the omit-trailing-period cd9660 option to the manual. (diff) | |
| download | wireguard-openbsd-4f3c7809d4013a2eb3e75fc5e7bd2d8ae1f41843.tar.xz wireguard-openbsd-4f3c7809d4013a2eb3e75fc5e7bd2d8ae1f41843.zip | |
mac68k is discontinued
Diffstat (limited to 'usr.sbin/makefs')
| -rw-r--r-- | usr.sbin/makefs/cd9660/cd9660_eltorito.c | 7 | ||||
| -rw-r--r-- | usr.sbin/makefs/makefs.8 | 3 |
2 files changed, 4 insertions, 6 deletions
diff --git a/usr.sbin/makefs/cd9660/cd9660_eltorito.c b/usr.sbin/makefs/cd9660/cd9660_eltorito.c index e4dc9e0a1be..baa00773d56 100644 --- a/usr.sbin/makefs/cd9660/cd9660_eltorito.c +++ b/usr.sbin/makefs/cd9660/cd9660_eltorito.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd9660_eltorito.c,v 1.6 2016/10/26 14:14:17 natano Exp $ */ +/* $OpenBSD: cd9660_eltorito.c,v 1.7 2016/10/26 15:22:40 natano Exp $ */ /* $NetBSD: cd9660_eltorito.c,v 1.20 2013/01/28 21:03:28 christos Exp $ */ /* @@ -102,12 +102,11 @@ cd9660_add_boot_disk(iso9660_disk *diskStructure, const char *boot_info) new_image->system = ET_SYS_X86; else if (strcmp(sysname, "powerpc") == 0) new_image->system = ET_SYS_PPC; - else if (strcmp(sysname, "macppc") == 0 || - strcmp(sysname, "mac68k") == 0) + else if (strcmp(sysname, "macppc") == 0) new_image->system = ET_SYS_MAC; else { warnx("boot disk system must be " - "i386, powerpc, macppc, or mac68k"); + "i386, macppc, or powerpc"); free(temp); free(new_image); return 0; diff --git a/usr.sbin/makefs/makefs.8 b/usr.sbin/makefs/makefs.8 index 2d1db5a8caf..6fb69a4222f 100644 --- a/usr.sbin/makefs/makefs.8 +++ b/usr.sbin/makefs/makefs.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: makefs.8,v 1.14 2016/10/26 14:17:42 natano Exp $ +.\" $OpenBSD: makefs.8,v 1.15 2016/10/26 15:22:40 natano Exp $ .\" $NetBSD: makefs.8,v 1.55 2015/11/25 16:32:00 wiz Exp $ .\" .\" Copyright (c) 2001-2003 Wasabi Systems, Inc. @@ -203,7 +203,6 @@ where .Dq sysid is one of .Ql i386 , -.Ql mac68k , .Ql macppc , or .Ql powerpc . |