diff options
| author | Erik Hovland <erik@hovland.org> | 2006-09-01 18:26:01 +0000 |
|---|---|---|
| committer | Erik Hovland <erik@hovland.org> | 2006-09-01 18:26:01 +0000 |
| commit | dbfe597f0d9b9c8837dc6a28c0adfea4b281d46c (patch) | |
| tree | cfb3618af70776ef20f1f3a4e5df4ee646608385 /packages/busybox/busybox-1.00/df.patch | |
| parent | f42a4c6fe7b0250c33335171c8534e9a3174d3da (diff) | |
busybox 1.00: Incorporate fixes from familiar 0.8.4 release
* Add --oknodo argument to start-stop-daemon
* df fixes
* unzip and libuncompress fixes backported from 1.1.0
* bump rev to r37 since familiar 0.8.4 shipped with r36
Diffstat (limited to 'packages/busybox/busybox-1.00/df.patch')
| -rw-r--r-- | packages/busybox/busybox-1.00/df.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/packages/busybox/busybox-1.00/df.patch b/packages/busybox/busybox-1.00/df.patch new file mode 100644 index 0000000000..49888293fd --- /dev/null +++ b/packages/busybox/busybox-1.00/df.patch @@ -0,0 +1,28 @@ +--- busybox-1.00/coreutils/df.c.orig 2006-07-14 09:50:47.914912750 -0400 ++++ busybox-1.00/coreutils/df.c 2006-07-14 09:52:32.613456000 -0400 +@@ -60,6 +60,7 @@ + struct statfs s; + static const char hdr_1k[] = "1k-blocks"; /* default display is kilobytes */ + const char *disp_units_hdr = hdr_1k; ++ int root_done = 0; + + #ifdef CONFIG_FEATURE_HUMAN_READABLE + bb_opt_complementaly = "h-km:k-hm:m-hk"; +@@ -125,14 +126,14 @@ + ) / (blocks_used + s.f_bavail); + } + +- if (strcmp(device, "rootfs") == 0) { +- continue; +- } else if (strcmp(device, "/dev/root") == 0) { ++ if (strcmp(device, "/dev/root") == 0 || strcmp(device, "rootfs") == 0) { ++ if (root_done) continue; + /* Adjusts device to be the real root device, + * or leaves device alone if it can't find it */ + if ((device = find_real_root_device_name()) == NULL) { + goto SET_ERROR; + } ++ root_done = 1; + } + + #ifdef CONFIG_FEATURE_HUMAN_READABLE |