narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Set current working URI to be that of the executable image when 

executing any image, not just a script.  (This will enable pxelinux to
use relative URIs, should it wish to.)
pull/1/head
Michael Brown 2007-08-07 06:50:12 -07:00
parent 950057eeed
commit cfcc41d407
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/core/image.c
View File

@ -237,6 +237,7 @@ int image_autoload ( struct image *image ) {
* @ret rc Return status code * @ret rc Return status code
*/ */
int image_exec ( struct image *image ) { int image_exec ( struct image *image ) {
struct uri *old_cwuri;
int rc; int rc;
/* Image must be loaded first */ /* Image must be loaded first */
@ -252,15 +253,23 @@ int image_exec ( struct image *image ) {
if ( ! image->type->exec ) if ( ! image->type->exec )
return -ENOEXEC; return -ENOEXEC;
/* Switch current working directory to be that of the image itself */
old_cwuri = uri_get ( cwuri );
churi ( image->uri );
/* Try executing the image */ /* Try executing the image */
if ( ( rc = image->type->exec ( image ) ) != 0 ) { if ( ( rc = image->type->exec ( image ) ) != 0 ) {
DBGC ( image, "IMAGE %p could not execute: %s\n", DBGC ( image, "IMAGE %p could not execute: %s\n",
image, strerror ( rc ) ); image, strerror ( rc ) );
return rc; goto done;
} }
/* Well, some formats might return... */ done:
return 0; /* Reset current working directory */
churi ( old_cwuri );
uri_put ( old_cwuri );
return rc;
} }
/** /**

10
src/image/script.c
View File

@ -27,7 +27,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <errno.h> #include <errno.h>
#include <gpxe/image.h> #include <gpxe/image.h>
#include <gpxe/uri.h>
struct image_type script_image_type __image_type ( PROBE_NORMAL ); struct image_type script_image_type __image_type ( PROBE_NORMAL );
@ -38,7 +37,6 @@ struct image_type script_image_type __image_type ( PROBE_NORMAL );
* @ret rc Return status code * @ret rc Return status code
*/ */
static int script_exec ( struct image *image ) { static int script_exec ( struct image *image ) {
struct uri *old_cwuri;
char cmdbuf[256]; char cmdbuf[256];
size_t offset = 0; size_t offset = 0;
size_t remaining; size_t remaining;
@ -53,10 +51,6 @@ static int script_exec ( struct image *image ) {
image_get ( image ); image_get ( image );
unregister_image ( image ); unregister_image ( image );
/* Switch current working directory to be that of the script itself */
old_cwuri = uri_get ( cwuri );
churi ( image->uri );
while ( offset < image->len ) { while ( offset < image->len ) {
/* Read up to cmdbuf bytes from script into buffer */ /* Read up to cmdbuf bytes from script into buffer */
@ -93,9 +87,7 @@ static int script_exec ( struct image *image ) {
rc = 0; rc = 0;
done: done:
/* Reset current working directory, re-register image and return */ /* Re-register image and return */
churi ( old_cwuri );
uri_put ( old_cwuri );
register_image ( image ); register_image ( image );
image_put ( image ); image_put ( image );
return rc; return rc;