Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2014-09-10 17:01:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi (Old) and /work/SRC/openSUSE:Factory/.kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi" Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2014-08-30 18:56:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2014-09-10 17:01:56.000000000 +0200 @@ -1,0 +2,111 @@ +Tue Sep 9 13:18:35 CEST 2014 - m...@suse.de + +- v5.06.158 released + +------------------------------------------------------------------- +Tue Sep 9 13:14:55 CEST 2014 - m...@suse.de + +- Fixed spec file requirement for perl-Config-IniFiles (bnc #895623) + + Older versions of this module doesn't have the 'exists' method + which is used by kiwi + +------------------------------------------------------------------- +Tue Sep 9 10:43:40 CEST 2014 - m...@suse.de + +- Remove obsolete/unused code from KIWILog::setFlag + +------------------------------------------------------------------- +Mon Sep 8 22:06:35 CEST 2014 - m...@suse.de + +- Follow up fix for message logging + + prevent obsolete in cache newline + +------------------------------------------------------------------- +Mon Sep 8 15:24:26 CEST 2014 - m...@suse.de + +- Added missing lvmetad tool + + The tools is required to scan the LVM metadata if it does live + on e.g md devices. It seems the default internal scanning did + not work correctly on pvresize, vgchange, etc... + +------------------------------------------------------------------- +Mon Sep 8 15:22:11 CEST 2014 - aost...@suse.de + +- Fixed indentation + +------------------------------------------------------------------- +Mon Sep 8 14:55:26 CEST 2014 - aost...@suse.de + +- Corrected typo (s/sda1/hda1) + +------------------------------------------------------------------- +Mon Sep 8 14:45:54 CEST 2014 - m...@suse.de + +- Fixed building of vagrant boxes (bnc #895353) + + If multiple boxes for different providers are built at once + kiwi uses the result of the first build as input for the next + one which is wrong because it should use the same raw disk + file for all format conversions + +------------------------------------------------------------------- +Mon Sep 8 14:24:06 CEST 2014 - m...@suse.de + +- Don't create /var/run (/run) tmpfs for SLE11 systems (bnc #895417) + +------------------------------------------------------------------- +Mon Sep 8 11:42:42 CEST 2014 - m...@suse.de + +- Fixed message logging + + Due to the status flags the sequence of log messages could look + broken because of missing newlines at the end of a log message. + This patch checks if a newline is required for the previos message + when the next message is on the way + +------------------------------------------------------------------- +Mon Sep 8 09:59:18 CEST 2014 - m...@suse.de + +- Fixed reset of cursor position to work on both stderr _and_ stdout + + This fixes messages displayed in flag colors to be correctly + displayed in the standard terminal output color + +------------------------------------------------------------------- +Mon Sep 8 09:29:11 CEST 2014 - m...@suse.de + +- Put kiwiOVFConfigWriter.pm from critic level 2 to 3 because + of too high code complexity for level 2. We need to refactor + the ovf code but for now I just lowered the critic level + +------------------------------------------------------------------- +Fri Sep 5 01:54:32 CEST 2014 - opens...@suse.de + +- make it clear which directory couldn't be created + + If a previous build failed, it might have left the root directory + behind. Giving the path in the error will help the user clean it up. + +------------------------------------------------------------------- +Wed Sep 3 15:07:51 CEST 2014 - aost...@suse.de + +- Added new firmware type 'ec2hvm' to handle EC2 HVM instances properly + +------------------------------------------------------------------- +Tue Sep 2 14:30:15 CEST 2014 - m...@suse.de + +- Fixed grub2 EFI setup for aarch64 (bnc #894307) + +------------------------------------------------------------------- +Tue Sep 2 13:51:07 CEST 2014 - m...@suse.de + +- Fixed baseSetupUserPermissions (bnc #894378) + + The function should not operate on system user accounts. + The function should not operate on accounts without + login shell + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.39XtT1/_old 2014-09-10 17:01:58.000000000 +0200 +++ /var/tmp/diff_new_pack.39XtT1/_new 2014-09-10 17:01:58.000000000 +0200 @@ -26,7 +26,7 @@ Group: System/Management Url: http://github.com/openSUSE/kiwi Name: kiwi -Version: 5.06.157 +Version: 5.06.158 Release: 0 Provides: kiwi-image:lxc Provides: kiwi-image:tbz @@ -76,7 +76,7 @@ Requires: libxslt Requires: perl >= %{perl_version} Requires: perl-Class-Singleton -Requires: perl-Config-IniFiles +Requires: perl-Config-IniFiles >= 2.49 Requires: perl-Digest-SHA1 Requires: perl-File-Slurp Requires: perl-JSON ++++++ kiwi-docu.tar.bz2 ++++++ ++++++ kiwi-repo.tar.bz2 ++++++ ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.git-hooks/pre-commit new/kiwi/.git-hooks/pre-commit --- old/kiwi/.git-hooks/pre-commit 2014-08-29 22:30:35.000000000 +0200 +++ new/kiwi/.git-hooks/pre-commit 2014-09-09 13:19:25.000000000 +0200 @@ -14,113 +14,160 @@ # The known Perl modules my @kiwiModules = qw ( - KIWIResult.pm + KIWIAnalyseReport.pm + KIWIAnalyseSoftware.pm + KIWIAnalyseSystem.pm + KIWIAnalyseTemplate.pm KIWIArchList.pm KIWIArch.pm KIWIBasePlugin.pm - KIWIFinishEFIPlugin.pm - KIWIPromoDVDPlugin.pm KIWIBoot.pm KIWICache.pm KIWICollect.pm + kiwiCommandLine.pm KIWICommandLine.pm KIWIConfigure.pm - KIWIConfigWriter.pm + kiwiConfigWriterFactory.pm KIWIConfigWriterFactory.pm + KIWIConfigWriter.pm + kiwiContainerBuilder.pm KIWIContainerBuilder.pm + kiwiContainerConfigWriter.pm KIWIContainerConfigWriter.pm KIWIContentPlugin.pm KIWIDescrPlugin.pm KIWIEulaPlugin.pm + kiwiFilesystemOptions.pm KIWIFilesystemOptions.pm + KIWIFinishEFIPlugin.pm KIWIGlobals.pm + kiwiImageBuilderBase.pm KIWIImageBuilderBase.pm + kiwiImageBuildFactory.pm KIWIImageBuildFactory.pm + kiwiImageCreator.pm KIWIImageCreator.pm KIWIImageFormat.pm + kiwiImage.pm KIWIImage.pm KIWIIsoLinux.pm KIWILicensePlugin.pm KIWILiveTreePlugin.pm + kiwiLocator.pm KIWILocator.pm KIWILog.pm - KIWIManager.pm KIWIManagerApt.pm + KIWIManagerEnsconce.pm + KIWIManager.pm KIWIManagerSmart.pm KIWIManagerYum.pm KIWIManagerZypper.pm - KIWIManagerEnsconce.pm - KIWIAnalyseSystem.pm - KIWIAnalyseSoftware.pm - KIWIAnalyseReport.pm - KIWIAnalyseTemplate.pm KIWIMiniIsoPlugin.pm KIWIOverlay.pm + kiwiOVFConfigWriter.pm KIWIOVFConfigWriter.pm KIWIPatternsPlugin.pm + kiwi.pl KIWIProductData.pm + kiwiProfileFile.pm KIWIProfileFile.pm + KIWIPromoDVDPlugin.pm KIWIQX.pm KIWIRepoMetaHandler.pm + KIWIResult.pm KIWIRoot.pm + kiwiRuntimeChecker.pm KIWIRuntimeChecker.pm KIWISatSolver.pm - KIWISharedMem.pm - KIWISocket.pm + kiwiTarArchiveBuilder.pm KIWITarArchiveBuilder.pm KIWITrace.pm KIWIURL.pm KIWIUtil.pm - KIWIXML.pm KIWIXMLDataBase.pm + kiwiXMLDefStripData.pm KIWIXMLDefStripData.pm + kiwiXMLDescriptionData.pm KIWIXMLDescriptionData.pm + kiwiXMLDriverData.pm KIWIXMLDriverData.pm + kiwiXMLEC2ConfigData.pm KIWIXMLEC2ConfigData.pm + kiwiXMLExceptData.pm KIWIXMLExceptData.pm + kiwiXMLFileData.pm KIWIXMLFileData.pm + kiwiXMLInfo.pm KIWIXMLInfo.pm + kiwiXMLInstRepositoryData.pm KIWIXMLInstRepositoryData.pm + kiwiXMLOEMConfigData.pm KIWIXMLOEMConfigData.pm - KIWIXMLVagrantConfigData.pm - KIWIXMLPXEDeployConfigData.pm - KIWIXMLPXEDeployData.pm + kiwiXMLPackageArchiveData.pm KIWIXMLPackageArchiveData.pm + kiwiXMLPackageCollectData.pm KIWIXMLPackageCollectData.pm + kiwiXMLPackageData.pm KIWIXMLPackageData.pm + kiwiXMLPackageIgnoreData.pm KIWIXMLPackageIgnoreData.pm + kiwiXMLPackageProductData.pm KIWIXMLPackageProductData.pm + kiwiXML.pm + KIWIXML.pm + kiwiXMLPreferenceData.pm KIWIXMLPreferenceData.pm + kiwiXMLProductArchitectureData.pm KIWIXMLProductArchitectureData.pm + kiwiXMLProductMetaChrootData.pm KIWIXMLProductMetaChrootData.pm + kiwiXMLProductMetaFileData.pm KIWIXMLProductMetaFileData.pm + kiwiXMLProductOptionsData.pm KIWIXMLProductOptionsData.pm + kiwiXMLProductPackageData.pm KIWIXMLProductPackageData.pm + kiwiXMLProfileData.pm KIWIXMLProfileData.pm + kiwiXMLPXEDeployConfigData.pm + KIWIXMLPXEDeployConfigData.pm + kiwiXMLPXEDeployData.pm + KIWIXMLPXEDeployData.pm KIWIXMLRepositoryBaseData.pm + kiwiXMLRepositoryData.pm KIWIXMLRepositoryData.pm + kiwiXMLSplitData.pm KIWIXMLSplitData.pm + kiwiXMLStripData.pm KIWIXMLStripData.pm + kiwiXMLSystemdiskData.pm KIWIXMLSystemdiskData.pm + kiwiXMLTypeData.pm KIWIXMLTypeData.pm + kiwiXMLUserData.pm KIWIXMLUserData.pm - KIWIXMLVMachineData.pm + kiwiXMLVagrantConfigData.pm + KIWIXMLVagrantConfigData.pm + kiwiXMLValidator.pm KIWIXMLValidator.pm + kiwiXMLVMachineData.pm + KIWIXMLVMachineData.pm KTCommandLine.t KTConfigWriterFactory.t KTContainerBuilder.t KTContainerConfigWriter.t KTFilesystemOptions.t - KTImage.t KTImageBuilderBase.t KTImageBuildFactory.t KTImageCreator.t + KTImage.t KTLocator.t + ktLog.pm KTOVFVConfigWriter.t KTProfileFile.t KTRuntimeChecker.t KTTarArchiveBuilder.t - KTXML.t + ktTestCase.pm KTXMLDefStripData.t KTXMLDescriptionData.t KTXMLDriverData.t @@ -130,8 +177,6 @@ KTXMLInfo.t KTXMLInstRepositoryData.t KTXMLOEMConfigData.t - KTXMLPXEDeployConfigData.t - KTXMLPXEDeployData.t KTXMLPackageArchiveData.t KTXMLPackageCollectData.t KTXMLPackageData.t @@ -144,65 +189,18 @@ KTXMLProductOptionsData.t KTXMLProductPackageData.t KTXMLProfileData.t + KTXMLPXEDeployConfigData.t + KTXMLPXEDeployData.t KTXMLRepositoryData.t KTXMLSplitData.t KTXMLStripData.t KTXMLSystemdiskData.t + KTXML.t KTXMLTypeData.t KTXMLUserData.t - KTXMLVMachineData.t - KTXMLValidator.t KTXMLVagrantConfigData.t - ktLog.pm - ktTestCase.pm - kiwiCommandLine.pm - kiwiConfigWriterFactory.pm - kiwiContainerBuilder.pm - kiwiContainerConfigWriter.pm - kiwiFilesystemOptions.pm - kiwiLocator.pm - kiwiImage.pm - kiwiImageBuilderBase.pm - kiwiImageBuildFactory.pm - kiwiImageCreator.pm - kiwiOVFConfigWriter.pm - kiwiProfileFile.pm - kiwiRuntimeChecker.pm - kiwiTarArchiveBuilder.pm - kiwiXML.pm - kiwiXMLDefStripData.pm - kiwiXMLDescriptionData.pm - kiwiXMLDriverData.pm - kiwiXMLEC2ConfigData.pm - kiwiXMLExceptData.pm - kiwiXMLFileData.pm - kiwiXMLInfo.pm - kiwiXMLInstRepositoryData.pm - kiwiXMLOEMConfigData.pm - kiwiXMLVagrantConfigData.pm - kiwiXMLPXEDeployConfigData.pm - kiwiXMLPXEDeployData.pm - kiwiXMLPackageArchiveData.pm - kiwiXMLPackageCollectData.pm - kiwiXMLPackageData.pm - kiwiXMLPackageIgnoreData.pm - kiwiXMLPackageProductData.pm - kiwiXMLPreferenceData.pm - kiwiXMLProductArchitectureData.pm - kiwiXMLProductMetaChrootData.pm - kiwiXMLProductMetaFileData.pm - kiwiXMLProductOptionsData.pm - kiwiXMLProductPackageData.pm - kiwiXMLProfileData.pm - kiwiXMLRepositoryData.pm - kiwiXMLSplitData.pm - kiwiXMLStripData.pm - kiwiXMLSystemdiskData.pm - kiwiXMLTypeData.pm - kiwiXMLUserData.pm - kiwiXMLVMachineData.pm - kiwiXMLValidator.pm - kiwi.pl + KTXMLValidator.t + KTXMLVMachineData.t ); # List of modules not clean to level 1 (brutal) of perlcritic @@ -258,8 +256,6 @@ KIWIRoot.pm KIWIRuntimeChecker.pm KIWISatSolver.pm - KIWISharedMem.pm - KIWISocket.pm KIWITarArchiveBuilder.pm KIWITrace.pm KIWIURL.pm @@ -445,8 +441,6 @@ KIWIRoot.pm KIWIRuntimeChecker.pm KIWISatSolver.pm - KIWISharedMem.pm - KIWISocket.pm KIWITarArchiveBuilder.pm KIWITrace.pm KIWIURL.pm @@ -501,6 +495,7 @@ KIWIAnalyseTemplate.pm KIWIMiniIsoPlugin.pm KIWIOverlay.pm + KIWIOVFConfigWriter.pm KIWIPatternsPlugin.pm KIWIProductData.pm KIWIQX.pm @@ -508,8 +503,6 @@ KIWIRoot.pm KIWIRuntimeChecker.pm KIWISatSolver.pm - KIWISharedMem.pm - KIWISocket.pm KIWITrace.pm KIWIURL.pm KIWIUtil.pm diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2014-08-29 22:30:36.000000000 +0200 +++ new/kiwi/.revision 2014-08-29 22:30:36.000000000 +0200 @@ -1 +1 @@ -7730134ff257c180e86ba97b061f645c23f59a10 +1e4128fc1662592f8937ae0bbae4679cd231fd78 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/metadata/KIWIConfig.xml new/kiwi/metadata/KIWIConfig.xml --- old/kiwi/metadata/KIWIConfig.xml 2014-08-29 22:30:36.000000000 +0200 +++ new/kiwi/metadata/KIWIConfig.xml 2014-09-09 13:19:25.000000000 +0200 @@ -26,6 +26,7 @@ locations except for the ones listed here --> <strip type="tools"> + <file name="lvmetad"/> <file name="loadkeys"/> <file name="klogconsole"/> <file name="multipath"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIBoot.pm new/kiwi/modules/KIWIBoot.pm --- old/kiwi/modules/KIWIBoot.pm 2014-08-29 22:30:36.000000000 +0200 +++ new/kiwi/modules/KIWIBoot.pm 2014-09-09 13:19:25.000000000 +0200 @@ -561,9 +561,13 @@ my $appid = $this->{mbrid}; my $type = $this->{type}; my $bootloader= "syslinux"; - my $efi_arch = 'x86_64'; - if ($arch ne 'x86_64') { + my $efi_arch; + if ($arch eq 'x86_64') { + $efi_arch = 'x86_64'; + } elsif ($arch =~ /i.86/) { $efi_arch = 'i386'; + } elsif (($arch eq 'aarch64') || ($arch eq 'arm64')) { + $efi_arch = 'arm64'; } my $status; my $result; @@ -975,6 +979,9 @@ my $bootloader; if ($arch =~ /ppc|ppc64|ppc64le/) { $bootloader = "yaboot"; + if ($firmware eq "ofw") { + $bootloader = "grub2"; + } } elsif ($arch =~ /arm/) { $bootloader = "uboot"; } elsif (($firmware eq "efi") || ($firmware eq "uefi")) { @@ -3482,9 +3489,9 @@ # Grub2 #------------------------------------------ if ($loader eq "grub2") { - my $efipc = 'x86_64-efi'; - my $grubpc = 'i386-pc'; - my $grubofw = 'powerpc-ieee1275'; + my $efipc; + my $grubpc; + my $grubofw; my $bootbios = "$tmpdir/boot/grub2/bootpart.cfg"; my $bootofw = "$tmpdir/boot/grub2/bootpart.cfg"; my $bootefi = "$tmpdir/boot/grub2-efi/bootpart.cfg"; @@ -3496,14 +3503,32 @@ my $grub_ofw = 'grub2'; my $grub_share = 'grub2'; my $lib = 'lib'; - if ($firmware eq 'ec2') { - $grubpc = 'x86_64-xen'; - if ($arch ne 'x86_64') { - $grubpc = 'i386-xen'; + if ($arch eq 'x86_64') { + $efipc = 'x86_64-efi'; + $grubpc = 'i386-pc'; + if ($firmware eq 'ec2') { + $grubpc = 'x86_64-xen'; } - } - if ($arch ne 'x86_64') { + } elsif ($arch =~ /i.86/) { $efipc = 'i386-efi'; + $grubpc = 'i386-pc'; + if ($firmware eq 'ec2') { + $grubpc = 'i386-xen'; + } + } elsif (($arch eq 'aarch64') || ($arch eq 'arm64')) { + $efipc = 'arm64-efi'; + $grubpc = 'arm64-efi'; + } elsif ($arch =~ /ppc|ppc64|ppc64le/) { + if ($firmware eq 'ofw') { + $grubofw = 'powerpc-ieee1275'; + } + } else { + $kiwi -> failed (); + $kiwi -> error ( + "grub2: Unsupported architecture/firmware: $arch/$firmware" + ); + $kiwi -> failed (); + return; } if ($zipped) { $test = $unzip; @@ -3583,10 +3608,13 @@ } if ($firmware ne 'ec2') { push @core_modules, 'boot'; - push @bios_core_modules, qw /biosdisk vga vbe chain multiboot/; + push @bios_core_modules, qw /chain/; + if ($arch =~ /i.86|x86_64/) { + push @bios_core_modules, qw /biosdisk vga vbe multiboot/; + } } my @efi_core_modules = ( - 'part_gpt','efi_gop','efi_uga' + 'part_gpt','efi_gop' ); my @ofw_core_modules = ( 'ofnet','part_gpt','part_msdos' @@ -3606,6 +3634,9 @@ if ($firmware eq "ofw") { @bootdir = ("$tmpdir/boot/grub2/$grubofw"); } + if ($arch =~ /i.86|x86_64/) { + push @efi_core_modules,'efi_uga'; + } $status = KIWIQX::qxx ("mkdir -p @bootdir 2>&1"); $result = $? >> 8; if ($result != 0) { @@ -3779,11 +3810,17 @@ return; } my @modules = @efi_core_modules; - my $fo = 'x86_64-efi'; - my $fo_bin = 'bootx64.efi'; - if ($arch ne 'x86_64') { + my $fo; + my $fo_bin; + if ($arch eq 'x86_64') { + $fo = 'x86_64-efi'; + $fo_bin = 'bootx64.efi'; + } elsif ($arch =~ /i.86/) { $fo = 'i386-efi'; $fo_bin = 'bootx32.efi'; + } elsif (($arch eq 'aarch64') || ($arch eq 'arm64')) { + $fo = 'arm64-efi'; + $fo_bin = 'bootaa64.efi'; } my $core= "$tmpdir/EFI/BOOT/$fo_bin"; my $core_opts; @@ -3810,9 +3847,13 @@ my $s_shim_ms = $stages{efi}{shim_ms}; my $s_shim_suse = $stages{efi}{shim_suse}; my $s_signed = $stages{efi}{signed}; - my $fo_bin = 'bootx64.efi'; - if ($arch ne 'x86_64') { + my $fo_bin; + if ($arch eq 'x86_64') { + $fo_bin = 'bootx64.efi'; + } elsif ($arch =~ /i.86/) { $fo_bin = 'bootx32.efi'; + } elsif (($arch eq 'aarch64') || ($arch eq 'arm64')) { + $fo_bin = 'bootaa64.efi'; } $result = 0; if ($zipped) { @@ -4189,6 +4230,22 @@ # ---- $cmdline .= " root=/dev/sda1"; } + if ($firmware eq 'ec2hvm') { + # /.../ + # Similar to the firmware type 'ec2', EC2 needs in case of HVM + # (hardware-assisted virtual machine) instances the root device to be + # set to /dev/hda1. + # + # Reason: + # During the first boot, kiwi tries to detect the root device via + # "hwinfo --storage", takes the first entry and creates an initrd and + # bootlaoder configuration based on this assumption. The problem is, + # that the first entry refers to /dev/sda1 (the second is /dev/hda1). + # During the second reboot, /dev/sda will be removed from the system + # and therefore such an instance won't come up. + # ---- + $cmdline .= " root=/dev/hda1"; + } if ($topic =~ /^KIWI (CD|USB) Boot/) { # /.../ # use predefined set of parameters for simple boot CD @@ -4397,8 +4454,10 @@ print $FD "\t"."set root='hd0,1'"."\n"; if ($arch eq 'x86_64') { print $FD "\t".'chainloader /EFI/BOOT/bootx64.efi'."\n"; - } else { + } elsif ($arch =~ /i.86/) { print $FD "\t".'chainloader /EFI/BOOT/bootx32.efi'."\n"; + } elsif (($arch eq 'aarch64') || ($arch eq 'arm64')) { + print $FD "\t".'chainloader /EFI/BOOT/bootaa64.efi'."\n"; } } else { print $FD "\t"."set root='hd0'"."\n"; @@ -5527,7 +5586,7 @@ my $loaderTarget; my $targetMessage; if (-e "$stages/core.img") { - # architectures: ix86 and x86_64 + # architectures: ix86, x86_64 and arm if ($chainload) { $loaderTarget = readlink ($bootdev); $loaderTarget =~ s/\.\./\/dev/; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIConfig.sh new/kiwi/modules/KIWIConfig.sh --- old/kiwi/modules/KIWIConfig.sh 2014-08-29 22:30:36.000000000 +0200 +++ new/kiwi/modules/KIWIConfig.sh 2014-09-09 13:19:25.000000000 +0200 @@ -324,12 +324,19 @@ #-------------------------------------- function baseSetupUserPermissions { while read line;do - dir=`echo $line | cut -f6 -d:` - uid=`echo $line | cut -f3 -d:` - usern=`echo $line | cut -f1 -d:` - group=`echo $line | cut -f4 -d:` - if [ -d "$dir" ] && [ $uid -gt 200 ] && [ $usern != "nobody" ];then - group=`cat /etc/group | grep "$group" | cut -f1 -d:` + dir=$(echo $line | cut -f6 -d:) + uid=$(echo $line | cut -f3 -d:) + usern=$(echo $line | cut -f1 -d:) + group=$(echo $line | cut -f4 -d:) + shell=$(echo $line | cut -f7 -d:) + if [ ! -d "$dir" ];then + continue + fi + if [ $uid -lt 1000 ];then + continue + fi + if [[ ! $shell =~ nologin|true|false ]];then + group=$(cat /etc/group | grep "$group" | cut -f1 -d:) chown -c -R $usern:$group $dir/* fi done < /etc/passwd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIGlobals.pm new/kiwi/modules/KIWIGlobals.pm --- old/kiwi/modules/KIWIGlobals.pm 2014-08-29 22:30:41.000000000 +0200 +++ new/kiwi/modules/KIWIGlobals.pm 2014-09-09 13:19:25.000000000 +0200 @@ -1832,7 +1832,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "5.06.157"; + $data{Version} = "5.06.158"; $data{Publisher} = "SUSE LINUX GmbH"; $data{Preparer} = "KIWI - http://opensuse.github.com/kiwi";; $data{ConfigName} = "config.xml"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIImageFormat.pm new/kiwi/modules/KIWIImageFormat.pm --- old/kiwi/modules/KIWIImageFormat.pm 2014-08-29 22:30:41.000000000 +0200 +++ new/kiwi/modules/KIWIImageFormat.pm 2014-09-09 13:19:25.000000000 +0200 @@ -564,6 +564,7 @@ if ((! $ovf) || (! -e $ovf)) { return; } + $this->{image} = $box; } $kiwi -> info ("--> Creating box metadata files"); #========================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWILinuxRC.sh new/kiwi/modules/KIWILinuxRC.sh --- old/kiwi/modules/KIWILinuxRC.sh 2014-08-29 22:30:36.000000000 +0200 +++ new/kiwi/modules/KIWILinuxRC.sh 2014-09-09 13:19:25.000000000 +0200 @@ -441,8 +441,10 @@ #-------------------------------------- mkdir -p -m 0755 /run mkdir -p -m 0755 /var/run - mount -t tmpfs -o mode=0755,nodev,nosuid tmpfs /run - mount --bind /run /var/run + if [[ ! $kiwi_iname =~ SLE.11 ]];then + mount -t tmpfs -o mode=0755,nodev,nosuid tmpfs /run + mount --bind /run /var/run + fi #====================================== # mount devpts tmpfs #-------------------------------------- @@ -7550,8 +7552,10 @@ mkdir -p /mnt/dev mkdir -p /mnt/var/run mount --move /dev /mnt/dev - mount --move /run /mnt/run - mount --move /var/run /mnt/var/run + if [[ ! $kiwi_iname =~ SLE.11 ]];then + mount --move /run /mnt/run + mount --move /var/run /mnt/var/run + fi udevKill #====================================== # run preinit stage diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWILocator.pm new/kiwi/modules/KIWILocator.pm --- old/kiwi/modules/KIWILocator.pm 2014-08-29 22:30:36.000000000 +0200 +++ new/kiwi/modules/KIWILocator.pm 2014-09-09 13:19:25.000000000 +0200 @@ -83,6 +83,10 @@ } if (mkdir $root) { $rootError = 0; + } else { + $kiwi -> failed(); + $kiwi -> error ("Couldn't mkdir '$root': $!"); + $kiwi -> failed(); } } } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWILog.pm new/kiwi/modules/KIWILog.pm --- old/kiwi/modules/KIWILog.pm 2014-08-29 22:30:36.000000000 +0200 +++ new/kiwi/modules/KIWILog.pm 2014-09-09 13:19:25.000000000 +0200 @@ -81,8 +81,8 @@ # Reset cursor position to standard value # --- my $this = shift; - my $FD = $this->{channel}; - print $FD "\033[m\017"; + print STDOUT "\033[m\017"; + print STDERR "\033[m\017"; return; } @@ -93,19 +93,14 @@ # ... # set status flag # --- - my $this = shift; - my $flag = shift; - my $rootEFD = $this->{rootefd}; - my $FD = $this->{channel}; + my $this = shift; + my $flag = shift; + my $FD = $this->{channel}; #========================================== # no flag in file logging mode #------------------------------------------ if ($this->{fileLog}) { - # - # Don't set status flags to the log file, instead - # complete the line with a newline - # - print $FD "\n"; + # Don't set status flags in logging mode return; } #========================================== @@ -127,14 +122,6 @@ } else { print $FD " $flag\n"; } - #========================================== - # save a newline for default log file - #------------------------------------------ - if ($rootEFD) { - print $rootEFD "\n"; - } else { - $this -> saveInCache ("\n"); - } return; } @@ -391,6 +378,8 @@ my $rootEFD = $this->{rootefd}; my $date = $this -> getPrefix ( $lglevel ); my $trace = KIWITrace -> instance(); + my $prev = $this->{last_line}; + my $prev_channel = $this->{last_channel}; #========================================== # no logdata -> return #------------------------------------------ @@ -441,21 +430,43 @@ # send message cache if needed #------------------------------------------ if ((($this->{fileLog}) || ($this->{errorOk})) && (@mcache) && ($rootEFD)) { + my $line = "\n"; foreach my $message (@mcache) { + my $last_line_ending = chop $line; + if ($last_line_ending ne "\n") { + print $rootEFD "\n"; + } print $rootEFD $message; + $line = $message; } undef $this->{mcache}; } #========================================== + # check if last log line ended with a CR + #------------------------------------------ + my $needCR = 0; + if ($prev) { + my $last_line_ending = chop $prev; + if ($last_line_ending ne "\n") { + $needCR = 1; + } + } + #========================================== # print message to root file #------------------------------------------ if (($this->{errorOk}) && ($rootEFD)) { + if ($needCR) { + print $rootEFD "\n"; + } print $rootEFD $result; } #========================================== # print message to log channel (stdin,file) #------------------------------------------ if (($FD) && ((! defined $flag) || ($this->{fileLog}))) { + if (($needCR) && ($this->{fileLog})) { + print $prev_channel "\n"; + } print $FD $result; } #========================================== @@ -536,6 +547,8 @@ my $this = shift; my $logdata = shift; my @mcache; + $this->{last_line} = $logdata; + $this->{last_channel} = $this->{channel}; if (defined $this->{mcache}) { @mcache = @{$this->{mcache}}; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWISchema.rnc new/kiwi/modules/KIWISchema.rnc --- old/kiwi/modules/KIWISchema.rnc 2014-08-29 22:30:36.000000000 +0200 +++ new/kiwi/modules/KIWISchema.rnc 2014-09-09 13:19:25.000000000 +0200 @@ -1643,7 +1643,7 @@ ## the disk layout and the partition table type. By default ## the standard x86 bios firmware setup is used attribute firmware { - "bios" | "ec2" | "efi" | "uefi" | "vboot" | "ofw" + "bios" | "ec2" | "ec2hvm" | "efi" | "uefi" | "vboot" | "ofw" } k.type.bootpartition.attribute = ## specify if an extra boot partition should be used or not. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWISchema.rng new/kiwi/modules/KIWISchema.rng --- old/kiwi/modules/KIWISchema.rng 2014-08-29 22:30:36.000000000 +0200 +++ new/kiwi/modules/KIWISchema.rng 2014-09-09 13:19:25.000000000 +0200 @@ -2184,6 +2184,7 @@ <choice> <value>bios</value> <value>ec2</value> + <value>ec2hvm</value> <value>efi</value> <value>uefi</value> <value>vboot</value> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIXMLTypeData.pm new/kiwi/modules/KIWIXMLTypeData.pm --- old/kiwi/modules/KIWIXMLTypeData.pm 2014-08-29 22:30:36.000000000 +0200 +++ new/kiwi/modules/KIWIXMLTypeData.pm 2014-09-09 13:19:25.000000000 +0200 @@ -2117,7 +2117,7 @@ return; } my %supported = map { ($_ => 1) } qw( - bios ec2 efi uefi vboot ofw + bios ec2 ec2hvm efi uefi vboot ofw ); if (! $supported{$firmware} ) { my $msg = "$caller: specified firmware value '$firmware' is not " -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
