X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=second%2Fyaboot.c;h=6b31cb0af0797fa7ef0c2b373da040b58b851c6b;hb=8aeef6f3fcbe661003268ee598de5601a192b965;hp=59f7d2efd91f68e39e5c70e76c2ebcb528a99eee;hpb=aa67de3649c86c158622391aeec0016645b4f0d1;p=yaboot.git diff --git a/second/yaboot.c b/second/yaboot.c index 59f7d2e..6b31cb0 100644 --- a/second/yaboot.c +++ b/second/yaboot.c @@ -331,7 +331,6 @@ load_config_file(struct boot_fspec_t *fspec) char *conf_file = NULL, *p; struct boot_file_t file; int sz, opened = 0, result = 0; - char conf_path[512]; /* Allocate a buffer for the config file */ conf_file = malloc(CONFIG_FILE_MAX); @@ -340,19 +339,7 @@ load_config_file(struct boot_fspec_t *fspec) goto bail; } - /* Build the path to the file */ - if (_machine == _MACH_chrp) - strcpy(conf_path, "/etc/"); - else - conf_path[0] = 0; - if (fspec->file && *fspec->file) - strcat(conf_path, fspec->file); - else - strcat(conf_path, CONFIG_FILE_NAME); - - /* Open it */ - fspec->file = conf_path; result = open_file(fspec, &file); if (result != FILE_ERR_OK) { prom_printf("%s:%d,", fspec->dev, fspec->part); @@ -381,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 */ @@ -442,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. @@ -478,67 +452,28 @@ 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])) - 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); - } - - //DEBUG_F("----> mac addr: %s\n", fspec.file); + if (_machine == _MACH_chrp) + sprintf(fspec.file, "/etc/%02x-", packet->htype); + else + sprintf(fspec.file, "%02x-", packet->htype); + strcat(fspec.file, prom_get_mac(packet)); rc = load_config_file(&fspec); if (rc) @@ -549,10 +484,15 @@ static int load_my_config_file(struct boot_fspec_t *orig_fspec) * Now try to match on IP. */ free(fspec.file); + /* 8 chars in yiaddr + \0 */ fspec.file = malloc(9); - sprintf(fspec.file, "%08X", packet->yiaddr); + if (!fspec.file) + goto out; + + strcpy(fspec.file, "/etc/"); + strcat(fspec.file, prom_get_ip(packet)); - while (strlen(fspec.file)) { + while (strlen(strrchr(fspec.file, '/')+1)) { rc = load_config_file(&fspec); if (rc) goto out; @@ -565,7 +505,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; } @@ -710,6 +649,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; @@ -807,6 +747,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"); @@ -859,13 +801,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; } @@ -884,6 +827,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)