Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2015-03-25 09:55:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-03-16 06:57:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2015-03-25 09:55:53.000000000 +0100 @@ -1,0 +2,154 @@ +Mon Mar 23 12:42:46 CET 2015 - [email protected] + +- v7.02.34 released + +------------------------------------------------------------------- +Mon Mar 23 09:22:16 CET 2015 - [email protected] + +- Complete KIWI's appdata handlling removal + + Commit f4b7df2 removed the general handling, but missed a reference in + KIWICollect.pm + +------------------------------------------------------------------- +Thu Mar 19 11:29:51 CET 2015 - [email protected] + +- v7.02.33 released + +------------------------------------------------------------------- +Wed Mar 18 17:15:24 CET 2015 - [email protected] + +- Changes to instsource requirements + + In order to make syslinux requirement conditional we need to build + kiwi-instsource arch specific package. + + This commit is needed because we can't Require kiwi-isoboot in Factory + anymore since we started to build PowerPC in Rings + + Signed-off-by: Dinar Valeev <[email protected]> + +------------------------------------------------------------------- +Wed Mar 18 16:36:25 CET 2015 - [email protected] + +- v7.02.32 released + +------------------------------------------------------------------- +Wed Mar 18 15:52:57 CET 2015 - [email protected] + +- Fixed service setup for lxc containers + + No chroot required to for relinking services + +------------------------------------------------------------------- +Wed Mar 18 15:27:47 CET 2015 - [email protected] + +- Fixed contents of lxc configuration + + Use autodev and disable kmsg. In addition rework the way + systemd services gets disabled and update the list of + systemd services not allowed to run in a container. This + fixes (bnc #920692) + +------------------------------------------------------------------- +Wed Mar 18 09:34:59 CET 2015 - [email protected] + +- Follow up fix for variable import errors + +------------------------------------------------------------------- +Tue Mar 17 16:50:07 CET 2015 - [email protected] + +- Ignore variable import syntax errors + + In case of malformed shell syntax a message on eval of the + expression is printed to the log. Having them twice is not + needed + +------------------------------------------------------------------- +Tue Mar 17 16:45:06 CET 2015 - [email protected] + +- Deleted createOriginSnapshot + + In combination with btrfs this function created an origin snapshot + prior to the first boot. This conflicts with the SUSE built in + snapshot setup used by snapper. + +------------------------------------------------------------------- +Tue Mar 17 16:01:59 CET 2015 - [email protected] + +- Fixed use of volume variables in profile env + + Instead of evaluating the variable to get their content + we directly parse the value. This allows to have key + values including special characters normally not allowed + in shell variable names like the dot('.'). volumes names + like '.snapshot' will become possible + +------------------------------------------------------------------- +Tue Mar 17 12:19:55 CET 2015 - [email protected] + +- Remove KIWI's appdata handling + + The format is just too complex to be handled in this symlistic way. + Appdata.xml (a subset of Appstream) evolved and changed for example + from "applications" to "components"; now, some packages export one type, + other packages export the other type. Merging them without normalising + is resulting in a structure like: + + <applications> + <application> + [...] + </application> + <component> + [...] + </components> + </applications> + + whereas 'components' is no valid child of applications per spec (neither + is application a valid child of components). + + Hence: if KIWI ought to do that proper, the full format must be + understood, analysed, normalised and merged. + + for openSUSE, KIWI now uses appstream-builder, which is created in close + relationship with the AppStream metadata in mind. + + Having this code still in KIWI results in the builder producing valid + appdata.xml.gz PLUS an uncompressed appdata.xml (~18MB) to be part of + the repository metadata (thus slowing repo refresh down a lot). + +------------------------------------------------------------------- +Tue Mar 17 11:40:43 CET 2015 - [email protected] + +- Fixed restoreBtrfsSubVolumes + + if a subvolume for e.g /var/crash should be restored, kiwi + failed because the /var path did not exist. As a workaround + people could add /var as a volume but if only /var/crash + should be a volume and not /var there was no way to do it. + This commit fixed it in a way that kiwi checks if the path + to the volume exists and if not it is created prior to the + restore of the subvolume + +------------------------------------------------------------------- +Mon Mar 16 18:04:19 CET 2015 - [email protected] + +- v7.02.31 released + +------------------------------------------------------------------- +Mon Mar 16 18:02:52 CET 2015 - [email protected] + +- Added runtime check for docker and lxc definitions + + Those require a container name to be specified + +------------------------------------------------------------------- +Mon Mar 16 18:01:55 CET 2015 - [email protected] + +- Fixed Result packer for docker and lxc images + + The kiwi.buildinfo basename was wrong and did not include + the extension name. In addition the result packer was not + aware that lxc/docker images are tarballs + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.qrcAoA/_old 2015-03-25 09:55:55.000000000 +0100 +++ /var/tmp/diff_new_pack.qrcAoA/_new 2015-03-25 09:55:55.000000000 +0100 @@ -26,7 +26,7 @@ Group: System/Management Url: http://github.com/openSUSE/kiwi Name: kiwi -Version: 7.02.30 +Version: 7.02.34 Release: 0 Provides: kiwi-image:lxc Provides: kiwi-image:tbz @@ -228,12 +228,14 @@ License: GPL-2.0 Group: System/Management Requires: build +Requires: cdrkit-cdrtools-compat Requires: createrepo +Requires: genisoimage Requires: inst-source-utils Requires: kiwi = %{version} Requires: kiwi-instsource-plugin -%if 0%{?suse_version} > 1120 -BuildArch: noarch +%ifarch %ix86 x86_64 +Requires: syslinux %endif %description -n kiwi-instsource ++++++ kiwi-docu.tar.bz2 ++++++ ++++++ kiwi-repo.tar.bz2 ++++++ ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2014-12-15 14:32:44.000000000 +0100 +++ new/kiwi/.revision 2015-02-19 21:11:51.000000000 +0100 @@ -1 +1 @@ -d00514db7fedee93fd432c38f8578d0442201f9f +7ad65aaf87c5efea2296e043039b880cec196366 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWICollect.pm new/kiwi/modules/KIWICollect.pm --- old/kiwi/modules/KIWICollect.pm 2015-01-30 10:25:53.000000000 +0100 +++ new/kiwi/modules/KIWICollect.pm 2015-03-23 12:42:31.000000000 +0100 @@ -118,10 +118,6 @@ m_fdebugpacks => [], m_debug => undef, m_rmlists => undef, - m_appdata => undef, - m_appdata_seen => undef, - m_appdata_base => undef, - m_appdata_type => undef, m_reportLog => {}, }; @@ -934,48 +930,6 @@ } #========================================== -# addAppdata -#------------------------------------------ -sub addAppdata { - my $this = shift; - my $packPointer = shift; - return unless $packPointer->{'appdata'}; - $this->logMsg('I', "taking $packPointer->{'appdata'}"); - my $XML = FileHandle -> new(); - $XML -> open ($packPointer->{'appdata'}); - my $xml = XML::LibXML -> new(); - eval { $xml -> parse_fh ( $XML ); }; - if ($@) { - $this->logMsg('W', "ignoring broken appdata file"); - $XML -> close(); - return; - } - $XML->seek(0, 0); - my $appdata = ''; - while ( <$XML> ) { - next if m,<\?xml,; - if (m,<((applications|components)[^\>\n]*)>,s) { - if (!$this->{m_appdata_type} || - ($2 eq 'components' && - $this->{m_appdata_type} eq 'applications')) { - $this->{m_appdata_base} = $1; - $this->{m_appdata_type} = $2; - } - } - next if m,^\s*</?(?:applications|components),; - $appdata .= $_; - } - $XML -> close(); - my $appdata_md5 = Digest::MD5::md5_hex($appdata); - $this->{m_appdata_seen} ||= {}; - if (!$this->{m_appdata_seen}->{$appdata_md5}) { - $this->{m_appdata} .= $appdata; - $this->{m_appdata_seen}->{$appdata_md5} = 1; - } - return; -} - -#========================================== # addDebugPackage #------------------------------------------ sub addDebugPackage { @@ -1267,7 +1221,6 @@ } } } - $this->addAppdata($packPointer); # package processed, jump to the next arch or package next ARCH; } @@ -1301,25 +1254,6 @@ } #========================================== -# writeAppdata -#------------------------------------------ -sub writeAppdata { - my $this = shift; - my $dir = shift; - $this->logMsg('I', "write appdata to $dir\n"); - my $XML = FileHandle -> new(); - my $appdata_type = $this->{m_appdata_type} || 'applications'; - my $appdata_base = $this->{m_appdata_base } || $appdata_type; - $XML -> open (">$dir/appdata.xml") or die("$dir/appdata.xml: $!\n"); - print $XML "<?xml version='1.0' ?>\n"; - print $XML "<$appdata_base>\n"; - print $XML $this->{m_appdata}; - print $XML "</$appdata_type>\n"; - $XML -> close (); - return $this; -} - -#========================================== # collectPackages #------------------------------------------ sub collectPackages { @@ -1422,16 +1356,6 @@ $this->logMsg('E', $msg); return 1; } - my $descrdir = $this->{m_proddata}->getInfo("DESCRDIR"); - if ($descrdir && $this->{m_appdata}) { - $this->writeAppdata("$this->{m_basesubdir}->{1}/$descrdir"); - } - my $datadir = $this->{m_proddata}->getInfo("DATADIR"); - if ( defined($this->{m_proddata}->getVar("CREATE_REPOMD")) - && $this->{m_proddata}->getVar("CREATE_REPOMD") eq "true" - && $this->{m_appdata}) { - $this->writeAppdata("$this->{m_basesubdir}->{1}/$datadir/repodata"); - } my @packagelist = sort(keys(%{$this->{m_metaPacks}})); if($this->unpackMetapackages(@packagelist) != 0) { $this->logMsg('E', "[collectPackages] executing scripts failed!"); @@ -1933,15 +1857,6 @@ $package->{'repo'} = $this->{m_repos}->{$r}; $package->{'localfile'} = $uri; $package->{'disturl'} = $flags{'DISTURL'}[0]; - if ($flags{'SOURCERPM'}) { - my $appdata = $uri; - # Old appdata location before OBS 2.5 - $appdata =~ s,[^/]*$,$name-appdata.xml,; - $package->{'appdata'} = $appdata if (-s $appdata); - # New appdata location since OBS 2.5.0 - $appdata =~ s,[^/]*$,../appdata/$name-appdata.xml,; - $package->{'appdata'} = $appdata if (-s $appdata); - } $package->{'epoch'} = $flags{'EPOCH'}[0]; $package->{'version'} = $flags{'VERSION'}[0]; $package->{'release'} = $flags{'RELEASE'}[0]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIContainerBuilder.pm new/kiwi/modules/KIWIContainerBuilder.pm --- old/kiwi/modules/KIWIContainerBuilder.pm 2014-12-15 14:32:46.000000000 +0100 +++ new/kiwi/modules/KIWIContainerBuilder.pm 2015-03-23 12:26:45.000000000 +0100 @@ -18,6 +18,7 @@ #------------------------------------------ use strict; use warnings; +use File::Basename; #========================================== # Base class @@ -699,12 +700,11 @@ my $croot = $locator -> getExecPath('chroot'); if ($sysctl) { my @srvs = qw ( - device-mapper - journal - kbd - timedated - swap - udev + device-mapper.service + kbd.service + swap.service + udev.service + proc-sys-fs-binfmt_misc.automount ); my @locations = ( '/lib/systemd/system/', @@ -713,22 +713,18 @@ my @services; for my $srv (@srvs) { for my $loc (@locations) { - push @services, glob "$targetDir/$loc/*$srv*.ser*"; + my $service = $targetDir.'/'.$loc.'/'.$srv; + if (-e $service) { + push @services, $service + } } } for my $srvPath (@services) { - if (-l $srvPath) { - # only real service files can be disabled - next; - } - my @parts = split /\//smx, $srvPath; - my $name = $parts[-1]; - my $cmd = "$croot $targetDir " - . "$sysctl disable $name"; - my $data = KIWIQX::qxx ($cmd); + my $name = basename($srvPath); + my $data = KIWIQX::qxx ("ln -sf /dev/null $srvPath 2>&1"); my $code = $? >> 8; if ($code != 0) { - $kiwi -> error ("--> Could not disable service: $name"); + $kiwi -> error ("--> Could not disable service: $name: $data"); $kiwi -> failed(); return; } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIContainerConfigWriter.pm new/kiwi/modules/KIWIContainerConfigWriter.pm --- old/kiwi/modules/KIWIContainerConfigWriter.pm 2014-12-15 14:32:46.000000000 +0100 +++ new/kiwi/modules/KIWIContainerConfigWriter.pm 2015-03-23 12:26:45.000000000 +0100 @@ -96,10 +96,10 @@ . 'bind,ro 0 0' . "\n"; } } - $config .= "\n" . '#When the host system has lxc >= 0.8.0 uncoment ' - . 'the following line' . "\n" - . '#lxc.autodev=1' . "\n" + $config .= "\n" + . 'lxc.autodev=1' . "\n" . 'lxc.tty = 4' . "\n" + . 'lxc.kmsg = 0' . "\n" . 'lxc.pts = 1024' . "\n"; my $name = $xml -> getImageType() -> getContainerName(); $config .= 'lxc.rootfs = /var/lib/lxc/' . $name . '/rootfs' . "\n"; 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 2015-03-13 11:14:33.000000000 +0100 +++ new/kiwi/modules/KIWIGlobals.pm 2015-03-23 12:42:41.000000000 +0100 @@ -614,6 +614,13 @@ } my $name = $xml -> getImageName(); my $iver = $xml -> getPreferences() -> getVersion(); + my $type = $xml -> getImageType(); + my $imageType = $type -> getTypeName(); + if ($imageType eq 'docker') { + $extension = '-docker'; + } elsif ($imageType eq 'lxc') { + $extension = '-lxc'; + } if (defined $extension) { $name = $name.$extension.$arch.$separator.$iver; } else { @@ -1853,7 +1860,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "7.02.30"; + $data{Version} = "7.02.34"; $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/KIWILinuxRC.sh new/kiwi/modules/KIWILinuxRC.sh --- old/kiwi/modules/KIWILinuxRC.sh 2015-03-12 12:01:17.000000000 +0100 +++ new/kiwi/modules/KIWILinuxRC.sh 2015-03-23 12:26:45.000000000 +0100 @@ -240,10 +240,10 @@ sed -i -e s"#'\+#'\\\\''#g" /tmp/srcme # add '...' quoting to values sed -i -e s"#\(^[a-zA-Z0-9_]\+\)=\(.*\)#$prefix\1='\2'#" /tmp/srcme - source /tmp/srcme + source /tmp/srcme &>/dev/null while read line;do key=$(echo "$line" | cut -d '=' -f1) - eval "export $key" + eval "export $key" &>/dev/null done < /tmp/srcme if [ ! -z "$ERROR_INTERRUPT" ];then Echo -e "$ERROR_INTERRUPT" @@ -3252,7 +3252,7 @@ for i in $(cat /.profile | grep -E 'kiwi_LVM_|kiwi_allFreeVolume');do variable=$(echo $i|cut -f1 -d=) volume=$(echo $i| cut -f3- -d_ | cut -f1 -d=) - content=$(eval echo \$$variable) + content=$(echo $i|cut -f2 -d= | tr -d \' | tr -d \") volpath=$(echo $content | cut -f3 -d:) if [ -z "$volpath" ];then volpath=$volume @@ -6560,7 +6560,7 @@ for i in $(cat /.profile | grep -E 'kiwi_LVM_|kiwi_allFreeVolume');do variable=$(echo $i|cut -f1 -d=) volume=$(echo $i| cut -f3- -d_ | cut -f1 -d=) - content=$(eval echo \$$variable) + content=$(echo $i|cut -f2 -d= | tr -d \' | tr -d \") volpath=$(echo $content | cut -f3 -d:) if [ -z "$volpath" ];then volpath=$volume @@ -7759,7 +7759,7 @@ for i in $(cat /.profile | grep -E 'kiwi_LVM_|kiwi_allFreeVolume');do variable=$(echo $i|cut -f1 -d=) volume=$(echo $i| cut -f3- -d_ | cut -f1 -d=) - content=$(eval echo \$$variable) + content=$(echo $i|cut -f2 -d= | tr -d \' | tr -d \") volpath=$(echo $content | cut -f3 -d:) if [ -z "$volpath" ];then volpath=$volume @@ -9389,17 +9389,22 @@ local volpath local mpoint local mppath + local volbase btrfs subvolume create $root/@ || return for i in $(cat /.profile | grep -E 'kiwi_LVM_|kiwi_allFreeVolume');do variable=$(echo $i|cut -f1 -d=) volume=$(echo $i| cut -f3- -d_ | cut -f1 -d=) - content=$(eval echo \$$variable) + content=$(echo $i|cut -f2 -d= | tr -d \' | tr -d \") volpath=$(echo $content | cut -f3 -d:) if [ -z "$volpath" ];then volpath=$volume fi volpath=$(echo $volpath | cut -f4 -d/ | cut -c3-) mpoint=$(echo $volpath | tr -d LV | tr _ /) + volbase="$root/@/$(dirname $mpoint)" + if [ ! -d $volbase ];then + mkdir -p $volbase + fi btrfs subvolume create $root/@/$mpoint || return done } @@ -10665,29 +10670,6 @@ fi } #====================================== -# createOriginSnapshot -#-------------------------------------- -function createOriginSnapshot { - # /.../ - # create a snapshot origin which allows to keep - # track of any changes happened during the live - # time of the image. This origin snapshot requires - # the use of the btrfs filesystem - # ---- - local IFS=$IFS_ORIG - if [ ! "$FSTYPE" = "btrfs" ];then - return - fi - if ! lookup btrfs &>/dev/null;then - echo "Can't find btrfs tools, creation of origin snapshot skipped !" - return - fi - for vol in $(btrfs subvolume list / | grep / | cut -f2 -d /);do - btrfs subvolume snapshot -r /$vol /origin_$vol - done - btrfs subvolume snapshot -r / /origin -} -#====================================== # activateBootPartition #-------------------------------------- function activateBootPartition { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIResult.pm new/kiwi/modules/KIWIResult.pm --- old/kiwi/modules/KIWIResult.pm 2015-03-03 10:48:55.000000000 +0100 +++ new/kiwi/modules/KIWIResult.pm 2015-03-23 12:26:45.000000000 +0100 @@ -296,6 +296,11 @@ $data = KIWIQX::qxx ( "xz -kc $source/$base.$suffix >$tmpdir/$base-$bnr.$suffix.xz 2>&1" ); + } elsif ($suffix eq 'docker') { + # docker is an xz compressed tarball + $data = KIWIQX::qxx ( + "cp $source/$base.tar.xz $tmpdir/$base-$bnr.tar.xz 2>&1" + ); } else { # default bundle handling is a copy $data = KIWIQX::qxx ( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIRuntimeChecker.pm new/kiwi/modules/KIWIRuntimeChecker.pm --- old/kiwi/modules/KIWIRuntimeChecker.pm 2015-03-05 11:55:00.000000000 +0100 +++ new/kiwi/modules/KIWIRuntimeChecker.pm 2015-03-23 12:26:45.000000000 +0100 @@ -164,6 +164,9 @@ if (! $this -> __hasBootDescription()) { return; } + if (! $this -> __hasContainerName()) { + return; + } return 1; } @@ -226,6 +229,9 @@ if (! $this -> __hasBootDescription()) { return; } + if (! $this -> __hasContainerName()) { + return; + } return 1; } @@ -1233,6 +1239,37 @@ } #========================================== +# __hasContainerName +#------------------------------------------ +sub __hasContainerName { + # ... + # if the image type is docker or lxc a container name + # must be specified + # --- + my $this = shift; + my $kiwi = $this->{kiwi}; + my $xml = $this->{xml}; + my $bldType = $xml -> getImageType(); + if (! $bldType) { + # Nothing to check + return 1; + } + my $imgType = $bldType -> getTypeName(); + if (($imgType ne 'docker') && ($imgType ne 'lxc')) { + # Nothing to check + return 1; + } + my $container = $bldType -> getContainerName(); + if ($container) { + # Everything ok + return 1; + } + $kiwi -> error("No container name specified for $imgType build"); + $kiwi -> failed(); + return; +} + +#========================================== # __haveValidTypeString #------------------------------------------ sub __haveValidTypeString { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/armv7l/oemboot/suse-preinit new/kiwi/system/boot/armv7l/oemboot/suse-preinit --- old/kiwi/system/boot/armv7l/oemboot/suse-preinit 2015-03-12 11:53:45.000000000 +0100 +++ new/kiwi/system/boot/armv7l/oemboot/suse-preinit 2015-03-23 12:26:45.000000000 +0100 @@ -132,17 +132,12 @@ setupConsole #====================================== -# 10) create origin snapshot if possible -#-------------------------------------- -createOriginSnapshot - -#====================================== -# 11) Run user script +# 10) Run user script #-------------------------------------- runHook preCallInit #====================================== -# 12) kill udev +# 11) kill udev #-------------------------------------- udevSystemStop umountSystemFilesystems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/rhel-preinit new/kiwi/system/boot/ix86/isoboot/rhel-preinit --- old/kiwi/system/boot/ix86/isoboot/rhel-preinit 2014-12-15 14:32:48.000000000 +0100 +++ new/kiwi/system/boot/ix86/isoboot/rhel-preinit 2015-03-23 12:26:45.000000000 +0100 @@ -46,11 +46,6 @@ createFramebufferDevices #====================================== -# 6) create origin snapshot if possible -#-------------------------------------- -createOriginSnapshot - -#====================================== -# 7) clean mount +# 6) clean mount #-------------------------------------- umountSystemFilesystems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-preinit new/kiwi/system/boot/ix86/isoboot/suse-preinit --- old/kiwi/system/boot/ix86/isoboot/suse-preinit 2014-12-15 14:32:48.000000000 +0100 +++ new/kiwi/system/boot/ix86/isoboot/suse-preinit 2015-03-23 12:26:45.000000000 +0100 @@ -41,11 +41,6 @@ createFramebufferDevices #====================================== -# 5) create origin snapshot if possible -#-------------------------------------- -createOriginSnapshot - -#====================================== -# 6) clean mount +# 5) clean mount #-------------------------------------- umountSystemFilesystems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-preinit new/kiwi/system/boot/ix86/netboot/suse-preinit --- old/kiwi/system/boot/ix86/netboot/suse-preinit 2014-12-15 14:32:49.000000000 +0100 +++ new/kiwi/system/boot/ix86/netboot/suse-preinit 2015-03-23 12:26:45.000000000 +0100 @@ -125,17 +125,12 @@ kernelCheck #====================================== -# 12) create origin snapshot if possible -#-------------------------------------- -createOriginSnapshot - -#====================================== -# 13) Run user script +# 12) Run user script #-------------------------------------- runHook preCallInit #====================================== -# 14) kill udev +# 13) kill udev #-------------------------------------- udevSystemStop umountSystemFilesystems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/rhel-preinit new/kiwi/system/boot/ix86/oemboot/rhel-preinit --- old/kiwi/system/boot/ix86/oemboot/rhel-preinit 2015-03-12 11:53:04.000000000 +0100 +++ new/kiwi/system/boot/ix86/oemboot/rhel-preinit 2015-03-23 12:26:45.000000000 +0100 @@ -132,17 +132,12 @@ setupConsole #====================================== -# 10) create origin snapshot if possible -#-------------------------------------- -createOriginSnapshot - -#====================================== -# 11) Run user script +# 10) Run user script #-------------------------------------- runHook preCallInit #====================================== -# 12) kill udev +# 11) kill udev #-------------------------------------- udevSystemStop umountSystemFilesystems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-preinit new/kiwi/system/boot/ix86/oemboot/suse-preinit --- old/kiwi/system/boot/ix86/oemboot/suse-preinit 2015-03-12 11:50:58.000000000 +0100 +++ new/kiwi/system/boot/ix86/oemboot/suse-preinit 2015-03-23 12:26:45.000000000 +0100 @@ -132,17 +132,12 @@ setupConsole #====================================== -# 10) create origin snapshot if possible -#-------------------------------------- -createOriginSnapshot - -#====================================== -# 11) Run user script +# 10) Run user script #-------------------------------------- runHook preCallInit #====================================== -# 12) kill udev +# 11) kill udev #-------------------------------------- udevSystemStop umountSystemFilesystems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/rhel-preinit new/kiwi/system/boot/ix86/vmxboot/rhel-preinit --- old/kiwi/system/boot/ix86/vmxboot/rhel-preinit 2014-12-15 14:32:49.000000000 +0100 +++ new/kiwi/system/boot/ix86/vmxboot/rhel-preinit 2015-03-23 12:26:45.000000000 +0100 @@ -76,22 +76,17 @@ setupConsole #====================================== -# 9) create origin snapshot if possible -#-------------------------------------- -createOriginSnapshot - -#====================================== -# 10) update auth config +# 9) update auth config #-------------------------------------- authconfig --updateall #====================================== -# 11) Run user script +# 10) Run user script #-------------------------------------- runHook preCallInit #====================================== -# 12) kill udev +# 11) kill udev #-------------------------------------- udevSystemStop umountSystemFilesystems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/suse-preinit new/kiwi/system/boot/ix86/vmxboot/suse-preinit --- old/kiwi/system/boot/ix86/vmxboot/suse-preinit 2014-12-15 14:32:49.000000000 +0100 +++ new/kiwi/system/boot/ix86/vmxboot/suse-preinit 2015-03-23 12:26:45.000000000 +0100 @@ -76,17 +76,12 @@ setupConsole #====================================== -# 9) create origin snapshot if possible -#-------------------------------------- -createOriginSnapshot - -#====================================== -# 10) Run user script +# 9) Run user script #-------------------------------------- runHook preCallInit #====================================== -# 11) kill udev +# 10) kill udev #-------------------------------------- udevSystemStop umountSystemFilesystems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/netboot/suse-preinit new/kiwi/system/boot/ppc/netboot/suse-preinit --- old/kiwi/system/boot/ppc/netboot/suse-preinit 2014-12-15 14:32:49.000000000 +0100 +++ new/kiwi/system/boot/ppc/netboot/suse-preinit 2015-03-23 12:26:45.000000000 +0100 @@ -125,17 +125,12 @@ kernelCheck #====================================== -# 12) create origin snapshot if possible -#-------------------------------------- -createOriginSnapshot - -#====================================== -# 13) Run user script +# 12) Run user script #-------------------------------------- runHook preCallInit #====================================== -# 14) kill udev +# 13) kill udev #-------------------------------------- udevSystemStop umountSystemFilesystems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/oemboot/suse-preinit new/kiwi/system/boot/ppc/oemboot/suse-preinit --- old/kiwi/system/boot/ppc/oemboot/suse-preinit 2015-03-12 11:53:38.000000000 +0100 +++ new/kiwi/system/boot/ppc/oemboot/suse-preinit 2015-03-23 12:26:45.000000000 +0100 @@ -132,17 +132,12 @@ setupConsole #====================================== -# 10) create origin snapshot if possible -#-------------------------------------- -createOriginSnapshot - -#====================================== -# 11) Run user script +# 10) Run user script #-------------------------------------- runHook preCallInit #====================================== -# 12) kill udev +# 11) kill udev #-------------------------------------- udevSystemStop umountSystemFilesystems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/vmxboot/suse-preinit new/kiwi/system/boot/ppc/vmxboot/suse-preinit --- old/kiwi/system/boot/ppc/vmxboot/suse-preinit 2014-12-15 14:32:49.000000000 +0100 +++ new/kiwi/system/boot/ppc/vmxboot/suse-preinit 2015-03-23 12:26:45.000000000 +0100 @@ -76,17 +76,12 @@ setupConsole #====================================== -# 9) create origin snapshot if possible -#-------------------------------------- -createOriginSnapshot - -#====================================== -# 10) Run user script +# 9) Run user script #-------------------------------------- runHook preCallInit #====================================== -# 11) kill udev +# 10) kill udev #-------------------------------------- udevSystemStop umountSystemFilesystems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/netboot/suse-preinit new/kiwi/system/boot/s390/netboot/suse-preinit --- old/kiwi/system/boot/s390/netboot/suse-preinit 2014-12-15 14:32:50.000000000 +0100 +++ new/kiwi/system/boot/s390/netboot/suse-preinit 2015-03-23 12:26:45.000000000 +0100 @@ -140,17 +140,12 @@ kernelCheck #====================================== -# 14) create origin snapshot if possible -#-------------------------------------- -createOriginSnapshot - -#====================================== -# 15) Run user script +# 14) Run user script #-------------------------------------- runHook preCallInit #====================================== -# 16) kill udev +# 15) kill udev #-------------------------------------- udevSystemStop umountSystemFilesystems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/oemboot/suse-preinit new/kiwi/system/boot/s390/oemboot/suse-preinit --- old/kiwi/system/boot/s390/oemboot/suse-preinit 2015-03-12 11:53:29.000000000 +0100 +++ new/kiwi/system/boot/s390/oemboot/suse-preinit 2015-03-23 12:26:45.000000000 +0100 @@ -158,17 +158,12 @@ fi #====================================== -# 12) create origin snapshot if possible -#-------------------------------------- -createOriginSnapshot - -#====================================== -# 13) Run user script +# 12) Run user script #-------------------------------------- runHook preCallInit #====================================== -# 14) kill udev +# 13) kill udev #-------------------------------------- udevSystemStop umountSystemFilesystems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/vmxboot/suse-preinit new/kiwi/system/boot/s390/vmxboot/suse-preinit --- old/kiwi/system/boot/s390/vmxboot/suse-preinit 2014-12-15 14:32:50.000000000 +0100 +++ new/kiwi/system/boot/s390/vmxboot/suse-preinit 2015-03-23 12:26:45.000000000 +0100 @@ -102,17 +102,12 @@ fi #====================================== -# 11) create origin snapshot if possible -#-------------------------------------- -createOriginSnapshot - -#====================================== -# 12) Run user script +# 11) Run user script #-------------------------------------- runHook preCallInit #====================================== -# 13) kill udev +# 12) kill udev #-------------------------------------- udevSystemStop umountSystemFilesystems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/lib/Test/kiwiContainerConfigWriter.pm new/kiwi/tests/unit/lib/Test/kiwiContainerConfigWriter.pm --- old/kiwi/tests/unit/lib/Test/kiwiContainerConfigWriter.pm 2014-12-15 14:32:51.000000000 +0100 +++ new/kiwi/tests/unit/lib/Test/kiwiContainerConfigWriter.pm 2015-03-23 12:26:45.000000000 +0100 @@ -329,10 +329,9 @@ . 'lxc.mount.entry = /etc/resolv.conf ' . '/var/lib/lxc/testCont/rootfs/etc/resolv.conf none ' . 'bind,ro 0 0' . "\n\n" - . '#When the host system has lxc >= 0.8.0 uncoment the ' - . 'following line' . "\n" - . '#lxc.autodev=1' . "\n" + . 'lxc.autodev=1' . "\n" . 'lxc.tty = 4' . "\n" + . 'lxc.kmsg = 0' . "\n" . 'lxc.pts = 1024' . "\n" . 'lxc.rootfs = /var/lib/lxc/mycontainer/rootfs' . "\n" . 'lxc.mount = /etc/lxc/mycontainer/fstab' . "\n\n" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
