X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=second%2Fyaboot.c;h=53643f5c5fff48d56f809712a535e67f2d429810;hb=4ba173298fa8630628c9014028fccc22e511d48a;hp=20296dfb5bfd6216bfca32b4e552bc9ef31f5078;hpb=117cc2a76cc76227a5dd99d3435afb6737a41879;p=yaboot.git diff --git a/second/yaboot.c b/second/yaboot.c index 20296df..53643f5 100644 --- a/second/yaboot.c +++ b/second/yaboot.c @@ -112,6 +112,7 @@ static void setup_display(void); int useconf = 0; char bootdevice[BOOTDEVSZ]; +char bootoncelabel[1024]; char bootargs[1024]; char *password = NULL; struct boot_fspec_t boot; @@ -367,6 +368,22 @@ load_config_file(struct boot_fspec_t *fspec) goto bail; } + /* + * set the default cf_option to label that has the same MAC addr + * it only works if there is a label with the MAC addr on yaboot.conf + */ + if (prom_get_devtype(fspec->dev) == FILE_DEVICE_NET) { + /* change the variable bellow to get the MAC dinamicaly */ + char * macaddr = NULL; + int default_mac = 0; + + macaddr = prom_get_mac(prom_get_netinfo()); + default_mac = cfg_set_default_by_mac(macaddr); + if (default_mac >= 1) { + prom_printf("Default label was changed to macaddr label.\n"); + } + } + DEBUG_F("Config file successfully parsed, %d bytes\n", sz); /* Now, we do the initialisations stored in the config file */ @@ -428,35 +445,6 @@ bail: return result; } -/* - * "bootp-response" is the property name which is specified in - * the recommended practice doc for obp-tftp. However, pmac - * provides a "dhcp-response" property and chrp provides a - * "bootpreply-packet" property. The latter appears to begin the - * bootp packet at offset 0x2a in the property for some reason. - */ - -struct bootp_property_offset { - char *name; /* property name */ - int offset; /* offset into property where bootp packet occurs */ -}; -static const struct bootp_property_offset bootp_response_properties[] = { - { .name = "bootp-response", .offset = 0 }, - { .name = "dhcp-response", .offset = 0 }, - { .name = "bootpreply-packet", .offset = 0x2a }, -}; - -struct bootp_packet { - u8 op, htype, hlen, hops; - u32 xid; - u16 secs, flags; - u32 ciaddr, yiaddr, siaddr, giaddr; - unsigned char chaddr[16]; - unsigned char sname[64]; - unsigned char file[128]; - /* vendor options go here if we need them */ -}; - /* * Search for config file by MAC address, then by IP address. * Basically copying pxelinux's algorithm. @@ -464,84 +452,45 @@ struct bootp_packet { */ static int load_my_config_file(struct boot_fspec_t *orig_fspec) { - void *bootp_response = NULL; - char *propname; struct bootp_packet *packet; - int i = 0, size, offset = 0, rc = 0; - prom_handle chosen; + int rc = 0; struct boot_fspec_t fspec = *orig_fspec; -#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0])) + char *cfgpath = (_machine == _MACH_chrp) ? "/etc/" : ""; + int flen; + int minlen; - chosen = prom_finddevice("/chosen"); - if (chosen < 0) { - prom_printf("chosen=%d\n", chosen); - return 0; - } - - for (i = 0; i < ARRAY_SIZE(bootp_response_properties); i++) { - propname = bootp_response_properties[i].name; - size = prom_getproplen(chosen, propname); - if (size <= 0) - continue; - - DEBUG_F("using /chosen/%s\n", propname); - offset = bootp_response_properties[i].offset; - break; - } - - if (size <= 0) - goto out; - - if (sizeof(*packet) > size - offset) { - prom_printf("Malformed %s property?\n", propname); - goto out; - } - - bootp_response = malloc(size); - if (!bootp_response) - goto out; - - if (prom_getprop(chosen, propname, bootp_response, size) < 0) - goto out; - - packet = bootp_response + offset; + packet = prom_get_netinfo(); /* * First, try to match on mac address with the hardware type * prepended. */ - /* 3 chars per byte in chaddr + 2 chars for htype + \0 */ - fspec.file = malloc(packet->hlen * 3 + 2 + 1); + /* 3 chars per byte in chaddr + 2 chars for htype + /etc/ +\0 */ + fspec.file = malloc(packet->hlen * 3 + 2 + 6); if (!fspec.file) goto out; - sprintf(fspec.file, "%02x", packet->htype); - - for (i = 0; i < packet->hlen; i++) { - char tmp[4]; - sprintf(tmp, "-%02x", packet->chaddr[i]); - strcat(fspec.file, tmp); - } + sprintf(fspec.file, "%s%02x-", cfgpath, packet->htype); + strcat(fspec.file, prom_get_mac(packet)); rc = load_config_file(&fspec); if (rc) goto out; - /* * Now try to match on IP. */ - free(fspec.file); - fspec.file = malloc(9); - sprintf(fspec.file, "%08X", packet->yiaddr); + /* no need to realloc for /etc/ + 8 chars in yiaddr + \0 */ + sprintf(fspec.file, "%s%s", cfgpath, prom_get_ip(packet)); - while (strlen(fspec.file)) { + for (flen = strlen(fspec.file), + minlen = strlen(cfgpath); flen > minlen; flen--) { rc = load_config_file(&fspec); if (rc) goto out; /* Chop one digit off the end, try again */ - fspec.file[strlen(fspec.file) - 1] = '\0'; + fspec.file[flen - 1] = '\0'; } out: @@ -549,7 +498,6 @@ static int load_my_config_file(struct boot_fspec_t *orig_fspec) orig_fspec->file = fspec.file; else free(fspec.file); - free(bootp_response); return rc; } @@ -694,6 +642,7 @@ int get_params(struct boot_param_t* params) { int defpart; char *defdevice = 0; + char defdevice_bak[1024]; char *p, *q, *endp; int c, n; char *imagename = 0, *label; @@ -764,8 +713,12 @@ int get_params(struct boot_param_t* params) } if (c == '\n' || c == '\r') { - if (!imagename) - imagename = cfg_get_default(); + if (!imagename) { + if (bootoncelabel[0] != 0) + imagename = bootoncelabel; + else + imagename = cfg_get_default(); + } if (imagename) prom_printf("%s", imagename); if (params->args) @@ -787,6 +740,8 @@ int get_params(struct boot_param_t* params) label = 0; defdevice = boot.dev; + strcpy(defdevice_bak,defdevice); + if (useconf) { defdevice = cfg_get_strg(0, "device"); p = cfg_get_strg(0, "partition"); @@ -839,13 +794,14 @@ int get_params(struct boot_param_t* params) "resides on, and \"partno\" is the partition number the image resides on.\n" "Note that the comma (,) is only required if you specify an OpenFirmware\n" "device, if you only specify a filename you should not start it with a \",\"\n\n" - "If you omit \"device:\" and \"partno\" yaboot will use the values of \n" - "\"device=\" and \"partition=\" in yaboot.conf, right now those are set to: \n" - "device=%s\n" - "partition=%d\n\n" - "To use an alternative config file rather than /etc/yaboot.conf, type on\n" - " Open FirmWare Prompt: \"boot conf=device:partition,/path/to/configfile\"\n" - "where \"device\" and \"partition\" are defined like above.\n\n", defdevice, defpart); + "To load an alternative config file rather than /etc/yaboot.conf, enter\n" + "its device, partno and path, on Open Firmware Prompt:\n" + "boot conf=device:partno,/path/to/configfile\n." + "To reload the config file or load a new one, use the \"conf\" command\n" + "on Yaboot's prompt:\n" + "conf [device=device] [partition=partno] [file=/path/to/configfile]\n\n" + "If you omit \"device\" and \"partno\", Yaboot will use their current\n" + "values. You can check them by entering \"conf\" on Yaboot's prompt.\n"); return 0; } @@ -864,6 +820,91 @@ int get_params(struct boot_param_t* params) return 1; } + if (!strncmp (imagename, "conf", 4)) { + + // imagename = "conf file=blah dev=bleh part=blih" + DEBUG_F("Loading user-specified config file: %s\n",imagename); + if (password) { + check_password ("Restricted command."); + return 1; + } + + // args= "file=blah dev=bleh part=blih" + char *args = params->args; + + if (strlen(args)){ + + // set a pointer to the first space in args + char *space = strchr(args,' '); + + int loop = 3; + while (loop > 0){ + char temp[1024] = "0"; + + // copy next argument to temp + strncpy(temp, args, space-args); + + // parse temp and set boot arguments + if (!strncmp (temp, "file=", 5)){ + DEBUG_F("conf file: %s\n", temp+5); + strcpy(boot.file, temp+5); + } else if (!strncmp (temp, "device=", 7)){ + DEBUG_F("conf device: %s\n", temp+7); + strcpy(boot.dev, temp+7); + } else if (!strncmp (temp, "partition=", 10)){ + DEBUG_F("conf partition: %s\n", temp+10); + boot.part=simple_strtol(temp+10,NULL,10); + } else + space = NULL; + + // set the pointer to the next space in args; + // set the loop control variable + if (strlen(space)>1){ + // Go to the next argument + args = space+1; + + loop--; + if (strchr(args,' ') == NULL) + space = &args[strlen(args)]; + else + space = strchr(args,' '); + } else { + loop = -1; + space = NULL; + } + } + + prom_printf("Loading config file...\n"); + useconf = load_config_file(&boot); + if (useconf > 0){ + if ((q = cfg_get_strg(0, "timeout")) != 0 && *q != 0) + timeout = simple_strtol(q, NULL, 0); + } else { + prom_printf("Restoring default values.\n"); + strcpy(boot.file,""); + strcpy(boot.dev, defdevice_bak); + boot.part = defpart; + } + + } else { + prom_printf("Current configuration:\n"); + prom_printf("device: %s\n", boot.dev); + if (boot.part < 0) + prom_printf("partition: auto\n"); + else + prom_printf("partition: %d\n", boot.part); + if (strlen(boot.file)) + prom_printf("file: %s\n", boot.file); + else + prom_printf("file: /etc/%s\n",CONFIG_FILE_NAME); + } + + imagename = "\0"; + params->args = "\0"; + + return 0; + } + if (imagename[0] == '$') { /* forth command string */ if (password) @@ -1192,7 +1233,7 @@ load_elf32(struct boot_file_t *file, loadinfo_t *loadinfo) Elf32_Ehdr *e = &(loadinfo->elf.elf32hdr); Elf32_Phdr *p, *ph; int size = sizeof(Elf32_Ehdr) - sizeof(Elf_Ident); - unsigned long addr, loadaddr; + unsigned long loadaddr; /* Read the rest of the Elf header... */ if ((*(file->fs->read))(file, size, &e->e_version) < size) { @@ -1280,13 +1321,7 @@ load_elf32(struct boot_file_t *file, loadinfo_t *loadinfo) loadaddr = loadinfo->load_loc; } - /* On some systems, loadaddr may already be claimed, so try some - * other nearby addresses before giving up. - */ - for(addr=loadaddr; addr <= loadaddr * 8 ;addr+=0x100000) { - loadinfo->base = prom_claim((void *)addr, loadinfo->memsize, 0); - if (loadinfo->base != (void *)-1) break; - } + loadinfo->base = prom_claim_chunk((void *)loadaddr, loadinfo->memsize, 0); if (loadinfo->base == (void *)-1) { prom_printf("Claim error, can't allocate kernel memory\n"); goto bail; @@ -1336,7 +1371,7 @@ load_elf64(struct boot_file_t *file, loadinfo_t *loadinfo) Elf64_Ehdr *e = &(loadinfo->elf.elf64hdr); Elf64_Phdr *p, *ph; int size = sizeof(Elf64_Ehdr) - sizeof(Elf_Ident); - unsigned long addr, loadaddr; + unsigned long loadaddr; /* Read the rest of the Elf header... */ if ((*(file->fs->read))(file, size, &e->e_version) < size) { @@ -1424,13 +1459,7 @@ load_elf64(struct boot_file_t *file, loadinfo_t *loadinfo) loadaddr = e->e_entry; } - /* On some systems, loadaddr may already be claimed, so try some - * other nearby addresses before giving up. - */ - for(addr=loadaddr; addr <= loadaddr * 8 ;addr+=0x100000) { - loadinfo->base = prom_claim((void *)addr, loadinfo->memsize, 0); - if (loadinfo->base != (void *)-1) break; - } + loadinfo->base = prom_claim_chunk((void *)loadaddr, loadinfo->memsize, 0); if (loadinfo->base == (void *)-1) { prom_printf("Claim error, can't allocate kernel memory\n"); goto bail; @@ -1549,7 +1578,7 @@ setup_display(void) } if (scrn == PROM_INVALID_HANDLE) { - prom_printf("No screen device found !/n"); + prom_printf("No screen device found !\n"); return; } for(i=0;i<16;i++) { @@ -1625,6 +1654,14 @@ yaboot_main(void) return -1; } + if (bootoncelabel[0] == 0) { + prom_get_options("boot-once", bootoncelabel, + sizeof(bootoncelabel)); + if (bootoncelabel[0] != 0) + DEBUG_F("boot-once: [%s]\n", bootoncelabel); + } + prom_set_options("boot-once", NULL, 0); + if (!parse_device_path(bootdevice, NULL, -1, "", &boot)) { prom_printf("%s: Unable to parse\n", bootdevice); return -1;