sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

nfs: no default filename, we always have a filename 

Signed-off-by: Sascha Hauer <sha@pengutronix.de>
This commit is contained in:
Sascha Hauer 2009-10-17 09:55:22 +02:00 committed by Sascha Hauer
parent c229f67efb
commit 1d3d2c6369
1 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
net/nfs.c
View File

@ -59,7 +59,6 @@ static int NfsState;
#define STATE_READ_REQ 6 #define STATE_READ_REQ 6
#define STATE_READLINK_REQ 7 #define STATE_READLINK_REQ 7
static char default_filename[64];
static char *nfs_filename; static char *nfs_filename;
static char *nfs_path; static char *nfs_path;
static char nfs_path_buff[2048]; static char nfs_path_buff[2048];
@ -651,6 +650,8 @@ NfsHandler (uchar *pkt, unsigned dest, unsigned src, unsigned len)
void void
NfsStart (void) NfsStart (void)
{ {
char *p = BootFile;
#ifdef NFS_DEBUG #ifdef NFS_DEBUG
printf ("%s\n", __FUNCTION__); printf ("%s\n", __FUNCTION__);
#endif #endif
@ -665,28 +666,14 @@ NfsStart (void)
return; return;
} }
if (BootFile[0] == '\0') { p = strchr (p, ':');
sprintf (default_filename, "/nfsroot/%02lX%02lX%02lX%02lX.img",
NetOurIP & 0xFF,
(NetOurIP >> 8) & 0xFF,
(NetOurIP >> 16) & 0xFF,
(NetOurIP >> 24) & 0xFF );
strcpy (nfs_path, default_filename);
printf ("*** Warning: no boot file name; using '%s'\n", if (p != NULL) {
nfs_path); string_to_ip (BootFile, &NfsServerIP);
++p;
strcpy (nfs_path, p);
} else { } else {
char *p=BootFile; strcpy (nfs_path, BootFile);
p = strchr (p, ':');
if (p != NULL) {
string_to_ip (BootFile, &NfsServerIP);
++p;
strcpy (nfs_path, p);
} else {
strcpy (nfs_path, BootFile);
}
} }
nfs_filename = basename (nfs_path); nfs_filename = basename (nfs_path);