diff options
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/errcode/README | 10 | ||||
-rwxr-xr-x | contrib/errcode/build_errcodedb.py | 2 | ||||
-rw-r--r-- | contrib/errcode/errcode.php | 6 | ||||
-rw-r--r-- | contrib/errcode/errcodedb.py | 3 | ||||
-rw-r--r-- | contrib/errcode/errcodedb.pyc | bin | 0 -> 11660 bytes | |||
-rwxr-xr-x | contrib/errcode/gpxebot.py | 8 | ||||
-rw-r--r-- | contrib/rom-o-matic/README | 22 | ||||
-rw-r--r-- | contrib/rom-o-matic/bottom.php | 8 | ||||
-rw-r--r-- | contrib/rom-o-matic/build.php | 12 | ||||
-rw-r--r-- | contrib/rom-o-matic/directions.php | 2 | ||||
-rw-r--r-- | contrib/rom-o-matic/doc/IMAGE_SCRIPT.html | 2 | ||||
-rw-r--r-- | contrib/rom-o-matic/flag-table.php | 2 | ||||
-rw-r--r-- | contrib/rom-o-matic/globals.php | 12 | ||||
-rw-r--r-- | contrib/rom-o-matic/top.php | 2 | ||||
-rw-r--r-- | contrib/rom-o-matic/utils.php | 18 |
15 files changed, 56 insertions, 53 deletions
diff --git a/contrib/errcode/README b/contrib/errcode/README index b2963c06..eb66d069 100644 --- a/contrib/errcode/README +++ b/contrib/errcode/README @@ -1,6 +1,6 @@ -Error Code Lookup for gPXE +Error Code Lookup for iPXE ========================== -This program looks up gPXE error codes so you can locate the line of source +This program looks up iPXE error codes so you can locate the line of source code which produced the error. Setup @@ -8,11 +8,11 @@ Setup You must run: ./build_errcodedb.py >errcodedb.py -This extracts error code definitions from the gPXE source code and produces a +This extracts error code definitions from the iPXE source code and produces a "database" which is used by the main program. Once you have done this errcode.py and errcodedb.py are the only files you -need. They are now independent of the gPXE source code and can be moved +need. They are now independent of the iPXE source code and can be moved anywhere. [OPTIONAL] @@ -21,7 +21,7 @@ $ERRCODE_PATH to the errcode.py script. Then move errcode.php to a location visible from your web server. [OPTIONAL] -A simple IRC bot is provided. Edit gpxebot.py to fill in the IRC details. +A simple IRC bot is provided. Edit ipxebot.py to fill in the IRC details. Usage ----- diff --git a/contrib/errcode/build_errcodedb.py b/contrib/errcode/build_errcodedb.py index 1be9d853..99072922 100755 --- a/contrib/errcode/build_errcodedb.py +++ b/contrib/errcode/build_errcodedb.py @@ -18,7 +18,7 @@ import sys import re pxenv_status_files = ('../../src/include/errno.h', ) -errfile_files = ('../../src/include/gpxe/errfile.h', +errfile_files = ('../../src/include/ipxe/errfile.h', '../../src/arch/i386/include/bits/errfile.h') posix_errno_files = ('../../src/include/errno.h', ) diff --git a/contrib/errcode/errcode.php b/contrib/errcode/errcode.php index 87114495..f4774f03 100644 --- a/contrib/errcode/errcode.php +++ b/contrib/errcode/errcode.php @@ -23,7 +23,7 @@ $ERRCODE_PATH = './errcode.py'; <html> <head> - <title>gPXE Error Code Lookup</title> + <title>iPXE Error Code Lookup</title> <style> body, pre, div, form, p, h2, b, tt { padding: 0; @@ -73,10 +73,10 @@ if (!empty($_REQUEST['e']) && preg_match('/^(0x)?[0-9a-f]{8}$/', $_REQUEST['e']) <p> Firefox users can right-click on the <b>Error code</b> text box and select <b>Add a Keyword for this Search...</b>. - Set <b>name</b> to <tt>gPXE Error Code Lookup</tt> and + Set <b>name</b> to <tt>iPXE Error Code Lookup</tt> and <b>keyword</b> to <tt>gxpe</tt> Then you can look up error codes by typing something like the following in your address - bar: <tt>gpxe 0x3c018003</tt> + bar: <tt>ipxe 0x3c018003</tt> <p> </div> </body> diff --git a/contrib/errcode/errcodedb.py b/contrib/errcode/errcodedb.py new file mode 100644 index 00000000..357a8e24 --- /dev/null +++ b/contrib/errcode/errcodedb.py @@ -0,0 +1,3 @@ +pxenv_status = {0: 'PXENV_STATUS_SUCCESS', 1: 'PXENV_STATUS_FAILURE', 2: 'PXENV_STATUS_BAD_FUNC', 3: 'PXENV_STATUS_UNSUPPORTED', 4: 'PXENV_STATUS_KEEP_UNDI', 5: 'PXENV_STATUS_KEEP_ALL', 6: 'PXENV_STATUS_OUT_OF_RESOURCES', 17: 'PXENV_STATUS_ARP_TIMEOUT', 107: 'PXENV_STATUS_UNDI_TRANSMIT_ERROR', 24: 'PXENV_STATUS_UDP_CLOSED', 25: 'PXENV_STATUS_UDP_OPEN', 26: 'PXENV_STATUS_TFTP_CLOSED', 27: 'PXENV_STATUS_TFTP_OPEN', 160: 'PXENV_STATUS_BINL_CANCELED_BY_KEYSTROKE', 161: 'PXENV_STATUS_BINL_NO_PXE_SERVER', 162: 'PXENV_STATUS_NOT_AVAILABLE_IN_PMODE', 163: 'PXENV_STATUS_NOT_AVAILABLE_IN_RMODE', 36: 'PXENV_STATUS_BIS_SHUTDOWN_FAILURE', 37: 'PXENV_STATUS_BIS_GBOA_FAILURE', 38: 'PXENV_STATUS_BIS_FREE_FAILURE', 48: 'PXENV_STATUS_TFTP_CANNOT_ARP_ADDRESS', 40: 'PXENV_STATUS_BIS_BAD_CKSUM', 176: 'PXENV_STATUS_BUSD_DEVICE_NOT_SUPPORTED', 50: 'PXENV_STATUS_TFTP_OPEN_TIMEOUT', 51: 'PXENV_STATUS_TFTP_UNKNOWN_OPCODE', 53: 'PXENV_STATUS_TFTP_READ_TIMEOUT', 54: 'PXENV_STATUS_TFTP_ERROR_OPCODE', 56: 'PXENV_STATUS_TFTP_CANNOT_OPEN_CONNECTION', 57: 'PXENV_STATUS_TFTP_CANNOT_READ_FROM_CONNECTION', 58: 'PXENV_STATUS_TFTP_TOO_MANY_PACKAGES', 59: 'PXENV_STATUS_TFTP_FILE_NOT_FOUND', 35: 'PXENV_STATUS_BIS_INIT_FAILURE', 61: 'PXENV_STATUS_TFTP_NO_MCAST_ADDRESS', 62: 'PXENV_STATUS_TFTP_NO_FILESIZE', 63: 'PXENV_STATUS_TFTP_INVALID_PACKET_SIZE', 192: 'PXENV_STATUS_LOADER_NO_FREE_BASE_MEMORY', 193: 'PXENV_STATUS_LOADER_NO_BC_ROMID', 194: 'PXENV_STATUS_LOADER_BAD_BC_ROMID', 195: 'PXENV_STATUS_LOADER_BAD_BC_RUNTIME_IMAGE', 196: 'PXENV_STATUS_LOADER_NO_UNDI_ROMID', 197: 'PXENV_STATUS_LOADER_BAD_UNDI_ROMID', 198: 'PXENV_STATUS_LOADER_BAD_UNDI_DRIVER_IMAGE', 32: 'PXENV_STATUS_MCOPY_PROBLEM', 200: 'PXENV_STATUS_LOADER_NO_PXE_STRUCT', 201: 'PXENV_STATUS_LOADER_NO_PXENV_STRUCT', 202: 'PXENV_STATUS_LOADER_UNDI_START', 203: 'PXENV_STATUS_LOADER_BC_START', 34: 'PXENV_STATUS_BIS_VALIDATE_FAILURE', 81: 'PXENV_STATUS_DHCP_TIMEOUT', 82: 'PXENV_STATUS_DHCP_NO_IP_ADDRESS', 83: 'PXENV_STATUS_DHCP_NO_BOOTFILE_NAME', 84: 'PXENV_STATUS_DHCP_BAD_IP_ADDRESS', 105: 'PXENV_STATUS_UNDI_ERROR_SETTING_ISR', 96: 'PXENV_STATUS_UNDI_INVALID_FUNCTION', 97: 'PXENV_STATUS_UNDI_MEDIATEST_FAILED', 98: 'PXENV_STATUS_UNDI_CANNOT_INIT_NIC_FOR_MCAST', 99: 'PXENV_STATUS_UNDI_CANNOT_INITIALIZE_NIC', 100: 'PXENV_STATUS_UNDI_CANNOT_INITIALIZE_PHY', 101: 'PXENV_STATUS_UNDI_CANNOT_READ_CONFIG_DATA', 102: 'PXENV_STATUS_UNDI_CANNOT_READ_INIT_DATA', 103: 'PXENV_STATUS_UNDI_BAD_MAC_ADDRESS', 104: 'PXENV_STATUS_UNDI_BAD_EEPROM_CHECKSUM', 60: 'PXENV_STATUS_TFTP_ACCESS_VIOLATION', 106: 'PXENV_STATUS_UNDI_INVALID_STATE', 39: 'PXENV_STATUS_BIS_GSI_FAILURE', 108: 'PXENV_STATUS_UNDI_INVALID_PARAMETER', 116: 'PXENV_STATUS_BSTRAP_PROMPT_MENU', 118: 'PXENV_STATUS_BSTRAP_MCAST_ADDR', 119: 'PXENV_STATUS_BSTRAP_MISSING_LIST', 120: 'PXENV_STATUS_BSTRAP_NO_RESPONSE', 121: 'PXENV_STATUS_BSTRAP_FILE_TOO_BIG', 33: 'PXENV_STATUS_BIS_INTEGRITY_FAILURE'} +errfile = {1024: 'ERRFILE_ARCH', 1: 'ERRFILE_CORE', 1026: 'ERRFILE_timer_rdtsc', 3: 'ERRFILE_NET', 4: 'ERRFILE_IMAGE', 1025: 'ERRFILE_memtop_umalloc', 9: 'ERRFILE_downloader', 1034: 'ERRFILE_timer_bios', 11: 'ERRFILE_arp', 12: 'ERRFILE_elf', 2: 'ERRFILE_eisa', 15: 'ERRFILE_chap', 1041: 'ERRFILE_pnpbios', 18: 'ERRFILE_isapnp', 1043: 'ERRFILE_undinet', 20: 'ERRFILE_script', 17: 'ERRFILE_exec', 23: 'ERRFILE_aoeboot', 1049: 'ERRFILE_bios_smbios', 538: 'ERRFILE_tulip', 27: 'ERRFILE_ethernet', 28: 'ERRFILE_segment', 410: 'ERRFILE_amd8111e', 31: 'ERRFILE_autoboot', 33: 'ERRFILE_iobuf', 546: 'ERRFILE_via_rhine', 1059: 'ERRFILE_undirom', 36: 'ERRFILE_efi_image', 39: 'ERRFILE_dhcpmgmt', 1065: 'ERRFILE_int13', 554: 'ERRFILE_via_velocity', 43: 'ERRFILE_ipv4', 44: 'ERRFILE_embedded', 47: 'ERRFILE_imgmgmt', 49: 'ERRFILE_linebuf', 562: 'ERRFILE_w89c840', 51: 'ERRFILE_ipv6', 1076: 'ERRFILE_elfboot', 55: 'ERRFILE_pxe_tftp', 57: 'ERRFILE_monojob', 570: 'ERRFILE_ipoib', 59: 'ERRFILE_ndp', 1084: 'ERRFILE_comboot', 522: 'ERRFILE_sundance', 63: 'ERRFILE_pxe_udp', 19: 'ERRFILE_dhcpopts', 65: 'ERRFILE_nvo', 578: 'ERRFILE_e1000', 67: 'ERRFILE_netdevice', 1092: 'ERRFILE_com32', 71: 'ERRFILE_axtls_aes', 1036: 'ERRFILE_bzimage', 586: 'ERRFILE_e1000_hw', 75: 'ERRFILE_nullnet', 1100: 'ERRFILE_comboot_resolv', 906: 'ERRFILE_arbel', 79: 'ERRFILE_cipher', 81: 'ERRFILE_posix_io', 594: 'ERRFILE_mtnic', 83: 'ERRFILE_tcp', 1108: 'ERRFILE_comboot_call', 87: 'ERRFILE_image_cmd', 89: 'ERRFILE_resolv', 602: 'ERRFILE_phantom', 91: 'ERRFILE_ftp', 95: 'ERRFILE_uri_test', 97: 'ERRFILE_settings', 610: 'ERRFILE_ne2k_isa', 99: 'ERRFILE_http', 103: 'ERRFILE_ibft', 105: 'ERRFILE_vsprintf', 618: 'ERRFILE_b44', 107: 'ERRFILE_iscsi', 530: 'ERRFILE_tlan', 111: 'ERRFILE_tls', 113: 'ERRFILE_xfer', 626: 'ERRFILE_rtl818x', 115: 'ERRFILE_tcpip', 119: 'ERRFILE_ifmgmt', 121: 'ERRFILE_bitmap', 634: 'ERRFILE_sky2', 123: 'ERRFILE_udp', 1044: 'ERRFILE_eltorito', 127: 'ERRFILE_iscsiboot', 1027: 'ERRFILE_undi', 642: 'ERRFILE_ath5k', 131: 'ERRFILE_dhcp', 135: 'ERRFILE_efi_pci', 650: 'ERRFILE_atl1e', 139: 'ERRFILE_dns', 143: 'ERRFILE_efi_snp', 146: 'ERRFILE_i2c_bit', 147: 'ERRFILE_tftp', 151: 'ERRFILE_smbios', 154: 'ERRFILE_spi_bit', 155: 'ERRFILE_infiniband', 26: 'ERRFILE_mca', 1028: 'ERRFILE_bootsector', 159: 'ERRFILE_smbios_settings', 674: 'ERRFILE_skge', 1051: 'ERRFILE_undionly', 167: 'ERRFILE_efi_smbios', 1052: 'ERRFILE_multiboot', 171: 'ERRFILE_dhcppkt', 175: 'ERRFILE_pxemenu', 179: 'ERRFILE_slam', 183: 'ERRFILE_x509', 187: 'ERRFILE_ib_sma', 191: 'ERRFILE_login_ui', 195: 'ERRFILE_ib_packet', 211: 'ERRFILE_ib_qset', 1057: 'ERRFILE_biosint', 203: 'ERRFILE_icmp', 34: 'ERRFILE_pci', 207: 'ERRFILE_iwmgmt', 35: 'ERRFILE_icmpv6', 898: 'ERRFILE_scsi', 7: 'ERRFILE_OTHER', 1060: 'ERRFILE_nbi', 219: 'ERRFILE_ib_gma', 227: 'ERRFILE_ib_pathrec', 235: 'ERRFILE_ib_mcast', 243: 'ERRFILE_ib_cm', 25: 'ERRFILE_hw', 41: 'ERRFILE_job', 251: 'ERRFILE_net80211', 258: 'ERRFILE_3c509', 259: 'ERRFILE_ib_mi', 1068: 'ERRFILE_pxe_image', 266: 'ERRFILE_bnx2', 267: 'ERRFILE_ib_cmrc', 130: 'ERRFILE_nvs', 274: 'ERRFILE_cs89x0', 275: 'ERRFILE_ib_srp', 282: 'ERRFILE_eepro', 283: 'ERRFILE_sec80211', 290: 'ERRFILE_etherfabric', 291: 'ERRFILE_wep', 1073: 'ERRFILE_pxeparent', 298: 'ERRFILE_legacy', 299: 'ERRFILE_eapol', 306: 'ERRFILE_natsemi', 10: 'ERRFILE_isa', 307: 'ERRFILE_wpa', 1033: 'ERRFILE_memmap', 658: 'ERRFILE_sis190', 314: 'ERRFILE_pnic', 315: 'ERRFILE_wpa_psk', 138: 'ERRFILE_spi', 322: 'ERRFILE_prism2_pci', 323: 'ERRFILE_wpa_tkip', 330: 'ERRFILE_prism2_plx', 331: 'ERRFILE_wpa_ccmp', 338: 'ERRFILE_rtl8139', 346: 'ERRFILE_smc9000', 199: 'ERRFILE_ib_srpboot', 354: 'ERRFILE_tg3', 362: 'ERRFILE_3c509_eisa', 402: 'ERRFILE_3c90x', 1035: 'ERRFILE_undiload', 370: 'ERRFILE_3c515', 378: 'ERRFILE_3c529', 386: 'ERRFILE_3c595', 394: 'ERRFILE_3c5x9', 914: 'ERRFILE_hermon', 922: 'ERRFILE_linda', 514: 'ERRFILE_sis900', 666: 'ERRFILE_myri10ge', 930: 'ERRFILE_ata', 938: 'ERRFILE_srp', 434: 'ERRFILE_dmfe', 73: 'ERRFILE_open', 450: 'ERRFILE_eepro100', 458: 'ERRFILE_epic100', 418: 'ERRFILE_davicom', 466: 'ERRFILE_forcedeth', 163: 'ERRFILE_netdev_settings', 474: 'ERRFILE_mtd80x', 482: 'ERRFILE_ns83820', 490: 'ERRFILE_ns8390', 498: 'ERRFILE_pcnet32', 506: 'ERRFILE_r8169', 426: 'ERRFILE_depca'} +posix_errno = {0: 'ENOERR', 1: 'E2BIG', 2: 'EACCES', 3: 'EADDRINUSE', 4: 'EADDRNOTAVAIL', 5: 'EAFNOSUPPORT', 6: 'EAGAIN', 7: 'EALREADY', 8: 'EBADF', 9: 'EBADMSG', 10: 'EBUSY', 11: 'ECANCELED', 12: 'ECHILD', 13: 'ECONNABORTED', 14: 'ECONNREFUSED', 15: 'ECONNRESET', 16: 'EDEADLK', 17: 'EDESTADDRREQ', 18: 'EDOM', 19: 'EDQUOT', 20: 'EEXIST', 21: 'EFAULT', 22: 'EFBIG', 23: 'EHOSTUNREACH', 24: 'EIDRM', 25: 'EILSEQ', 26: 'EINPROGRESS', 27: 'EINTR', 28: 'EINVAL', 29: 'EIO', 30: 'EISCONN', 31: 'EISDIR', 32: 'ELOOP', 33: 'EMFILE', 34: 'EMLINK', 35: 'EMSGSIZE', 36: 'EMULTIHOP', 37: 'ENAMETOOLONG', 38: 'ENETDOWN', 39: 'ENETRESET', 40: 'ENETUNREACH', 41: 'ENFILE', 42: 'ENOBUFS', 43: 'ENODATA', 44: 'ENODEV', 45: 'ENOENT', 46: 'ENOEXEC', 47: 'ENOLCK', 48: 'ENOLINK', 49: 'ENOMEM', 50: 'ENOMSG', 51: 'ENOPROTOOPT', 52: 'ENOSPC', 53: 'ENOSR', 54: 'ENOSTR', 55: 'ENOSYS', 56: 'ENOTCONN', 57: 'ENOTDIR', 58: 'ENOTEMPTY', 59: 'ENOTSOCK', 60: 'ENOTSUP', 61: 'ENOTTY', 62: 'ENXIO', 63: 'EOPNOTSUPP', 64: 'EOVERFLOW', 65: 'EPERM', 66: 'EPIPE', 67: 'EPROTO', 68: 'EPROTONOSUPPORT', 69: 'EPROTOTYPE', 70: 'ERANGE', 71: 'EROFS', 72: 'ESPIPE', 73: 'ESRCH', 74: 'ESTALE', 75: 'ETIME', 76: 'ETIMEDOUT', 77: 'ETXTBSY', 78: 'EWOULDBLOCK', 79: 'EXDEV'} diff --git a/contrib/errcode/errcodedb.pyc b/contrib/errcode/errcodedb.pyc Binary files differnew file mode 100644 index 00000000..e59c459c --- /dev/null +++ b/contrib/errcode/errcodedb.pyc diff --git a/contrib/errcode/gpxebot.py b/contrib/errcode/gpxebot.py index f975942f..4db4033c 100755 --- a/contrib/errcode/gpxebot.py +++ b/contrib/errcode/gpxebot.py @@ -20,11 +20,11 @@ import errcode HOST = 'irc.freenode.net' PORT = 6667 -NICK = 'gpxebot' +NICK = 'ipxebot' CHAN = '#etherboot' NICKSERV_PASSWORD = None -IDENT = 'gpxebot' -REALNAME = 'gPXE bot' +IDENT = 'ipxebot' +REALNAME = 'iPXE bot' ERRCODE_RE = re.compile(r'(errcode|Error)\s+((0x)?[0-9a-fA-F]{8})') @@ -59,7 +59,7 @@ def privmsg(_, target, msg): except ValueError: pass if msg.find('help') > -1: - pmsg(replyto, 'I look up gPXE error codes. Message me like this:') + pmsg(replyto, 'I look up iPXE error codes. Message me like this:') pmsg(replyto, 'errcode 0x12345678 OR Error 0x12345678') def add_handler(command, handler, nargs): diff --git a/contrib/rom-o-matic/README b/contrib/rom-o-matic/README index 1e9abbce..b68cf775 100644 --- a/contrib/rom-o-matic/README +++ b/contrib/rom-o-matic/README @@ -1,30 +1,30 @@ -ROM-o-matic web interface for building gPXE ROMs +ROM-o-matic web interface for building iPXE ROMs ------------------------------------------------ -This web application generates gPXE images and sends them to a web +This web application generates iPXE images and sends them to a web browser. -Available as part of the gPXE source code distribution, which can be +Available as part of the iPXE source code distribution, which can be downlaoded from http://etherboot.org/ Author: Marty Connor <mdc@etherboot.org> License: GPLv2 -Support: http://etherboot.org/mailman/listinfo/gpxe - Please send support questions to the gPXE mailing list +Support: http://etherboot.org/mailman/listinfo/ipxe + Please send support questions to the iPXE mailing list System Requirements ------------------- - Apache web server - PHP 4+ -- Tools required to build gPXE installed on the server +- Tools required to build iPXE installed on the server - gcc, mtools, syslinux, perl, etc. Setup ----- As distributed, it is expected that the rom-o-matic source code -directory is in the contrib directory of a gPXE source distribution. +directory is in the contrib directory of a iPXE source distribution. -The easiest way to do this is to simply put a gPXE source distribution +The easiest way to do this is to simply put a iPXE source distribution in a web server accessible directory. If this is not the case, you will need to either edit the file @@ -41,11 +41,11 @@ containing the following lines: $src_dir = "../../src"; ?> -Then change the line beginning "$src_dir = " to the path of your gPXE +Then change the line beginning "$src_dir = " to the path of your iPXE source code tree. To make build times shorter, before you run rom-o-matic for the first time -you should cd to the gpxe "src" directory and enter the following +you should cd to the ipxe "src" directory and enter the following commands: $ make @@ -58,5 +58,5 @@ Running rom-o-matic from a web browser -------------------------------------- Enter a URL like: - http://example.com/gpxe-1.x.x/contrib/rom-o-matic + http://example.com/ipxe-1.x.x/contrib/rom-o-matic diff --git a/contrib/rom-o-matic/bottom.php b/contrib/rom-o-matic/bottom.php index bd64d840..ff094fd8 100644 --- a/contrib/rom-o-matic/bottom.php +++ b/contrib/rom-o-matic/bottom.php @@ -26,25 +26,25 @@ Resources: </h4> <ul> <li> - Source code for gPXE images is available at + Source code for iPXE images is available at <a href="http://etherboot.org/wiki/download" target="_blank"> http://etherboot.org/wiki/download</a> <br><br> </li> <li> - For general information about using gPXE, please visit the + For general information about using iPXE, please visit the <a href="http://www.etherboot.org/" target="_blank"> Etherboot Project Home Page</a> <br><br> </li> <li> - For Email-based support for gPXE please join + For Email-based support for iPXE please join <a href="http://etherboot.org/wiki/mailinglists" target="_blank"> Etherboot Project mailing lists.</a> <br><br> </li> <li> - For real-time online gPXE support via IRC please visit the + For real-time online iPXE support via IRC please visit the <a href="irc://irc.freenode.net/%23etherboot"> #etherboot channel of irc.freenode.net</a>. <br><br> diff --git a/contrib/rom-o-matic/build.php b/contrib/rom-o-matic/build.php index 1d9ee303..3101b3e3 100644 --- a/contrib/rom-o-matic/build.php +++ b/contrib/rom-o-matic/build.php @@ -158,19 +158,19 @@ $build_dir = mktempcopy ( "$src_dir", "/tmp", "MDCROM" ); $config_dir = $build_dir . "/config"; // Write config files with supplied flags -write_gpxe_config_files ( $config_dir, $flags ); +write_ipxe_config_files ( $config_dir, $flags ); // Handle a possible embedded script $emb_script_cmd = ""; $embedded_script = isset ( $_POST['embedded_script'] ) ? $_POST['embedded_script'] : ""; if ( $embedded_script != "" ) { - $emb_script_path = "$build_dir" . "/script0.gpxe"; + $emb_script_path = "$build_dir" . "/script0.ipxe"; - if ( substr ( $embedded_script, 0, 5 ) != "#!gpxe" ) { - $embedded_script = "#!gpxe\n" . $embedded_script; + if ( substr ( $embedded_script, 0, 5 ) != "#!ipxe" ) { + $embedded_script = "#!ipxe\n" . $embedded_script; } - // gPXE 0.9.7 doesn't like '\r\n" in the shebang... + // iPXE 0.9.7 doesn't like '\r\n" in the shebang... $embedded_script = str_replace ( "\r\n", "\n", $embedded_script ); write_file_from_string ( $emb_script_path, $embedded_script ); @@ -239,7 +239,7 @@ if ( $status == 0 ) { // Delete build directory as soon as it is not needed rm_build_dir (); - $output_filename = "gpxe-${version}-${nic}.${fmt_extension}"; + $output_filename = "ipxe-${version}-${nic}.${fmt_extension}"; // Try to force IE to handle downloading right. Header ( "Cache-control: private"); diff --git a/contrib/rom-o-matic/directions.php b/contrib/rom-o-matic/directions.php index 3c7015ef..cba5eb44 100644 --- a/contrib/rom-o-matic/directions.php +++ b/contrib/rom-o-matic/directions.php @@ -55,7 +55,7 @@ above.<br><br> </li> <li> - gPXE does not support all possible PCI IDs for supported + iPXE does not support all possible PCI IDs for supported NICs. <br><br> </li> diff --git a/contrib/rom-o-matic/doc/IMAGE_SCRIPT.html b/contrib/rom-o-matic/doc/IMAGE_SCRIPT.html index 1f7bed7d..87416727 100644 --- a/contrib/rom-o-matic/doc/IMAGE_SCRIPT.html +++ b/contrib/rom-o-matic/doc/IMAGE_SCRIPT.html @@ -1 +1 @@ -gPXE script image support +iPXE script image support diff --git a/contrib/rom-o-matic/flag-table.php b/contrib/rom-o-matic/flag-table.php index 82551e42..078e5fd6 100644 --- a/contrib/rom-o-matic/flag-table.php +++ b/contrib/rom-o-matic/flag-table.php @@ -59,7 +59,7 @@ $flag_table = array ( "flag" => "PRODUCT_SHORT_NAME", "hide_from_user" => "yes", "type" => "string", - "value" => "gPXE", + "value" => "iPXE", "cfgsec" => "general" ), diff --git a/contrib/rom-o-matic/globals.php b/contrib/rom-o-matic/globals.php index d4316d03..822e4bc0 100644 --- a/contrib/rom-o-matic/globals.php +++ b/contrib/rom-o-matic/globals.php @@ -19,10 +19,10 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -// Directory containing gPXE source code tree +// Directory containing iPXE source code tree $src_dir = "../../src"; -// Compute gPXE version based on source tree +// Compute iPXE version based on source tree exec ( "make -C '$src_dir' version 2>&1", $make_output, $status ); $version = ( $status == 0 && count ( $make_output ) > 1 ) ? trim ( $make_output[count ( $make_output ) - 2] ) @@ -36,10 +36,10 @@ $top_inc = "top.php"; $bottom_inc = "bottom.php"; // Descriptive strings -$header_title = "ROM-o-matic for gPXE $version"; -$html_tagline = "ROM-o-matic dynamically generates gPXE images"; -$html_title = "ROM-o-matic for gPXE $version"; -$description = "a dynamic gPXE image generator"; +$header_title = "ROM-o-matic for iPXE $version"; +$html_tagline = "ROM-o-matic dynamically generates iPXE images"; +$html_title = "ROM-o-matic for iPXE $version"; +$description = "a dynamic iPXE image generator"; // For emacs: // Local variables: diff --git a/contrib/rom-o-matic/top.php b/contrib/rom-o-matic/top.php index f94c2b3b..25562086 100644 --- a/contrib/rom-o-matic/top.php +++ b/contrib/rom-o-matic/top.php @@ -26,7 +26,7 @@ <html> <head> <link rev="made" href="mailto:<? echo "${webmaster_email}" ?>"> - <meta name="keywords" content="rom, etherboot, gpxe, open source, rom-o-matic.net"> + <meta name="keywords" content="rom, etherboot, ipxe, open source, rom-o-matic.net"> <title><? echo $header_title ?></title> <meta name="description" content="<? echo $description ?>"> </head> diff --git a/contrib/rom-o-matic/utils.php b/contrib/rom-o-matic/utils.php index c5fdc206..dc5bd414 100644 --- a/contrib/rom-o-matic/utils.php +++ b/contrib/rom-o-matic/utils.php @@ -19,7 +19,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -// Include table of user-configurable gPXE options +// Include table of user-configurable iPXE options require_once "flag-table.php"; // Include user-shadowable globals @@ -103,7 +103,7 @@ function curDirURL () /** * Extract NIC families and associated ROM PCI IDs from the src/bin/NIC file. * - * $src_dir must contain the path of the gPXE src directory for this build + * $src_dir must contain the path of the iPXE src directory for this build * * @return array[0] array $new_nics * @return array[1] array $roms @@ -161,7 +161,7 @@ function parse_nic_file () // add special cases to the top - $new_nics = array ( "all-drivers" => "gpxe", + $new_nics = array ( "all-drivers" => "ipxe", "undionly" => "undionly", "undi" => "undi", ); @@ -363,9 +363,9 @@ function get_flags () } /** - * Output given value in appropriate format for gPXE config file + * Output given value in appropriate format for iPXE config file * - * gPXE config/*.h files use C pre-processor syntax. Output the given + * iPXE config/*.h files use C pre-processor syntax. Output the given * compile option in a format appropriate to its type * * @param string $key index into $flag_table for given compile option @@ -429,7 +429,7 @@ function echo_flags ( $flags ) } else { - // Flag (gPXE compile option) should be displayed to user + // Flag (iPXE compile option) should be displayed to user if ( $type == "header" ) { @@ -535,9 +535,9 @@ function mktempcopy ( $src, $dst, $prefix ) } /** - * Write gPXE config files based on value of given flags + * Write iPXE config files based on value of given flags * - * gPXE compile options are stored in src/config/*.h . + * iPXE compile options are stored in src/config/*.h . * We write out a config file for each set of options. * * @param string $config_dir directory to write .h files to @@ -545,7 +545,7 @@ function mktempcopy ( $src, $dst, $prefix ) * * @return void */ -function write_gpxe_config_files ( $config_dir, $flags ) +function write_ipxe_config_files ( $config_dir, $flags ) { global $flag_table; |