diff options
| author | Michael Brown | 2011-03-07 01:37:50 +0100 |
|---|---|---|
| committer | Michael Brown | 2011-03-07 01:37:50 +0100 |
| commit | 34b6ecb2f1d7940a0065cbabd6f9dcd439b4c841 (patch) | |
| tree | ea583bf6fde26b2ed12ee3c6b117055e555555d9 /src/usr/autoboot.c | |
| parent | [spi] Reset device on each access (diff) | |
| download | ipxe-34b6ecb2f1d7940a0065cbabd6f9dcd439b4c841.tar.gz ipxe-34b6ecb2f1d7940a0065cbabd6f9dcd439b4c841.tar.xz ipxe-34b6ecb2f1d7940a0065cbabd6f9dcd439b4c841.zip | |
[image] Simplify image management
Refactor the {load,exec} image operations as {probe,exec}. This makes
the probe mechanism cleaner, eliminates some forward declarations,
avoids holding magic state in image->priv, eliminates the possibility
of screwing up between the "load" and "exec" stages, and makes the
documentation simpler since the concept of "loading" (as distinct from
"executing") no longer needs to be explained.
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/usr/autoboot.c')
| -rw-r--r-- | src/usr/autoboot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/usr/autoboot.c b/src/usr/autoboot.c index 9a31279f..7b851b3b 100644 --- a/src/usr/autoboot.c +++ b/src/usr/autoboot.c @@ -184,7 +184,7 @@ int uriboot ( struct uri *filename, struct uri *root_path ) { /* Attempt filename boot if applicable */ if ( filename ) { if ( ( rc = imgdownload ( image, filename, - register_and_autoexec_image ) ) !=0){ + register_and_boot_image ) ) != 0 ) { printf ( "\nCould not chain image: %s\n", strerror ( rc ) ); /* Fall through to (possibly) attempt a SAN boot |