From 8e5d83b6c1d91e4e61d340656338597ab1dea3f9 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Fri, 19 Jun 2009 13:45:01 +0200 Subject: [PATCH] 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 Signed-off-by: Denys Vlasenko --- TODO_config_nommu | 1 - scripts/defconfig | 1 - util-linux/Config.in | 10 ---------- 3 files changed, 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 CONFIG_FEATURE_MDEV_EXEC=y CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y CONFIG_MKSWAP=y -CONFIG_FEATURE_MKSWAP_V0=y CONFIG_MORE=y CONFIG_FEATURE_USE_TERMIOS=y CONFIG_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 CONFIG_FEATURE_MDEV_EXEC=y CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y CONFIG_MKSWAP=y -CONFIG_FEATURE_MKSWAP_V0=y CONFIG_MORE=y CONFIG_FEATURE_USE_TERMIOS=y CONFIG_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 Once you have created swap space using 'mkswap' you need to enable the swap space using the 'swapon' utility. -config FEATURE_MKSWAP_V0 - bool "Version 0 support" - default n - depends on MKSWAP -# depends on MKSWAP && DEPRECATED - help - Enable support for the old v0 style. - If your kernel is older than 2.1.117, then v0 support is the - only option. - config FEATURE_MKSWAP_UUID bool "UUID support" default n -- 2.25.1