Index: modules/KIWIRoot.pm =================================================================== --- modules/KIWIRoot.pm (revision 1528) +++ modules/KIWIRoot.pm (working copy) @@ -899,6 +899,7 @@ my $this = shift; my $kiwi = $this->{kiwi}; my $root = $this->{root}; + my $xml = $this->{xml}; my $baseSystem = $this->{baseSystem}; my $prefix = $root."/".$baseSystem; my $cache = "/var/cache"; @@ -950,6 +951,16 @@ } else { next; } + #========================================== + # Mount if source is an ISO file + #------------------------------------------ + my %repository = $xml -> getRepository(); + foreach my $source (keys %repository) { + if ($source =~ /^iso:\/\//) { + my $isoMountPoint = new KIWIURL($kiwi,$this) -> isoPath($source); + push(@mountList,$isoMountPoint); + } + } $kiwi -> info ("Mounting local channel: $chl"); my $roopt = "dirs=$cache=rw:$path=ro,ro"; my $auopt = "dirs=$path=ro"; Index: modules/KIWIManager.pm =================================================================== --- modules/KIWIManager.pm (revision 1528) +++ modules/KIWIManager.pm (working copy) @@ -971,6 +971,15 @@ my @installOpts = ( "--auto-agree-with-licenses" ); + #========================================= + # Do not install recommended packages + #----------------------------------------- + my %pattr = $xml -> getPackageAttributes("image"); + if (($pattr{patternType} ne "plusRecommended") && + ($pattr{patternPackageType} ne "plusRecommended") + ) { + push (@installOpts,"--no-recommends"); + } print $fd "function clean { kill \$SPID;"; print $fd "echo 1 > $screenCall.exit; exit 1; }\n"; print $fd "trap clean INT TERM\n"; @@ -999,12 +1008,6 @@ print $fd "SPID=\$!;wait \$SPID\n"; } if (@newpatts) { - my %pattr = $xml -> getPackageAttributes(); - if (($pattr{patternType} ne "plusRecommended") && - ($pattr{patternPackageType} ne "plusRecommended") - ) { - push (@installOpts,"--no-recommends"); - } print $fd "test \$? = 0 && chroot $root @zypper install "; print $fd "@installOpts -t pattern @newpatts &\n"; print $fd "SPID=\$!;wait \$SPID\n"; @@ -1180,6 +1183,15 @@ my @installOpts = ( "--auto-agree-with-licenses" ); + #========================================= + # Do not install recommended packages + #----------------------------------------- + my %pattr = $xml -> getPackageAttributes("bootstrap"); + if (($pattr{patternType} ne "plusRecommended") && + ($pattr{patternPackageType} ne "plusRecommended") + ) { + push (@installOpts,"--no-recommends"); + } #========================================== # Add package manager to package list #------------------------------------------ @@ -1218,12 +1230,6 @@ print $fd "SPID=\$!;wait \$SPID\n"; } if (@newpatts) { - my %pattr = $xml -> getPackageAttributes(); - if (($pattr{patternType} ne "plusRecommended") && - ($pattr{patternPackageType} ne "plusRecommended") - ) { - push (@installOpts,"--no-recommends"); - } if (@packs) { print $fd "test \$? = 0 && "; } @@ -1245,6 +1251,15 @@ my @installOpts = ( "--auto-agree-with-licenses" ); + #========================================= + # Do not install recommended packages + #----------------------------------------- + my %pattr = $xml -> getPackageAttributes("image"); + if (($pattr{patternType} ne "plusRecommended") && + ($pattr{patternPackageType} ne "plusRecommended") + ) { + push (@installOpts,"--no-recommends"); + } #========================================== # Create screen call file #------------------------------------------ @@ -1263,12 +1278,6 @@ print $fd "SPID=\$!;wait \$SPID\n"; } if (@newpatts) { - my %pattr = $xml -> getPackageAttributes(); - if (($pattr{patternType} ne "plusRecommended") && - ($pattr{patternPackageType} ne "plusRecommended") - ) { - push (@installOpts,"--no-recommends"); - } if (@install) { print $fd "test \$? = 0 && "; }