aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Fandrich <dan@coneharvesters.com>2010-06-17 23:30:27 -0700
committerDenys Vlasenko <vda.linux@googlemail.com>2010-06-18 13:28:46 +0200
commiteafc6956f6fa86cb7d4bf488e96eeee34c551819 (patch)
tree8c8068eb1a011ef484c00e86fb2909a9df3f8e89
parentf934a51c9b0020f842faebaedba9c67d4b0af73d (diff)
downloadbusybox-w32-eafc6956f6fa86cb7d4bf488e96eeee34c551819.tar.gz
busybox-w32-eafc6956f6fa86cb7d4bf488e96eeee34c551819.tar.bz2
busybox-w32-eafc6956f6fa86cb7d4bf488e96eeee34c551819.zip
Allow CONFIG_VOLUMEID to be turned off
Signed-off-by: Dan Fandrich <dan@coneharvesters.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--util-linux/Config.src6
1 files changed, 3 insertions, 3 deletions
diff --git a/util-linux/Config.src b/util-linux/Config.src
index e97125917..3c3e05ec4 100644
--- a/util-linux/Config.src
+++ b/util-linux/Config.src
@@ -472,7 +472,7 @@ config FEATURE_USE_TERMIOS
472 472
473config VOLUMEID 473config VOLUMEID
474 bool #No description makes it a hidden option 474 bool #No description makes it a hidden option
475 default y 475 default n
476 476
477config FEATURE_VOLUMEID_EXT 477config FEATURE_VOLUMEID_EXT
478 bool "Ext filesystem" 478 bool "Ext filesystem"
@@ -725,7 +725,7 @@ config FEATURE_MOUNT_HELPERS
725 The idea is to use such virtual filesystems in /etc/fstab. 725 The idea is to use such virtual filesystems in /etc/fstab.
726 726
727config FEATURE_MOUNT_LABEL 727config FEATURE_MOUNT_LABEL
728 bool "Support specifiying devices by label or UUID" 728 bool "Support specifying devices by label or UUID"
729 default y 729 default y
730 depends on MOUNT 730 depends on MOUNT
731 select VOLUMEID 731 select VOLUMEID
@@ -930,7 +930,7 @@ config FEATURE_MTAB_SUPPORT
930 If you must use this, keep in mind it's inherently brittle (for 930 If you must use this, keep in mind it's inherently brittle (for
931 example a mount under chroot won't update it), can't handle modern 931 example a mount under chroot won't update it), can't handle modern
932 features like separate per-process filesystem namespaces, requires 932 features like separate per-process filesystem namespaces, requires
933 that your /etc directory be writeable, tends to get easily confused 933 that your /etc directory be writable, tends to get easily confused
934 by --bind or --move mounts, won't update if you rename a directory 934 by --bind or --move mounts, won't update if you rename a directory
935 that contains a mount point, and so on. (In brief: avoid.) 935 that contains a mount point, and so on. (In brief: avoid.)
936 936