Jaunty config changes: Build in DM CRYPT,MIRROR,MULTIPATH,SNAPSHOT

[Tim Gardner]

>From ee054d1634e1ac2a8fc0988115a84ef5a8e0df62 Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner at canonical.com>
Date: Mon, 22 Dec 2008 11:12:14 -0700
Subject: [PATCH] UBUNTU: Build in DM CRYPT,MIRROR,MULTIPATH,SNAPSHOT

Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
---
 debian/config/amd64/config    |   10 +++++-----
 debian/config/i386/config     |   10 +++++-----
 debian/d-i/modules/md-modules |    4 ----
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/debian/config/amd64/config b/debian/config/amd64/config
index 6ea61a0..0c7351c 100644
--- a/debian/config/amd64/config
+++ b/debian/config/amd64/config
@@ -603,14 +603,14 @@ CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
 CONFIG_DMI=y
 CONFIG_DMIID=y
-CONFIG_DM_CRYPT=m
+CONFIG_DM_CRYPT=y
 # CONFIG_DM_DEBUG is not set
 # CONFIG_DM_DELAY is not set
 CONFIG_DM_LOOP=m
-CONFIG_DM_MIRROR=m
-CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MIRROR=y
+CONFIG_DM_MULTIPATH=y
 CONFIG_DM_RAID45=m
-CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_SNAPSHOT=y
 CONFIG_DM_UEVENT=y
 CONFIG_DM_ZERO=m
 CONFIG_DNOTIFY=y
@@ -2552,7 +2552,7 @@ CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_DC390T=m
 CONFIG_SCSI_DC395x=m
 CONFIG_SCSI_DEBUG=m
-CONFIG_SCSI_DH=m
+CONFIG_SCSI_DH=y
 CONFIG_SCSI_DH_ALUA=m
 CONFIG_SCSI_DH_EMC=m
 CONFIG_SCSI_DH_HP_SW=m
diff --git a/debian/config/i386/config b/debian/config/i386/config
index aa4fbfe..217d89b 100644
--- a/debian/config/i386/config
+++ b/debian/config/i386/config
@@ -629,14 +629,14 @@ CONFIG_DLM=m
 CONFIG_DM9102=m
 CONFIG_DMI=y
 CONFIG_DMIID=y
-CONFIG_DM_CRYPT=m
+CONFIG_DM_CRYPT=y
 # CONFIG_DM_DEBUG is not set
 # CONFIG_DM_DELAY is not set
 CONFIG_DM_LOOP=m
-CONFIG_DM_MIRROR=m
-CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MIRROR=y
+CONFIG_DM_MULTIPATH=y
 CONFIG_DM_RAID45=m
-CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_SNAPSHOT=y
 CONFIG_DM_UEVENT=y
 CONFIG_DM_ZERO=m
 CONFIG_DNOTIFY=y
@@ -2705,7 +2705,7 @@ CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_DC390T=m
 CONFIG_SCSI_DC395x=m
 CONFIG_SCSI_DEBUG=m
-CONFIG_SCSI_DH=m
+CONFIG_SCSI_DH=y
 CONFIG_SCSI_DH_ALUA=m
 CONFIG_SCSI_DH_EMC=m
 CONFIG_SCSI_DH_HP_SW=m
diff --git a/debian/d-i/modules/md-modules b/debian/d-i/modules/md-modules
index 449e8a4..d608e3b 100644
--- a/debian/d-i/modules/md-modules
+++ b/debian/d-i/modules/md-modules
@@ -1,9 +1,5 @@
-dm-crypt
 dm-log
-dm-mirror
-dm-multipath
 dm-round-robin
-dm-snapshot
 dm-zero
 faulty
 linear
-- 
1.5.6.3