Author: emaste
Date: Mon Nov  2 16:49:57 2009
New Revision: 198808
URL: http://svn.freebsd.org/changeset/base/198808

Log:
  MFC r197082:
  
    If the pxe client is told to use / as the root path, honour that rather
    of trying to mount /pxeroot instead.
  
  PR:           i386/106493
  Submitted by: Andrey Russev

Modified:
  stable/6/sys/   (props changed)
  stable/6/sys/boot/i386/libi386/pxe.c
  stable/6/sys/conf/   (props changed)
  stable/6/sys/contrib/pf/   (props changed)
  stable/6/sys/dev/cxgb/   (props changed)

Modified: stable/6/sys/boot/i386/libi386/pxe.c
==============================================================================
--- stable/6/sys/boot/i386/libi386/pxe.c        Mon Nov  2 16:46:53 2009        
(r198807)
+++ stable/6/sys/boot/i386/libi386/pxe.c        Mon Nov  2 16:49:57 2009        
(r198808)
@@ -282,7 +282,7 @@ pxe_open(struct open_file *f, ...)
                bootp(pxe_sock, BOOTP_PXE);
                if (rootip.s_addr == 0)
                        rootip.s_addr = bootplayer.sip;
-               if (!rootpath[1])
+               if (!rootpath[0])
                        strcpy(rootpath, PXENFSROOTPATH);
 
                for (i = 0; rootpath[i] != '\0' && i < FNAME_SIZE; i++)
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to