Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2014-10-07 18:23:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-10-02 14:13:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2014-10-07 18:23:44.000000000 +0200 @@ -1,0 +2,44 @@ +Mon Oct 6 11:15:44 CEST 2014 - ms@suse.de + +- v7.01.6 released + +------------------------------------------------------------------- +Mon Oct 6 11:14:39 CEST 2014 - ms@suse.de + +- Added bundle task for GCE images + +------------------------------------------------------------------- +Thu Oct 2 18:06:12 CEST 2014 - ms@suse.de + +- Fixup createGoogleComputeEngine + + no paths allowed inside the tarball, only the disk.raw + they are really strict on their checks :-) + +------------------------------------------------------------------- +Thu Oct 2 14:23:10 CEST 2014 - ms@suse.de + +- Fixup createGoogleComputeEngine + + There are some conventions around the naming and content of + a GCE tarball. This patch hopefully addresses all of them + +------------------------------------------------------------------- +Thu Oct 2 11:41:37 CEST 2014 - ms@suse.de + +- Added sudo to package list for SLE12 JeOS template + +------------------------------------------------------------------- +Thu Oct 2 11:05:07 CEST 2014 - ms@suse.de + +- Update SLE12 JeOS template to provide a kiwi user + +------------------------------------------------------------------- +Thu Oct 2 10:54:06 CEST 2014 - ms@suse.de + +- Added support for format="gce" + + This is for creating Google Compute Engine ready images to be + uploaded into a bucket in the google cloud storage via gsutil + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.Drq9FD/_old 2014-10-07 18:23:46.000000000 +0200 +++ /var/tmp/diff_new_pack.Drq9FD/_new 2014-10-07 18:23:46.000000000 +0200 @@ -26,7 +26,7 @@ Group: System/Management Url: http://github.com/openSUSE/kiwi Name: kiwi -Version: 7.01.5 +Version: 7.01.6 Release: 0 Provides: kiwi-image:lxc Provides: kiwi-image:tbz ++++++ 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-09-16 14:54:54.000000000 +0200 +++ new/kiwi/.revision 2014-09-16 14:54:54.000000000 +0200 @@ -1 +1 @@ -a7498fcf3652f7de59df10d349b2b501f069d379 +d89ede6b8b994af3070c32ddf61ad50a51fdd0e9 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-10-02 09:39:15.000000000 +0200 +++ new/kiwi/modules/KIWIGlobals.pm 2014-10-06 11:15:38.000000000 +0200 @@ -1835,7 +1835,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "7.01.5"; + $data{Version} = "7.01.6"; $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-09-30 16:55:41.000000000 +0200 +++ new/kiwi/modules/KIWIImageFormat.pm 2014-10-02 17:56:57.000000000 +0200 @@ -124,6 +124,7 @@ #========================================== # Store object data #------------------------------------------ + $this->{type} = $type; $this->{cmdL} = $cmdL; $this->{vmdata} = $vconf; $this->{kiwi} = $kiwi; @@ -204,6 +205,9 @@ } elsif ($format eq "qcow2") { $kiwi -> info ("Starting raw => $format conversion\n"); return $this -> createQCOW2(); + } elsif ($format eq "gce") { + $kiwi -> info ("Starting raw => $format conversion\n"); + return $this -> createGoogleComputeEngine(); } else { $kiwi -> warning ( "Can't convert image type $imgtype to $format format" @@ -510,6 +514,61 @@ } #========================================== +# createGoogleComputeEngine +#------------------------------------------ +sub createGoogleComputeEngine { + my $this = shift; + my $kiwi = $this->{kiwi}; + my $source = $this->{image}; + my $type = $this->{type}; + my $xml = $this->{xml}; + my $target = $source; + my $src_dirname = dirname $source; + my $gce_source = $src_dirname."/disk.raw"; + my $boot = $type -> getBootImageDescript(); + my $version = $xml -> getPreferences() -> getVersion(); + my $status; + my $result; + my $dist; + $kiwi -> info ("Creating Google Compute Engine image..."); + if (! $boot) { + $kiwi -> failed (); + $kiwi -> error ("Couldn't find boot image information"); + $kiwi -> failed (); + return; + } + if ($boot =~ /.*-(.*)$/) { + $dist = $1; + $dist = lc $dist; + } else { + $kiwi -> failed (); + $kiwi -> error ( + "Failed to extract distribution from boot attribute: $boot" + ); + $kiwi -> failed (); + return; + } + $target = $dist."-guest-gce-".$version.".tar.gz"; + $status = KIWIQX::qxx ("mv $source $gce_source 2>&1"); + $result = $? >> 8; + if ($result == 0) { + $status = KIWIQX::qxx ( + "cd $src_dirname && tar --format=gnu -cSzf $target disk.raw 2>&1" + ); + $result = $? >> 8; + } + KIWIQX::qxx ("mv $gce_source $source 2>&1"); + if ($result != 0) { + $kiwi -> failed (); + $kiwi -> error ("Couldn't create gce image: $status"); + $kiwi -> failed (); + return; + } + $kiwi -> done (); + return $src_dirname."/".$target; +} + +#========================================== # createVagrantBox #------------------------------------------ sub createVagrantBox { 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 2014-09-15 16:02:54.000000000 +0200 +++ new/kiwi/modules/KIWIResult.pm 2014-10-06 11:13:34.000000000 +0200 @@ -398,6 +398,19 @@ if (! $format) { return $this -> __bundleExtension ('raw'); } + if ($format eq 'gce') { + my @archives = glob ("$source/*gce-*.tar.gz"); + if (! @archives) { + $kiwi -> error ("No GCE archive(s) found"); + $kiwi -> failed (); + return; + } + foreach my $archive (@archives) { + if ($archive =~ /$source\/(.*gce-.*)\.tar\.gz/) { + return $this -> __bundleExtension ('tar.gz', $1); + } + } + } if ($format eq 'vagrant') { my @boxes = glob ("$source/$base.*.box"); if (! @boxes) { 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-09-30 16:44:22.000000000 +0200 +++ new/kiwi/modules/KIWISchema.rnc 2014-10-02 10:45:09.000000000 +0200 @@ -1676,7 +1676,7 @@ ## Error message than we receive from the parser. ## To be remove from here by the end of 2014 attribute format { - "ec2" | "ovf" | "ova" | "qcow2" | "vagrant" | "vmdk" | + "ec2" | "gce" | "ovf" | "ova" | "qcow2" | "vagrant" | "vmdk" | "vdi" | "vhd" | "vhd-fixed" } k.type.fsnocheck.attribute = 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-09-30 16:44:29.000000000 +0200 +++ new/kiwi/modules/KIWISchema.rng 2014-10-02 10:45:43.000000000 +0200 @@ -2250,6 +2250,7 @@ To be remove from here by the end of 2014</a:documentation> <choice> <value>ec2</value> + <value>gce</value> <value>ovf</value> <value>ova</value> <value>qcow2</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-09-15 16:02:54.000000000 +0200 +++ new/kiwi/modules/KIWIXMLTypeData.pm 2014-10-02 10:45:27.000000000 +0200 @@ -2170,7 +2170,7 @@ return; } my %supported = map { ($_ => 1) } qw( - ec2 ovf ova qcow2 raw vmdk vdi vhd vhd-fixed vagrant + ec2 gce ovf ova qcow2 raw vmdk vdi vhd vhd-fixed vagrant ); if (! $supported{$format} ) { my $msg = "$caller: specified format '$format' is not " 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 2014-09-30 17:05:47.000000000 +0200 +++ new/kiwi/template/ix86/suse-SLE12-JeOS/config.xml 2014-10-02 11:41:33.000000000 +0200 @@ -65,6 +65,9 @@ <users group="root"> <user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root"/> </users> + <users group='kiwi'> + <user name='kiwi' password='2exADvrjjX/kk' home='/home/kiwi'/> + </users> <repository type="rpm-md"> <source path="http://download.suse.de/ibs/SUSE:/SLE-12:/GA/standard/"/> </repository> @@ -94,6 +97,9 @@ <package name="kiwi-desc-vmxboot"/> <package name="kiwi-desc-netboot"/> <package name="openssh"/> + <package name="rsync"/> + <package name="psmisc"/> + <package name="sudo"/> </packages> <packages type="iso"> <package name="gfxboot-branding-SLE" bootinclude="true" bootdelete="true"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/ix86/suse-SLE12-JeOS/root/etc/ssh/sshd_config new/kiwi/template/ix86/suse-SLE12-JeOS/root/etc/ssh/sshd_config --- old/kiwi/template/ix86/suse-SLE12-JeOS/root/etc/ssh/sshd_config 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi/template/ix86/suse-SLE12-JeOS/root/etc/ssh/sshd_config 2014-10-02 11:04:25.000000000 +0200 @@ -0,0 +1,138 @@ +# $OpenBSD: sshd_config,v 1.89 2013/02/06 00:20:42 dtucker Exp $ + +# This is the sshd server system-wide configuration file. See +# sshd_config(5) for more information. + +# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin + +# The strategy used for options in the default sshd_config shipped with +# OpenSSH is to specify options with their default value where +# possible, but leave them commented. Uncommented options override the +# default value. + +#Port 22 +#AddressFamily any +#ListenAddress 0.0.0.0 +#ListenAddress :: + +# The default requires explicit activation of protocol 1 +#Protocol 2 + +# HostKey for protocol version 1 +#HostKey /etc/ssh/ssh_host_key +# HostKeys for protocol version 2 +#HostKey /etc/ssh/ssh_host_rsa_key +#HostKey /etc/ssh/ssh_host_dsa_key +#HostKey /etc/ssh/ssh_host_ecdsa_key + +# Lifetime and size of ephemeral version 1 server key +#KeyRegenerationInterval 1h +#ServerKeyBits 1024 + +# Logging +# obsoletes QuietMode and FascistLogging +#SyslogFacility AUTH +#LogLevel INFO + +# Authentication: + +#LoginGraceTime 2m +#PermitRootLogin yes +#StrictModes yes +#MaxAuthTries 6 +#MaxSessions 10 + +#RSAAuthentication yes +#PubkeyAuthentication yes + +# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2 +# but this is overridden so installations will only check .ssh/authorized_keys +AuthorizedKeysFile .ssh/authorized_keys + +#AuthorizedPrincipalsFile none + +#AuthorizedKeysCommand none +#AuthorizedKeysCommandUser nobody + +# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts +#RhostsRSAAuthentication no +# similar for protocol version 2 +#HostbasedAuthentication no +# Change to yes if you don't trust ~/.ssh/known_hosts for +# RhostsRSAAuthentication and HostbasedAuthentication +#IgnoreUserKnownHosts no +# Don't read the user's ~/.rhosts and ~/.shosts files +#IgnoreRhosts yes + +# To disable tunneled clear text passwords, change to no here! +PasswordAuthentication no +#PermitEmptyPasswords no + +# Change to no to disable s/key passwords +#ChallengeResponseAuthentication yes + +# Kerberos options +#KerberosAuthentication no +#KerberosOrLocalPasswd yes +#KerberosTicketCleanup yes +#KerberosGetAFSToken no + +# GSSAPI options +#GSSAPIAuthentication no +#GSSAPICleanupCredentials yes + +# Set this to 'yes' to enable support for the deprecated 'gssapi' authentication +# mechanism to OpenSSH 3.8p1. The newer 'gssapi-with-mic' mechanism is included +# in this release. The use of 'gssapi' is deprecated due to the presence of +# potential man-in-the-middle attacks, which 'gssapi-with-mic' is not susceptible to. +#GSSAPIEnableMITMAttack no + +# Set this to 'yes' to enable PAM authentication, account processing, +# and session processing. If this is enabled, PAM authentication will +# be allowed through the ChallengeResponseAuthentication and +# PasswordAuthentication. Depending on your PAM configuration, +# PAM authentication via ChallengeResponseAuthentication may bypass +# the setting of "PermitRootLogin without-password". +# If you just want the PAM account and session checks to run without +# PAM authentication, then enable this but set PasswordAuthentication +# and ChallengeResponseAuthentication to 'no'. +UsePAM yes + +#AllowAgentForwarding yes +#AllowTcpForwarding yes +#GatewayPorts no +X11Forwarding yes +#X11DisplayOffset 10 +#X11UseLocalhost yes +#PrintMotd yes +#PrintLastLog yes +#TCPKeepAlive yes +#UseLogin no +UsePrivilegeSeparation sandbox # Default for new installations. +#PermitUserEnvironment no +#Compression delayed +#ClientAliveInterval 0 +#ClientAliveCountMax 3 +UseDNS no +#PidFile /run/sshd.pid +#MaxStartups 10:30:100 +#PermitTunnel no +#ChrootDirectory none +#VersionAddendum none + +# no default banner path +#Banner none + +# override default of no subsystems +Subsystem sftp /usr/lib/ssh/sftp-server + +# This enables accepting locale enviroment variables LC_* LANG, see sshd_config(5). +AcceptEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES +AcceptEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT +AcceptEnv LC_IDENTIFICATION LC_ALL + +# Example of overriding settings on a per-user basis +#Match User anoncvs +# X11Forwarding no +# AllowTcpForwarding no +# ForceCommand cvs server diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/ix86/suse-SLE12-JeOS/root/etc/sudoers new/kiwi/template/ix86/suse-SLE12-JeOS/root/etc/sudoers --- old/kiwi/template/ix86/suse-SLE12-JeOS/root/etc/sudoers 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi/template/ix86/suse-SLE12-JeOS/root/etc/sudoers 2014-10-02 11:03:05.000000000 +0200 @@ -0,0 +1,53 @@ +# sudoers file. +# +# This file MUST be edited with the 'visudo' command as root. +# Failure to use 'visudo' may result in syntax or file permission errors +# that prevent sudo from running. +# +# See the sudoers man page for the details on how to write a sudoers file. +# + +# Host alias specification + +# User alias specification + +# Cmnd alias specification + +# Defaults specification + +# Prevent environment variables from influencing programs in an +# unexpected or harmful way (CVE-2005-2959, CVE-2005-4158, CVE-2006-0151) +Defaults always_set_home +Defaults env_reset +# Change env_reset to !env_reset in previous line to keep all environment variables +# Following list will no longer be necessary after this change + +Defaults env_keep = "LANG LC_ADDRESS LC_CTYPE LC_COLLATE LC_IDENTIFICATION LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER LC_TELEPHONE LC_TIME LC_ALL LANGUAGE LINGUAS XDG_SESSION_COOKIE" +# Comment out the preceding line and uncomment the following one if you need +# to use special input methods. This may allow users to compromise the root +# account if they are allowed to run commands without authentication. +#Defaults env_keep = "LANG LC_ADDRESS LC_CTYPE LC_COLLATE LC_IDENTIFICATION LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER LC_TELEPHONE LC_TIME LC_ALL LANGUAGE LINGUAS XDG_SESSION_COOKIE XMODIFIERS GTK_IM_MODULE QT_IM_MODULE QT_IM_SWITCHER" + +Defaults secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" + +# In the default (unconfigured) configuration, sudo asks for the root password. +# This allows use of an ordinary user account for administration of a freshly +# installed system. When configuring sudo, delete the two +# following lines: +Defaults targetpw # ask for the password of the target user i.e. root +ALL ALL=(ALL) ALL # WARNING! Only use this together with 'Defaults targetpw'! + +# Runas alias specification + +# User privilege specification +root ALL=(ALL) ALL + +# Uncomment to allow people in group wheel to run all commands +# %wheel ALL=(ALL) ALL + +# Same thing without a password +kiwi ALL=(ALL) NOPASSWD: ALL + +# Samples +# %users ALL=/sbin/mount /cdrom,/sbin/umount /cdrom +# %users localhost=/sbin/shutdown -h now diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/ix86/suse-SLE12-JeOS/root/home/kiwi/.ssh/authorized_keys new/kiwi/template/ix86/suse-SLE12-JeOS/root/home/kiwi/.ssh/authorized_keys --- old/kiwi/template/ix86/suse-SLE12-JeOS/root/home/kiwi/.ssh/authorized_keys 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi/template/ix86/suse-SLE12-JeOS/root/home/kiwi/.ssh/authorized_keys 2014-10-02 11:02:04.000000000 +0200 @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== vagrant insecure public key -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org