Update of /cvsroot/leaf/src/bering-uclibc/apps/busybox
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv9557

Modified Files:
        buildtool.cfg buildtool.mk 
Added Files:
        busybox-dev-root.patch 
Log Message:
patch for df not showing /dev/root

--- NEW FILE: busybox-dev-root.patch ---
Fri Aug 4 2006 Stuart Hughes <[EMAIL PROTECTED]>

This patch will make df show the output for the root mounted device,
even if /dev/root is missing.  This seems to happen for me when
booting the root filesystem over NFS and using devfs

diff --exclude CVS -uNr busybox-1.1.3/coreutils/df.c 
busybox-1.1.3.modified/coreutils/df.c
--- busybox-1.1.3/coreutils/df.c        2006-03-22 21:16:21.000000000 +0000
+++ busybox-1.1.3.modified/coreutils/df.c       2006-08-04 15:56:07.000000000 
+0100
@@ -131,7 +131,7 @@
                                /* Adjusts device to be the real root device,
                                * or leaves device alone if it can't find it */
                                if ((device = find_block_device("/")) == NULL) {
-                                       goto SET_ERROR;
+                                       device = "/dev/root";
                                }
                        }
 

Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/busybox/buildtool.mk,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** buildtool.mk        13 Aug 2006 20:22:05 -0000      1.15
--- buildtool.mk        20 Aug 2006 15:19:24 -0000      1.16
***************
*** 21,24 ****
--- 21,25 ----
        cat $(BUSYBOX_PATCH4) | patch -d $(BUSYBOX_DIR) -p1
        cat $(BUSYBOX_PATCH5) | patch -d $(BUSYBOX_DIR) -p1
+       cat $(BUSYBOX_PATCH6) | patch -d $(BUSYBOX_DIR) -p1
        touch $(BUSYBOX_DIR)/.source
        

Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/busybox/buildtool.cfg,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** buildtool.cfg       13 Aug 2006 20:22:05 -0000      1.13
--- buildtool.cfg       20 Aug 2006 15:19:24 -0000      1.14
***************
*** 47,50 ****
--- 47,57 ----
  </File>
  
+ <File busybox-dev-root.patch>
+       Server = cvs-sourceforge
+       envname = BUSYBOX_PATCH6
+       directory = busybox
+       revision = HEAD
+ </File>
+ 
  <File .config>
        Server = cvs-sourceforge


-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
leaf-cvs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits

Reply via email to