[BusyBox] [PATCH] fix compilation of libbb/mtab_file.c

Rob Landley rob at landley.net
Fri Jul 22 18:49:34 MDT 2005


On Friday 22 July 2005 18:21, Arthur Othieno wrote:

> Hey, revision 10556 removed CONFIG_FEATURE_MTAB_FILENAME without _no_
> mention of it. The log in question reads:
>
>   Rodney Radford submitted ipcs and ipcrm (system V IPC stuff).  They could
> use some more work to shrink them down.
>
> Re-defining it was only out of the impression that it was removed
> by accident.

As I mentioned in my next post: yeah, it was.  This is part of my mount 
rewrite that leaked in by accident when I marshalled a patch through my 
development tree.  (The mount side is more or less finished, but the umount 
side still has a couple tangles I haven't managed to get to yet.)

> Now, after sifting through <busybox-cvs at busybox.net> archives,
> I gather the original intent was to do away with this entirely:
> http://www.busybox.net/lists/busybox-cvs/2005-May/005736.html
>
> In that case, this patch is more correct:
>
>
> Index: libbb/mtab_file.c
> ===================================================================
> --- libbb/mtab_file.c (revision 10900)
> +++ libbb/mtab_file.c (working copy)
> @@ -26,7 +26,7 @@
>  /* Busybox mount uses either /proc/mounts or /etc/mtab to
>   * get the list of currently mounted filesystems */
>  #if defined CONFIG_FEATURE_MTAB_SUPPORT
> -const char bb_path_mtab_file[] = CONFIG_FEATURE_MTAB_FILENAME;
> +const char bb_path_mtab_file[] = "/etc/mtab";
>  #else
>  const char bb_path_mtab_file[] = "/proc/mounts";
>  #endif

Sounds good.  I'll add it to my queue...

Rob


More information about the busybox mailing list