Fixes so "make allnoconfig" works again.

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

diff --git a/util-linux/Config.in b/util-linux/Config.in
index c47a42d5bb273907a456b61fbe2b2d63181287eb..7fde01971f9c1f9c1de7a7047c4b2da5f7977fc2 100644 (file)
--- a/util-linux/Config.in
+++ b/util-linux/Config.in
@@ -216,6 +216,23 @@ config CONFIG_LOSETUP
          file or block device, and to query the status of a loop device.  This
          version does not currently support enabling data encryption.
 
+config CONFIG_IPCRM
+       bool "ipcrm"
+       default n
+       select CONFIG_FEATURE_SUID
+       help
+         The ipcrm utility allows the removal of System V interprocess
+         communication (IPC) objects and the associated data structures
+         from the system.
+
+config CONFIG_IPCS
+       bool "ipcs"
+       default n
+       select CONFIG_FEATURE_SUID
+       help
+         The ipcs utility is used to provide information on the currently
+         allocated System V interprocess (IPC) objects in the system.
+
 config CONFIG_MKSWAP
        bool "mkswap"
        default n
@@ -306,50 +323,49 @@ config CONFIG_UMOUNT
          the tool to use.  If you enabled the 'mount' utility, you almost certainly
          also want to enable 'umount'.
 
-config CONFIG_FEATURE_MOUNT_FORCE
-       bool "  Support forced filesystem unmounting"
-       default n
-       depends on CONFIG_UMOUNT
-       help
-         This allows you to _force_ a filesystem to be umounted.  This is generally
-         only useful when you want to get rid of an unreachable NFS system.
-
 comment "Common options for mount/umount"
        depends on CONFIG_MOUNT || CONFIG_UMOUNT
 
 config CONFIG_FEATURE_MOUNT_LOOP
-       bool "  Support for loop devices"
+       bool "  Support loopback mounts"
        default n
        depends on CONFIG_MOUNT || CONFIG_UMOUNT
        help
-         Enabling this feature allows mount to use the '-o' loop options,
-         which lets you loop mount files.  Mount will automagically setup and
-         free the necessary loop devices so you do not need to mess with the
-         'losetup' utility unless you really want to.  This is really
-         only useful if you plan to loop mount files.
+         Enabling this feature allows automatic mounting of files (containing
+         filesystem images) via the linux kernel's loopback devices.  The mount
+         command will detect you are trying to mount a file instead of a block
+         device, and transparently associate the file with a loopback device.
+         The umount command will also free that loopback device.
+         
+         You can still use the 'losetup' utility (to manually associate files
+          with loop devices) if you need to do something advanced, such as
+         specify an offset or cryptographic options to the loopback device.
+         (If you don't want umount to free the loop device, use "umount -D".)
 
 config CONFIG_FEATURE_MTAB_SUPPORT
-       bool "  Support for a real /etc/mtab (instead of /proc/mounts)"
+       bool "  Support for the old /etc/mtab file"
        default n
        depends on CONFIG_MOUNT || CONFIG_UMOUNT
        help
-         If your root filesystem is writable and you wish to have the 'mount'
-         utility create an mtab file listing the filesystems which have been
-         mounted then you should enable this option.  Most people that use
-         BusyBox have a read-only root filesystem, so they will leave this
-         option disabled and BusyBox will use the /proc/mounts file.
-
-config CONFIG_FEATURE_MTAB_FILENAME
-       string "  mtab file location"
-       default "/etc/mtab"
-       depends on CONFIG_FEATURE_MTAB_SUPPORT
-       help
-         Some people have a read only root filesystem, but they also wish to
-         have the 'mount' utility create an mtab file listing the filesystems
-         which have been mounted.  This option allows you to specify an alternative
-         location for the mtab file, such as /var/mtab, or /tmp/mtab.  The default
-         value is /etc/mtab, which is where this file is located on most desktop
-         Linux systems.
+         Historically, Unix systems kept track of the currently mounted
+         partitions in the file "/etc/mtab".  These days, the kernel exports
+         the list of currently mounted partitions in "/proc/mounts", rendering
+         the old mtab file obsolete.  (In modern systems, /etc/mtab should be
+         a symlink to /proc/mounts.)
+
+         The only reason to have mount maintain an /etc/mtab file itself is if
+         your stripped-down embedded system does not have a /proc directory.
+         If you must use this, keep in mind it's inherently brittle (for
+         example a mount under chroot won't update it), can't handle modern
+         features like separate per-process filesystem namespaces, requires
+         that your /etc directory be writeable, tends to get easily confused
+         by --bind or --move mounts, and so on.  (In brief: avoid.)
+
+config CONFIG_READPROFILE
+       bool "readprofile"
+       default n
+       help
+         This allows you to parse /proc/profile for basic profiling.
 
 endmenu