aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2009-06-19 13:45:01 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2009-06-19 13:45:01 +0200
commit8e5d83b6c1d91e4e61d340656338597ab1dea3f9 (patch)
tree7c086b069bd4325adf2a9759408eda9f540373e9
parentbeca96ffa7b19ceb8439a678743c8ee35bb60509 (diff)
downloadbusybox-w32-8e5d83b6c1d91e4e61d340656338597ab1dea3f9.tar.gz
busybox-w32-8e5d83b6c1d91e4e61d340656338597ab1dea3f9.tar.bz2
busybox-w32-8e5d83b6c1d91e4e61d340656338597ab1dea3f9.zip
mkswap: remove configuration for v0 support
mkswap hasn't had v0 support since commit d893b120bae5a9bdef4cfda2df5e62867d6b1cd0; it doesn't seem to make sense to offer it for configuration. Signed-off-by: Colin Watson <cjwatson@ubuntu.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--TODO_config_nommu1
-rw-r--r--scripts/defconfig1
-rw-r--r--util-linux/Config.in10
3 files changed, 0 insertions, 12 deletions
diff --git a/TODO_config_nommu b/TODO_config_nommu
index 9c3e86445..6714307ed 100644
--- a/TODO_config_nommu
+++ b/TODO_config_nommu
@@ -494,7 +494,6 @@ CONFIG_FEATURE_MDEV_RENAME_REGEXP=y
494CONFIG_FEATURE_MDEV_EXEC=y 494CONFIG_FEATURE_MDEV_EXEC=y
495CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y 495CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y
496CONFIG_MKSWAP=y 496CONFIG_MKSWAP=y
497CONFIG_FEATURE_MKSWAP_V0=y
498CONFIG_MORE=y 497CONFIG_MORE=y
499CONFIG_FEATURE_USE_TERMIOS=y 498CONFIG_FEATURE_USE_TERMIOS=y
500CONFIG_VOLUMEID=y 499CONFIG_VOLUMEID=y
diff --git a/scripts/defconfig b/scripts/defconfig
index 078b8641b..f8b7eac6b 100644
--- a/scripts/defconfig
+++ b/scripts/defconfig
@@ -502,7 +502,6 @@ CONFIG_FEATURE_MDEV_RENAME_REGEXP=y
502CONFIG_FEATURE_MDEV_EXEC=y 502CONFIG_FEATURE_MDEV_EXEC=y
503CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y 503CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y
504CONFIG_MKSWAP=y 504CONFIG_MKSWAP=y
505CONFIG_FEATURE_MKSWAP_V0=y
506CONFIG_MORE=y 505CONFIG_MORE=y
507CONFIG_FEATURE_USE_TERMIOS=y 506CONFIG_FEATURE_USE_TERMIOS=y
508CONFIG_VOLUMEID=y 507CONFIG_VOLUMEID=y
diff --git a/util-linux/Config.in b/util-linux/Config.in
index b97be8b22..559e4c17a 100644
--- a/util-linux/Config.in
+++ b/util-linux/Config.in
@@ -406,16 +406,6 @@ config MKSWAP
406 Once you have created swap space using 'mkswap' you need to enable 406 Once you have created swap space using 'mkswap' you need to enable
407 the swap space using the 'swapon' utility. 407 the swap space using the 'swapon' utility.
408 408
409config FEATURE_MKSWAP_V0
410 bool "Version 0 support"
411 default n
412 depends on MKSWAP
413# depends on MKSWAP && DEPRECATED
414 help
415 Enable support for the old v0 style.
416 If your kernel is older than 2.1.117, then v0 support is the
417 only option.
418
419config FEATURE_MKSWAP_UUID 409config FEATURE_MKSWAP_UUID
420 bool "UUID support" 410 bool "UUID support"
421 default n 411 default n