mount: fix bugs: free(mp->mnt_fsname) of non-malloced ptr;

[oweals/busybox.git] / util-linux / Config.in

diff --git a/util-linux/Config.in b/util-linux/Config.in
index 501ed6bfca9ed4a2e089bfee1079ab746b5d529a..2da37db53106afa31e3ce47d865bed93b21d1320 100644 (file)
--- a/util-linux/Config.in
+++ b/util-linux/Config.in
@@ -17,6 +17,26 @@ config CONFIG_DMESG
          are also logged to the system console.  Enable this option if you
          wish to enable the 'dmesg' utility.
 
+config CONFIG_FEATURE_DMESG_PRETTY
+       bool "pretty dmesg output"
+       default y
+       depends on CONFIG_DMESG
+       help
+         If you wish to scrub the syslog level from the output, say 'Y' here.
+         The syslog level is a string prefixed to every line with the form "<#>".
+
+         With this option you will see:
+           # dmesg
+           Linux version 2.6.17.4 .....
+           BIOS-provided physical RAM map:
+            BIOS-e820: 0000000000000000 - 000000000009f000 (usable)
+
+         Without this option you will see:
+           # dmesg
+           <5>Linux version 2.6.17.4 .....
+           <6>BIOS-provided physical RAM map:
+           <6> BIOS-e820: 0000000000000000 - 000000000009f000 (usable)
+
 config CONFIG_FBSET
        bool "fbset"
        default n
@@ -350,7 +370,31 @@ config CONFIG_FEATURE_MOUNT_NFS
        default n
        depends on CONFIG_MOUNT
        help
-        Enable mounting of NFS file systems.
+         Enable mounting of NFS file systems.
+
+config CONFIG_FEATURE_MOUNT_CIFS
+       bool "Support mounting CIFS/SMB file systems"
+       default n
+       depends on CONFIG_MOUNT
+       help
+         Enable support for samba mounts.
+
+config CONFIG_FEATURE_MOUNT_FLAGS
+       depends on CONFIG_MOUNT
+       bool "Support lots of -o flags in mount"
+       default y
+       help
+         Without this, mount only supports ro/rw/remount.  With this, it
+         supports nosuid, suid, dev, nodev, exec, noexec, sync, async, atime,
+         noatime, diratime, nodiratime, loud, bind, move, shared, slave,
+         private, unbindable, rshared, rslave, rprivate, and runbindable.
+
+config CONFIG_FEATURE_MOUNT_FSTAB
+       depends on CONFIG_MOUNT
+       bool "Support /etc/fstab and -a"
+       default y
+       help
+         Support mount all and looking for files in /etc/fstab.
 
 config CONFIG_PIVOT_ROOT
        bool "pivot_root"