Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2015-07-19 11:44:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-07-05 17:56:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2015-07-19 11:44:37.000000000 +0200 @@ -1,0 +2,195 @@ +Fri Jul 10 11:23:06 CEST 2015 - [email protected] + +- v7.03.5 released + +------------------------------------------------------------------- +Fri Jul 10 10:50:54 CEST 2015 - [email protected] + +- Use by-uuid device names for livestick tool + +------------------------------------------------------------------- +Wed Jul 8 15:18:23 CEST 2015 - [email protected] + +- DB: rebuild documentation + +------------------------------------------------------------------- +Tue Jul 7 11:45:57 CEST 2015 - [email protected] + +- Added __checkImageIncludeApplicable runtime check + + The imageinclude attribute is currently not supported with all + URI types. Therefore we test if the repo URL uses obs|iso and + provide a message to the user. If we want to support this in the + future for obs URI types the imageinclude feature has to auto + map the obs URI into the correct http URI which will only work + for repositories in the public part of the open buildservice + This Fixes #472 + +------------------------------------------------------------------- +Tue Jul 7 10:03:56 CEST 2015 - [email protected] + +- v7.03.4 released + +------------------------------------------------------------------- +Tue Jul 7 10:01:29 CEST 2015 - [email protected] + +- Fixed createOVFConfiguration + + Make sure destination directory exists prior to moving data + +------------------------------------------------------------------- +Mon Jul 6 14:44:32 CEST 2015 - [email protected] + +- Increase fsoverhead for btrfs + +------------------------------------------------------------------- +Wed Jul 1 16:07:43 CEST 2015 - [email protected] + +- v7.03.3 released + +------------------------------------------------------------------- +Wed Jul 1 15:38:38 CEST 2015 - [email protected] + +- Follow up Fix for grub2 setup on btrfs + + Only if no bootpartition is used and a volume setup exists + it's required to adapt the boot path with the initial '@' + subvolume + +------------------------------------------------------------------- +Wed Jul 1 09:04:12 CEST 2015 - [email protected] + +- Update examples, don't use clicfs + +------------------------------------------------------------------- +Mon Jun 29 17:27:58 CEST 2015 - [email protected] + +- v7.03.2 released + +------------------------------------------------------------------- +Mon Jun 29 17:27:33 CEST 2015 - [email protected] + +- DB: rebuild documentation + +------------------------------------------------------------------- +Mon Jun 29 17:24:29 CEST 2015 - [email protected] + +- v7.03.1 released + +------------------------------------------------------------------- +Mon Jun 29 17:06:39 CEST 2015 - [email protected] + +- DB: rebuild documentation + +------------------------------------------------------------------- +Mon Jun 29 16:40:53 CEST 2015 - [email protected] + +- Editorial review Chapter 19-20 + +------------------------------------------------------------------- +Mon Jun 29 16:26:49 CEST 2015 - [email protected] + +- Editorial review Chapter 16 + +------------------------------------------------------------------- +Mon Jun 29 16:23:56 CEST 2015 - [email protected] + +- Fixed __checkPreferencesDefinition runtime check + + The check for the uniqueness of the profile name is based on + a regular expression. However the expression matches a subset + of names which causes 'foo' and 'foofoo' to be triggered as + the same name + +------------------------------------------------------------------- +Mon Jun 29 16:22:04 CEST 2015 - [email protected] + +- Update SLE12 JeOS + + Added Xen HVM type setup to be referenced in the documentation + Deleted ec2 image build. This will eventually become a new chapter + referencing the images as we build it in the buildservice later + +------------------------------------------------------------------- +Mon Jun 29 14:54:01 CEST 2015 - [email protected] + +- Editorial review Chapter 17 + + EC2 documentation deleted, this chapter needs a rewrite + with regards to tools developed in the public cloud + development team. I would also not mention any sequence + to support s3 baked images, we should focus on EBS + baked images + +------------------------------------------------------------------- +Mon Jun 29 12:28:28 CEST 2015 - [email protected] + +- v7.02.58 released + +------------------------------------------------------------------- +Mon Jun 29 12:15:05 CEST 2015 - [email protected] + +- Add uuid support in createFilesystem for btrfs + +------------------------------------------------------------------- +Fri Jun 26 19:16:57 CEST 2015 - [email protected] + +- Update documentation structure for DAPS + + DAPS is the toolkit used in the documentation department to + build, validate and submit documentation. The kiwi documentation + will be integrated into the SUSE documentation department + and therefore the structure in the source repository needs + to be compatible with the SUSE documentation process + +------------------------------------------------------------------- +Wed Jun 24 16:59:58 CEST 2015 - [email protected] + +- Fixed custom image size use + + Allow use of the custom image size even if it is smaller than + the kiwi calculated one. Especially for the btrfs filesystem + the calculation is sometimes not accurate enough + +------------------------------------------------------------------- +Mon Jun 22 16:29:23 CEST 2015 - [email protected] + +- Fixed shell variable quoting in compare statements + +------------------------------------------------------------------- +Mon Jun 22 16:28:32 CEST 2015 - [email protected] + +- Prevent createHybridPersistent waiting for devs + + Check if the write partition creation returns success before + waiting for the expected device to become created. This prevents + a long wait period on a device which never will come up if the + partition could not be created. This Fixes #466 + +------------------------------------------------------------------- +Mon Jun 22 11:07:35 CEST 2015 - [email protected] + +- Fixed legacy grub install for install stick images + + Installing legacy grub can happen using the image grub or the + build host grub. However for install stick disks there is no + grub in the install image even if it is present in the system + image the stick installs. Therefore the host installed grub + should be used as a fallback. This Fixes #471 + +------------------------------------------------------------------- +Sun Jun 21 21:52:34 CEST 2015 - [email protected] + +- Changed search for boot from hardisk for efi + + Instead of looking for a fixed partition id, let grub2 + search for the EFI label + +------------------------------------------------------------------- +Sat Jun 20 23:13:40 CEST 2015 - [email protected] + +- Fixed RHEL 6 JeOS template + + default bootloader for this distribution is grub not grub2 + +------------------------------------------------------------------- @@ -13,0 +209,17 @@ +Fri Jun 19 11:26:11 CEST 2015 - [email protected] ++++ 51 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/kiwi/kiwi.changes ++++ and /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.FtIbNz/_old 2015-07-19 11:44:40.000000000 +0200 +++ /var/tmp/diff_new_pack.FtIbNz/_new 2015-07-19 11:44:40.000000000 +0200 @@ -27,7 +27,7 @@ Name: kiwi License: GPL-2.0 Group: System/Management -Version: 7.02.57 +Version: 7.03.5 Provides: kiwi-schema = 6.2 Provides: kiwi-image:aci Provides: kiwi-image:lxc ++++++ kiwi-docu.tar.bz2 ++++++ ++++ 36566 lines of diff (skipped) ++++++ 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 2014-12-15 14:32:44.000000000 +0100 @@ -1 +1 @@ -a30ba0572f3aea37bd09ef435165b10574bd6285 +8a9dbd06e83f3d8c5eefd78f88672bf9efe5c01c 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 2015-06-19 12:05:58.000000000 +0200 +++ new/kiwi/modules/KIWIBoot.pm 2015-07-08 15:06:43.000000000 +0200 @@ -343,7 +343,7 @@ my $sizeBytes; my $minInodes; my $sizeXMLBytes = 0; - my $fsoverhead = 1.2; + my $fsoverhead = $type{filesystem} =~ /btrfs/ ? 1.3 : 1.2; my $fsopts = $cmdL -> getFilesystemOptions(); my $inodesize = $fsopts -> getInodeSize(); my $inoderatio = $fsopts -> getInodeRatio(); @@ -3689,8 +3689,13 @@ return; } my $bootpath = '/boot'; - if (($typeinfo->{filesystem} eq 'btrfs') && ($type ne 'iso')) { - $bootpath = '/@/boot'; + if (($type ne 'iso') && (! $this->{needBootP})) { + if (($typeinfo->{filesystem} eq 'btrfs') && ($this->{sysdisk})) { + my $volumes = $this->{sysdisk} -> getVolumes(); + if (($volumes) && (keys %{$volumes} > 0)) { + $bootpath = '/@/boot'; + } + } } if ($uuid) { print $bpfd "search --fs-uuid --set=root $uuid"; @@ -4376,9 +4381,14 @@ my $ascii = 'ascii.pf2'; my $fodir = '/boot/grub2/themes/'; my $bootpath = '/boot'; - if (($type->{filesystem} eq 'btrfs') && (! $iso)) { - $bootpath = '/@/boot'; - $fodir = '/@/boot/grub2/themes/'; + if ((! $iso) && (! $this->{needBootP})) { + if (($type->{filesystem} eq 'btrfs') && ($this->{sysdisk})) { + my $volumes = $this->{sysdisk} -> getVolumes(); + if (($volumes) && (keys %{$volumes} > 0)) { + $bootpath = '/@/boot'; + $fodir = '/@/boot/grub2/themes/'; + } + } } my @fonts = ( "DejaVuSans-Bold14.pf2", @@ -4498,7 +4508,7 @@ print $FD 'menuentry "Boot from Hard Disk"'; print $FD ' --class opensuse --class os {'."\n"; if (($firmware eq "efi") || ($firmware eq "uefi")) { - print $FD "\t"."set root='hd0,1'"."\n"; + print $FD "\t"."search --set=root --label EFI"."\n"; my $prefix = '(${root})/EFI/BOOT'; if ($arch eq 'x86_64') { print $FD "\t"."chainloader $prefix/bootx64.efi"."\n"; @@ -5766,12 +5776,17 @@ # Install grub in batch mode #------------------------------------------ my $grub; + my $image_grub; if ($haveTree) { - # Use image root system grub + # Try to use image root system grub $grub = $locator -> getExecPath ('grub', $system); - } else { - # Use host system grub + } + if (! $grub) { + # Use host system grub if not found in system tree $grub = $locator -> getExecPath ('grub'); + } else { + # Found grub in image, use it + $image_grub = 1; } if (! $grub) { $kiwi -> failed (); @@ -5788,7 +5803,7 @@ return; } my $gopts = "--device-map $dmfile --no-floppy --batch"; - if ($haveTree) { + if ($image_grub) { # Use image root system grub my $basedir_disk = dirname ($diskname); my $basedir_tmp = $tmpdir; @@ -7646,10 +7661,9 @@ my $reqMBytes = int ($reqBytes / 1048576); if ($reqMBytes < $this->{vmmbyte}) { $kiwi -> warning ( - "given disk size is smaller than calculated size" + "given disk size is smaller than calculated size, using it anyhow" ); - $kiwi -> skipped (); - return $this; + $kiwi -> oops (); } #========================================== # Create vmsize MB string and vmmbyte value 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-06-19 14:12:00.000000000 +0200 +++ new/kiwi/modules/KIWIGlobals.pm 2015-07-10 11:23:02.000000000 +0200 @@ -1942,7 +1942,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "7.02.57"; + $data{Version} = "7.03.5"; $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 2015-05-28 16:00:28.000000000 +0200 +++ new/kiwi/modules/KIWIImageFormat.pm 2015-07-08 15:06:43.000000000 +0200 @@ -1266,6 +1266,7 @@ } } KIWIQX::qxx ("mv $ovfdir $ovfdir.tmp"); + KIWIQX::qxx ("mkdir -p $destdir"); KIWIQX::qxx ("mv -f $ovfdir.tmp/* $destdir"); KIWIQX::qxx ("rmdir $ovfdir.tmp"); return $ovf; 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-06-19 11:35:26.000000000 +0200 +++ new/kiwi/modules/KIWILinuxRC.sh 2015-07-08 15:06:43.000000000 +0200 @@ -32,6 +32,7 @@ export enablePlymouth=1 export IFS_ORIG=$IFS export MEDIACHECK_OK_TIMER=5 +export partitionerWriteStatus=0 #====================================== # lookup @@ -5727,19 +5728,19 @@ if lookup sgdisk &>/dev/null;then # map to short gdisk code echo $(sgdisk -p $1 | grep -E "^ $2") | cut -f6 -d ' ' - elif [ $name = "lxroot" ];then + elif [ "$name" = "lxroot" ];then # map lxroot to MBR type 83 (linux) echo 83 - elif [ $name = "lxswap" ];then + elif [ "$name" = "lxswap" ];then # map lxswap to MBR type 82 (linux swap) echo 82 - elif [ $name = "lxlvm" ];then + elif [ "$name" = "lxlvm" ];then # map lxlvm to MBR type 8e (linux LVM) echo 8e - elif [ $name = "UEFI" ];then + elif [ "$name" = "UEFI" ];then # map UEFI to MBR type 6 (fat 16) echo 6 - elif [ $name = "legacy" ];then + elif [ "$name" = "legacy" ];then # map bios grub legacy partition to MBR type ef (EFI) echo ef else @@ -8841,6 +8842,12 @@ #====================================== # check partition device node #-------------------------------------- + if [ $partitionerWriteStatus != 0 ];then + Echo "Partition creation failed for device $device" + Echo "Persistent writing deactivated" + unset kiwi_hybridpersistent + return + fi if ! waitForStorageDevice $(ddn $device $pID);then Echo "Partition $pID on $device doesn't appear... fatal !" Echo "Persistent writing deactivated" @@ -8874,7 +8881,8 @@ echo "w" >> $input echo "q" >> $input fdasd $imageDiskDevice < $input 1>&2 - if test $? != 0; then + export partitionerWriteStatus=$? + if test $partitionerWriteStatus != 0; then systemException "Failed to create partition table" "reboot" fi udevPending @@ -8990,13 +8998,14 @@ if [ $PARTED_HAVE_ALIGN -eq 1 ];then opts="-a cyl" fi - if ! parted $opts -m -s $device unit cyl $cmds;then + parted $opts -m -s $device unit cyl $cmds + export partitionerWriteStatus=$? + if [ $partitionerWriteStatus != 0 ];then if [ ! -z "$kiwi_hybridpersistent" ];then # /.../ - # in case of a iso hybrid table don't stop with - # a reboot exception in case of an error. The error - # in this case will cause the deactivation of the - # persistent writing + # in case of a iso hybrid table don't stop with a fatal reboot + # exception on error. In this case we want to proceed with the + # boot process but deactivate the persistent write feature # ---- return 1 fi @@ -9457,13 +9466,9 @@ fi elif [ "$FSTYPE" = "btrfs" ];then opts="-f" - # Unfortunately mkfs.btrfs does not support the option -U in the - # version we have in SLES11 SP3. Thus support for this will be - # turned on after SLES11 SP4 will be released - # - # if [ ! -z "$uuid" ];then - # opts="$opts -U $uuid" - # fi + if [ ! -z "$uuid" ];then + opts="$opts -U $uuid" + fi if [ ! -z "$blocks" ];then local bytes=$((blocks * 4096)) opts="$opts -b $bytes" 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-06-19 11:35:26.000000000 +0200 +++ new/kiwi/modules/KIWIRuntimeChecker.pm 2015-07-08 15:06:43.000000000 +0200 @@ -108,6 +108,9 @@ # Runtime checks specific to the create step # --- my $this = shift; + if (! $this -> __checkImageIncludeApplicable()) { + return; + } if (! $this -> __checkBootPartitionOverlaySystem()) { return; } @@ -194,6 +197,9 @@ # Runtime checks specific to the prepare step # --- my $this = shift; + if (! $this -> __checkImageIncludeApplicable()) { + return; + } if (! $this -> __checkVolumeSetup()) { return; } @@ -857,6 +863,38 @@ } return 1; } + +#========================================== +# __checkImageIncludeApplicable +#------------------------------------------ +sub __checkImageIncludeApplicable { + # ... + # Verify that repos marked as to be included into the image + # are not only internally available + # --- + my $this = shift; + my $xml = $this->{xml}; + my $kiwi = $this->{kiwi}; + my @repos = @{$xml -> getRepositories()}; + my $msg; + for my $repo (@repos) { + my $image_include = $repo -> getImageInclude(); + my $source_path = $repo -> getPath(); + if ((! $image_include) || ($image_include eq 'false')) { + next; + } + if ($source_path =~ /^(obs|iso):/) { + $msg = "Including of $1 typed repos into the image " + . "is currently not supported, please use standard " + . "URL protocols like http|https together with " + . "the imageinclude attribute"; + $kiwi -> error ( $msg ); + $kiwi -> failed (); + return; + } + } + return 1; +} #========================================== # __checkTargetLocation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIXMLValidator.pm new/kiwi/modules/KIWIXMLValidator.pm --- old/kiwi/modules/KIWIXMLValidator.pm 2015-05-18 13:10:35.000000000 +0200 +++ new/kiwi/modules/KIWIXMLValidator.pm 2015-07-08 15:06:43.000000000 +0200 @@ -997,7 +997,7 @@ if (! $profName) { $numProfilesAttr++; } else { - if (grep { /$profName/x } @usedProfs) { + if (grep { /^$profName$/x } @usedProfs) { my $msg = 'Only one <preferences> element may reference a ' . "given profile. $profName referenced multiple times."; $kiwi -> error ($msg); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/ix86/rhel-06.0-JeOS/config.xml new/kiwi/template/ix86/rhel-06.0-JeOS/config.xml --- old/kiwi/template/ix86/rhel-06.0-JeOS/config.xml 2015-05-28 16:28:16.000000000 +0200 +++ new/kiwi/template/ix86/rhel-06.0-JeOS/config.xml 2015-07-01 09:02:28.000000000 +0200 @@ -30,7 +30,7 @@ <hwclock>utc</hwclock> <rpm-check-signatures>false</rpm-check-signatures> <type image="iso" primary="true" boot="isoboot/rhel-06.0" flags="compressed" firmware="bios"/> - <type bootloader="grub2" image="vmx" boot="vmxboot/rhel-06.0" filesystem="ext3" format="vmdk" kernelcmdline="rhgb"> + <type bootloader="grub" image="vmx" boot="vmxboot/rhel-06.0" filesystem="ext3" format="vmdk" kernelcmdline="rhgb"> <machine memory="1024" guestOS="rhel6"> <vmdisk id="0" controller="ide"/> <vmnic driver="e1000" interface="0" mode="bridged"/> @@ -39,7 +39,7 @@ <volume name="home" freespace="200M"/> </systemdisk> </type> - <type bootloader="grub2" image="oem" boot="oemboot/rhel-06.0" filesystem="ext3" installiso="true"> + <type bootloader="grub" image="oem" boot="oemboot/rhel-06.0" filesystem="ext3" installiso="true"> <oemconfig> <oem-systemsize>2048</oem-systemsize> <oem-swap>true</oem-swap> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/ix86/suse-SLE12-JeOS/config.xml new/kiwi/template/ix86/suse-SLE12-JeOS/config.xml --- old/kiwi/template/ix86/suse-SLE12-JeOS/config.xml 2015-06-19 11:35:26.000000000 +0200 +++ new/kiwi/template/ix86/suse-SLE12-JeOS/config.xml 2015-07-08 15:06:43.000000000 +0200 @@ -8,8 +8,11 @@ </description> <profiles> <profile name="xenFlavour" description="VMX with Xen kernel"/> - <profile name="ec2Flavour" description="VMX with EC2/Xen kernel"/> + <profile name="xenFlavourHVM" description="VMX with default kernel plus xen modules"/> <profile name="vmxFlavour" description="VMX with default kernel" import="true"/> + <profile name="docker" description="docker image"/> + <profile name="vagrant" description="vagrant base box for libvirt"/> + <profile name="netboot" description="compressed rootfs image for pxe"/> </profiles> <preferences> <type image="iso" primary="true" boot="isoboot/suse-SLES12" flags="overlay" hybrid="true" firmware="efi" kernelcmdline="splash"/> @@ -24,8 +27,29 @@ <rpm-excludedocs>true</rpm-excludedocs> <rpm-check-signatures>false</rpm-check-signatures> </preferences> - <preferences profiles="ec2Flavour"> - <type image="vmx" filesystem="ext3" boot="vmxboot/suse-SLES12" bootprofile="ec2" bootkernel="ec2k" bootloader="grub2" kernelcmdline="xencons=xvc0 console=xvc0 multipath=off splash" firmware="ec2"/> + <preferences profiles="netboot"> + <type image="pxe" filesystem="overlayfs" boot="netboot/suse-SLES12"> + <pxedeploy server="192.168.100.2" blocksize="4096"> + <partitions device="/dev/sda"> + <partition type="swap" number="1" size="5"/> + <partition type="L" number="2" size="image" mountpoint="/" target="true"/> + <partition type="L" number="3" target="false"/> + </partitions> + <union ro="/dev/sda2" rw="/dev/sda3" type="overlayfs"/> + </pxedeploy> + </type> + </preferences> + <preferences profiles="vagrant"> + <type image="vmx" filesystem="ext3" boot="vmxboot/suse-SLES12" format="vagrant" bootloader="grub2" kernelcmdline="nomodeset" boottimeout="2"> + <vagrantconfig provider="libvirt" virtualsize="16"/> + <size unit="G">10</size> + </type> + </preferences> + <preferences profiles="docker"> + <type image="docker" container="system"/> + </preferences> + <preferences profiles="xenFlavourHVM"> + <type image="vmx" filesystem="ext3" boot="vmxboot/suse-SLES12" bootloader="grub2" kernelcmdline="splash"/> </preferences> <preferences profiles="xenFlavour"> <type image="vmx" filesystem="ext3" boot="vmxboot/suse-SLES12" bootprofile="xen" bootkernel="xenk" bootloader="grub2" kernelcmdline="splash"> @@ -63,6 +87,9 @@ </machine> </type> </preferences> + <users group="vagrant" profiles="vagrant"> + <user name="vagrant" password="vh4vw1N4alxKQ" home="/home/vagrant"/> + </users> <users group="root"> <user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root"/> </users> @@ -114,23 +141,31 @@ <packages type="iso"> <package name="gfxboot-branding-SLE" bootinclude="true" bootdelete="true"/> </packages> - <packages type="image" profiles="ec2Flavour"> - <package name="kernel-ec2" replaces="kernel-default"/> - <package name="kernel-ec2" replaces="kernel-xen"/> + <packages type="image" profiles="xenFlavourHVM"> + <package name="kernel-default" replaces="kernel-xen"/> + <package name="grub2-x86_64-xen" bootinclude="true"/> + <package name="xen-kmp-default" bootinclude="true"/> + <package name="xen-libs" arch="x86_64" replaces=""/> + <package name="xen-tools-domU" arch="x86_64" replaces=""/> <package name="xen-tools" arch="x86_64" replaces=""/> <package name="xen" arch="x86_64" replaces=""/> + <package name="gfxboot-branding-SLE" bootinclude="true" bootdelete="true"/> </packages> <packages type="image" profiles="xenFlavour"> <package name="kernel-xen" replaces="kernel-default"/> - <package name="kernel-xen" replaces="kernel-ec2"/> + <package name="kernel-xen" replaces="xen-kmp-default"/> + <package name="xen-libs" arch="x86_64" replaces=""/> + <package name="xen-tools-domU" arch="x86_64" replaces=""/> <package name="xen-tools" arch="x86_64" replaces=""/> <package name="xen" arch="x86_64" replaces=""/> <package name="gfxboot-branding-SLE" bootinclude="true" bootdelete="true"/> </packages> <packages type="image" profiles="vmxFlavour"> <package name="kernel-default" replaces="kernel-xen"/> - <package name="kernel-default" replaces="kernel-ec2"/> + <package name="kernel-default" replaces="xen-kmp-default"/> + <package name="kernel-default" replaces="xen-libs"/> <package name="kernel-default" replaces="xen-tools"/> + <package name="kernel-default" replaces="xen-tools-domU"/> <package name="kernel-default" replaces="xen"/> <package name="gfxboot-branding-SLE" bootinclude="true" bootdelete="true"/> </packages> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/ix86/suse-SLE12-JeOS/root/home/vagrant/.ssh/authorized_keys new/kiwi/template/ix86/suse-SLE12-JeOS/root/home/vagrant/.ssh/authorized_keys --- old/kiwi/template/ix86/suse-SLE12-JeOS/root/home/vagrant/.ssh/authorized_keys 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi/template/ix86/suse-SLE12-JeOS/root/home/vagrant/.ssh/authorized_keys 2015-07-08 15:06:43.000000000 +0200 @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== vagrant insecure public key diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tools/livestick/livestick new/kiwi/tools/livestick/livestick --- old/kiwi/tools/livestick/livestick 2014-12-15 14:32:52.000000000 +0100 +++ new/kiwi/tools/livestick/livestick 2015-07-10 10:49:31.000000000 +0200 @@ -58,6 +58,7 @@ echo "Need a stick disk device not a partition" clean fi +kiwi_devicepersistency=by-uuid device_disk=$(getDiskID $disk) device_part=$(getDiskID $(ddn $(dn $device_disk) 1)) if [ ! -e "$device_disk" ];then @@ -186,7 +187,7 @@ echo Loading live system... loopback loop /boot/$image_base echo Loading linux... - linux (loop)/boot/$arch/loader/linux $cmdline_std quiet + linux (loop)/boot/$arch/loader/linux $cmdline_std echo Loading initrd... initrd (loop)/boot/$arch/loader/initrd } @@ -195,7 +196,7 @@ echo Loading live system... loopback loop /boot/$image_base echo Loading linux... - linux (loop)/boot/$arch/loader/linux $cmdline_fsf quiet + linux (loop)/boot/$arch/loader/linux $cmdline_fsf echo Loading initrd... initrd (loop)/boot/$arch/loader/initrd }
