Patch last_pach62 from vodz. This patch moves all the /proc parsing

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

diff --git a/util-linux/config.in b/util-linux/config.in
index 067ced60d5544e7dbef23280561b99a3f209f489..25d0c5ad4237ef0e9d19d6a6cd1abfa2fd9ed360 100644 (file)
--- a/util-linux/config.in
+++ b/util-linux/config.in
@@ -23,21 +23,30 @@ if [ "$CONFIG_FSCK_MINIX" = "y" -o "$CONFIG_MKFS_MINIX" = "y" ]; then
 fi
 bool 'getopt'              CONFIG_GETOPT
 bool 'hexdump'             CONFIG_HEXDUMP  
+bool 'hwclock'             CONFIG_HWCLOCK  
+if [ "$CONFIG_HWCLOCK" = "y" ]; then
+    bool '  Support long options (--hctosys,...)'              CONFIG_FEATURE_HWCLOCK_LONGOPTIONS
+fi
+bool 'losetup'              CONFIG_LOSETUP
 bool 'mkswap'              CONFIG_MKSWAP
 bool 'more'                CONFIG_MORE
 if [ "$CONFIG_MORE" = "y" ]; then
     bool '  Use termios to manipulate the screen'              CONFIG_FEATURE_USE_TERMIOS
 fi 
-if [ "$CONFIG_LS" = "y" -o "$CONFIG_MORE" = "y"]; then
+if [ "$CONFIG_LS" = "y" -o "$CONFIG_MORE" = "y" ]; then
     comment '  Common options for ls and more'
     bool    '   Calculate terminal & column widths'    CONFIG_FEATURE_AUTOWIDTH
 fi
+bool 'pivot_root'          CONFIG_PIVOT_ROOT
+bool 'rdate'               CONFIG_RDATE
+bool 'swaponoff'           CONFIG_SWAPONOFF
 bool 'mount'               CONFIG_MOUNT
 if [ "$CONFIG_MOUNT" = "y" ]; then
     bool '  Support mounting nfs file systems'                 CONFIG_NFSMOUNT
-    bool '  Use devmtab instead of /proc (needs a patched kernel)'     CONFIG_FEATURE_USE_DEVPS_PATCH
+    if [ "$CONFIG_FEATURE_USE_DEVPS_PATCH" = "n" ]; then
+       bool '  Use devmtab instead of /proc (needs a patched kernel)'  CONFIG_FEATURE_USE_DEVPS_PATCH
+    fi
 fi
-fi     
 bool 'umount'              CONFIG_UMOUNT
 if [ "$CONFIG_UMOUNT" = "y" ]; then
     bool '  Support forced filesystem unmounting'              CONFIG_FEATURE_MOUNT_FORCE
@@ -47,9 +56,6 @@ if [ "$CONFIG_MOUNT" = "y" -o "$CONFIG_UMOUNT" = "y" ]; then
     bool '  Support for loop devices'                          CONFIG_FEATURE_MOUNT_LOOP
     bool '  Support for a real /etc/mtab (instead of /proc/mounts)'    CONFIG_FEATURE_MTAB_SUPPORT
 fi
-bool 'pivot_root'          CONFIG_PIVOT_ROOT
-bool 'rdate'               CONFIG_RDATE
-bool 'swaponoff'           CONFIG_SWAPONOFF
 
 endmenu