From cedf16ba7d908167ab8a59bb61b671ae3afc5b90 Mon Sep 17 00:00:00 2001
From: Lukas Ocilka <lukas.ocilka@gmail.com>
Date: Thu, 10 Oct 2013 14:50:47 +0200
Subject: [PATCH] Dropped modem and DSL detection (and configuration)

- Dropped from installation proposal and also auto-configuration
- FATE#316263 and FATE#316264
---
 control/control.SLED.xml            | 10 ----------
 control/control.SLES-for-VMware.xml |  8 --------
 control/control.SLES.xml            |  8 --------
 control/control.openSUSE.xml        | 10 ----------
 control/control.xml                 |  8 --------
 5 files changed, 44 deletions(-)

diff --git a/control/control.SLED.xml b/control/control.SLED.xml
index 43e8b6313..b62ab1117 100644
--- a/control/control.SLED.xml
+++ b/control/control.SLED.xml
@@ -137,9 +137,7 @@ textdomain="control"
                 <ac_items config:type="list">
                     <ac_item>lan</ac_item>
                     <ac_item>general</ac_item>
-                    <ac_item>dsl</ac_item>
                     <ac_item>isdn</ac_item>
-                    <ac_item>modem</ac_item>
                     <ac_item>remote</ac_item>
                     <ac_item>firewall</ac_item>
                     <!-- FATE #305583: Start CIMOM by default -->
@@ -523,18 +521,10 @@ Please visit us at http://www.suse.com/.
 		    <name>general</name>
 		    <presentation_order>5</presentation_order>
 		</proposal_module>
-                <proposal_module>
-		    <name>dsl</name>
-		    <presentation_order>30</presentation_order>
-		</proposal_module>
                 <proposal_module>
 		    <name>isdn</name>
 		    <presentation_order>40</presentation_order>
 		</proposal_module>
-                <proposal_module>
-		    <name>modem</name>
-		    <presentation_order>50</presentation_order>
-		</proposal_module>
                 <proposal_module>
 		    <name>remote</name>
 		    <presentation_order>60</presentation_order>
diff --git a/control/control.SLES-for-VMware.xml b/control/control.SLES-for-VMware.xml
index cc51cdeb6..0bb817d4a 100644
--- a/control/control.SLES-for-VMware.xml
+++ b/control/control.SLES-for-VMware.xml
@@ -581,18 +581,10 @@ Choose the one that matches your server the best.</label></scenarios_text>
 		    <name>general</name>
 		    <presentation_order>5</presentation_order>
 		</proposal_module>
-                <proposal_module>
-		    <name>dsl</name>
-		    <presentation_order>30</presentation_order>
-		</proposal_module>
                 <proposal_module>
 		    <name>isdn</name>
 		    <presentation_order>40</presentation_order>
 		</proposal_module>
-                <proposal_module>
-		    <name>modem</name>
-		    <presentation_order>50</presentation_order>
-		</proposal_module>
                 <proposal_module>
 		    <name>remote</name>
 		    <presentation_order>60</presentation_order>
diff --git a/control/control.SLES.xml b/control/control.SLES.xml
index 7b6aa81e2..02feddc2b 100644
--- a/control/control.SLES.xml
+++ b/control/control.SLES.xml
@@ -605,18 +605,10 @@ Choose the one that matches your server the best.</label></scenarios_text>
 		    <name>general</name>
 		    <presentation_order>5</presentation_order>
 		</proposal_module>
-                <proposal_module>
-		    <name>dsl</name>
-		    <presentation_order>30</presentation_order>
-		</proposal_module>
                 <proposal_module>
 		    <name>isdn</name>
 		    <presentation_order>40</presentation_order>
 		</proposal_module>
-                <proposal_module>
-		    <name>modem</name>
-		    <presentation_order>50</presentation_order>
-		</proposal_module>
                 <proposal_module>
 		    <name>remote</name>
 		    <presentation_order>60</presentation_order>
diff --git a/control/control.openSUSE.xml b/control/control.openSUSE.xml
index a81b5c37d..f627076fa 100644
--- a/control/control.openSUSE.xml
+++ b/control/control.openSUSE.xml
@@ -133,9 +133,7 @@ textdomain="control"
 		<ac_items config:type="list">
 		    <ac_item>lan</ac_item>
 		    <ac_item>general</ac_item>
-		    <ac_item>dsl</ac_item>
 		    <ac_item>isdn</ac_item>
-		    <ac_item>modem</ac_item>
 		    <ac_item>remote</ac_item>
 		    <ac_item>firewall</ac_item>
 		</ac_items>
@@ -607,18 +605,10 @@ is the most appropriate desktop for you.</label></desktop_dialog>
 		    <name>general</name>
 		    <presentation_order>5</presentation_order>
 		</proposal_module>
-		<proposal_module>
-		    <name>dsl</name>
-		    <presentation_order>30</presentation_order>
-		</proposal_module>
                 <proposal_module>
 		    <name>isdn</name>
 		    <presentation_order>40</presentation_order>
 		</proposal_module>
-                <proposal_module>
-		    <name>modem</name>
-		    <presentation_order>50</presentation_order>
-		</proposal_module>
                 <proposal_module>
 		    <name>remote</name>
 		    <presentation_order>60</presentation_order>
diff --git a/control/control.xml b/control/control.xml
index 730f45e3c..b1ab08826 100644
--- a/control/control.xml
+++ b/control/control.xml
@@ -162,18 +162,10 @@ textdomain="control"
 		    <name>networkmanager</name>
 		    <presentation_order>5</presentation_order>
 		</proposal_module>
-                <proposal_module>
-		    <name>dsl</name>
-		    <presentation_order>30</presentation_order>
-		</proposal_module>
                 <proposal_module>
 		    <name>isdn</name>
 		    <presentation_order>40</presentation_order>
 		</proposal_module>
-                <proposal_module>
-		    <name>modem</name>
-		    <presentation_order>50</presentation_order>
-		</proposal_module>
                 <proposal_module>
 		    <name>remote</name>
 		    <presentation_order>60</presentation_order>