Author: jsuchome Date: Wed Oct 12 15:10:33 2011 New Revision: 66400 URL: http://svn.opensuse.org/viewcvs/yast?rev=66400&view=rev Log: - do not add initrd modules when mkintrd itself can add them (bnc#716785) - 2.21.19 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/inst_kickoff.ycp Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=66400&r1=66399&r2=66400&view=diff ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Wed Oct 12 15:10:33 2011 @@ -1 +1 @@ -2.21.18 +2.21.19 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=66400&r1=66399&r2=66400&view=diff ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Wed Oct 12 15:10:33 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Oct 12 15:09:39 CEST 2011 - jsuchome@suse.cz + +- do not add initrd modules when mkintrd itself can add them + (bnc#716785) +- 2.21.19 + +------------------------------------------------------------------- Thu Oct 6 11:52:02 UTC 2011 - lslezak@suse.cz - skip product selection in the second stage (do not reinstall Modified: trunk/packager/src/clients/inst_kickoff.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/inst_kickoff.ycp?rev=66400&r1=66399&r2=66400&view=diff ============================================================================== --- trunk/packager/src/clients/inst_kickoff.ycp (original) +++ trunk/packager/src/clients/inst_kickoff.ycp Wed Oct 12 15:10:33 2011 @@ -25,14 +25,6 @@ import "FileUtils"; import "String"; -void AcpiToInitrd () { - if (! (Arch::i386 () || Arch::x86_64 () || Arch::ia64 ())) - return; - foreach (string m, ["processor", "thermal", "fan"], { - Initrd::AddModule (m, ""); - }); -} - // add xen paravirtualized drivers to initrd if thery are selected for installation void XenPVToInitrd() { @@ -56,35 +48,6 @@ } } -void HyperVPVToInitrd() { - // is any hyper-v-kmp-* package selected? - if (Pkg::IsSelected("hyper-v-kmp-default") - || Pkg::IsSelected("hyper-v-kmp-smp") - || Pkg::IsSelected("hyper-v-kmp-pae") - || Pkg::IsSelected("hyper-v-kmp-bigsmp") - || Pkg::IsSelected("hyper-v-kmp-kdump")) - { - // add modules to initrd - Initrd::AddModule ("hv_blkvsc", ""); - Initrd::AddModule ("hv_netvsc", ""); - Initrd::AddModule ("hv_storvsc", ""); - Initrd::AddModule ("hv_vmbus", ""); - - y2milestone("Added HyperV PV drivers to initrd, configured drivers: %1", Initrd::ListModules()); - - // it also need to be added to MODULES_LOADED_ON_BOOT - Kernel::AddModuleToLoad ("hv_storvsc"); - Kernel::AddModuleToLoad ("hv_netvsc"); - y2milestone ("Added hv_storvsc and hv_netvsc to modules loaded on boot"); - - } - else - { - y2milestone("No hyper-v-kmp-* package is selected for installation, skipping HyperV PV driver installation"); - } -} - - /** * Write a fake mtab to the target system since some %post scripts might * need it. @@ -479,7 +442,6 @@ // fake mtab fake_mtab (); - AcpiToInitrd (); // F#302660: System installation and upgrade workflow: kernel %post // calling ins_bootloader write all config files for bootloader @@ -540,12 +502,10 @@ // Bootloader::PreUpdate (); // -- this function call does NOTHING! } - AcpiToInitrd (); } // add Xen and HyperV PV drivers to initrd XenPVToInitrd(); - HyperVPVToInitrd(); if (Stage::initial ()) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org