david/ipxe
david
/
ipxe
Archived
1
0
Fork 0

Move header file for usr/autoboot.c to include/usr

This commit is contained in:
Michael Brown 2007-01-10 02:03:20 +00:00
parent d24b80acf2
commit 55e590ab3a
5 changed files with 24 additions and 18 deletions

View File

@ -33,7 +33,7 @@ Literature dealing with the network protocols:
#include <gpxe/netdevice.h> #include <gpxe/netdevice.h>
#include <gpxe/shell.h> #include <gpxe/shell.h>
#include <gpxe/shell_banner.h> #include <gpxe/shell_banner.h>
#include <gpxe/autoboot.h> #include <usr/autoboot.h>
/* Linker symbols */ /* Linker symbols */
extern char _bss[], _ebss[]; extern char _bss[], _ebss[];

View File

@ -1,18 +1,22 @@
#include <vsprintf.h> #include <vsprintf.h>
#include <gpxe/command.h> #include <gpxe/command.h>
#include <gpxe/autoboot.h> #include <usr/autoboot.h>
static int boot_exec ( int argc, char **argv ) { static int boot_exec ( int argc, char **argv ) {
if ( argc != 1 ) { if ( argc != 1 ) {
printf ( "Usage: %s\n" printf ( "Usage:\n"
"Attempts to boot the system\n", argv[0] ); " %s\n"
"\n"
"Attempts to boot the system\n",
argv[0] );
return 1; return 1;
} }
autoboot(); autoboot();
return 0; /* Can never return success by definition */
return 1;
} }
struct command boot_command __command = { struct command boot_command __command = {

View File

@ -1,12 +0,0 @@
#ifndef _GPXE_AUTOBOOT_H
#define _GPXE_AUTOBOOT_H
/** @file
*
* Automatic booting
*
*/
extern void autoboot ( void );
#endif /* _GPXE_AUTOBOOT_H */

View File

@ -0,0 +1,12 @@
#ifndef _USR_AUTOBOOT_H
#define _USR_AUTOBOOT_H
/** @file
*
* Automatic booting
*
*/
extern void autoboot ( void );
#endif /* _USR_AUTOBOOT_H */

View File

@ -20,7 +20,7 @@
#include <vsprintf.h> #include <vsprintf.h>
#include <gpxe/netdevice.h> #include <gpxe/netdevice.h>
#include <usr/ifmgmt.h> #include <usr/ifmgmt.h>
#include <gpxe/autoboot.h> #include <usr/autoboot.h>
/** @file /** @file
* *
@ -39,6 +39,8 @@ void autoboot ( void ) {
if ( ( rc = ifopen ( netdev ) ) != 0 ) if ( ( rc = ifopen ( netdev ) ) != 0 )
continue; continue;
ifstat ( netdev );
test_dhcp ( netdev ); test_dhcp ( netdev );
ifclose ( netdev ); ifclose ( netdev );