Enable the DD repository if the DD autodetection feature was used (#316631)

4 files changed, 9 insertions, 1 deletions

diff --git a/anaconda b/anaconda
index 67781f521..a6a759a52 100755
--- a/anaconda
+++ b/anaconda
@@ -245,6 +245,7 @@ def parseOptions():
     op.add_option("--module", action="append", default=[])
     op.add_option("--nomount", dest="rescue_nomount", action="store_true", default=False)
     op.add_option("--updates", dest="updateSrc", action="store", type="string")
+    op.add_option("--dlabel", action="store_true", default=False)
 
     return op.parse_args()
 
@@ -624,6 +625,9 @@ if __name__ == "__main__":
     # Default is to prompt to mount the installed system.
     anaconda.rescue_mount = not opts.rescue_nomount
 
+    if opts.dlabel: #autodetected driverdisc in use
+        flags.dlabel = True
+
     if opts.noipv4:
         flags.useIPv4 = False
 
diff --git a/flags.py b/flags.py
index 837990ed0..035188963 100644
--- a/flags.py
+++ b/flags.py
@@ -59,6 +59,7 @@ class Flags:
 	self.__dict__['flags']['rootpath'] = 0
 	self.__dict__['flags']['livecd'] = 0        
 	self.__dict__['flags']['expert'] = 0
+	self.__dict__['flags']['dlabel'] = 0
 	self.__dict__['flags']['ibft'] = 1
 	self.__dict__['flags']['iscsi'] = 0
 	self.__dict__['flags']['serial'] = 0
diff --git a/loader2/loader.c b/loader2/loader.c
index 801237395..5acd8f7d4 100644
--- a/loader2/loader.c
+++ b/loader2/loader.c
@@ -1790,6 +1790,9 @@ int main(int argc, char ** argv) {
         tmparg++;
     }
 
+    if (FL_AUTOMODDISK(flags))
+        *argptr++ = "--dlabel";
+
     if (FL_NOIPV4(flags))
         *argptr++ = "--noipv4";
 
diff --git a/yuminstall.py b/yuminstall.py
index d864c1422..6e42d7449 100644
--- a/yuminstall.py
+++ b/yuminstall.py
@@ -556,7 +556,7 @@ class AnacondaYum(YumSorter):
             repo.disable()
             self.repos.add(repo)
 
-        if self.anaconda.id.extraModules:
+        if self.anaconda.id.extraModules or flags.dlabel:
             for d in glob.glob("/tmp/ramfs/DD-*/rpms"):
                 dirname = os.path.basename(os.path.dirname(d))
                 rid = "anaconda-%s" % dirname