Hello community,

here is the log from the commit of package kiwi-images-vagrant for 
openSUSE:Factory checked in at 2019-09-30 15:58:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kiwi-images-vagrant (Old)
 and      /work/SRC/openSUSE:Factory/.kiwi-images-vagrant.new.2352 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "kiwi-images-vagrant"

Mon Sep 30 15:58:09 2019 rev:1 rq:733652 version:1.0

Changes:
--------
New Changes file:

--- /dev/null   2019-09-25 09:10:10.894331610 +0200
+++ /work/SRC/openSUSE:Factory/.kiwi-images-vagrant.new.2352/Tumbleweed.changes 
2019-09-30 15:58:11.693408885 +0200
@@ -0,0 +1,59 @@
+-------------------------------------------------------------------
+Thu Sep 26 10:18:38 UTC 2019 - Dan Čermák <[email protected]>
+
+- Change names of the openSUSE images to be less verbose
+
+-------------------------------------------------------------------
+Wed Sep 11 09:38:39 UTC 2019 - Dan Čermák <[email protected]>
+
+- Drop root.obscpio, add ifcfg-eth0 in config.sh
+
+-------------------------------------------------------------------
+Thu Aug  8 06:35:10 UTC 2019 - Dominique Leuenberger <[email protected]>
+
+- Require virtualbox-kmp-default instead of
+  virtualbox-guest-kmp-default: virtualbox merged the KMPs.
+
+-------------------------------------------------------------------
+Tue Jul 23 13:06:12 UTC 2019 - Dan Čermák <[email protected]>
+
+- Add an additional profile for the aarch64 build with an embedded Vagrantfile
+  fix wicked networking configuration
+  remove obsolete baseCleanMount from config.sh
+
+-------------------------------------------------------------------
+Thu Jul  4 09:20:48 UTC 2019 - Guillaume GARDET <[email protected]>
+
+- Add _constraints to avoid 'no space left' error
+
+-------------------------------------------------------------------
+Wed Jun 26 12:53:08 UTC 2019 - Guillaume GARDET <[email protected]>
+
+- Enable build of libvirt flavor for aarch64
+
+-------------------------------------------------------------------
+Fri Jun 21 08:52:35 UTC 2019 - Dan Čermák <[email protected]>
+
+- Add python-xml so that Ansible's zypper module works
+
+-------------------------------------------------------------------
+Mon May  6 14:17:56 UTC 2019 - Dan Čermák <[email protected]>
+
+- Add haveged to the Vagrant box (see bsc#1131369)
+
+-------------------------------------------------------------------
+Fri Apr 12 12:07:24 UTC 2019 - Dan Čermák <[email protected]>
+
+- Remove dracut-plymouth
+
+-------------------------------------------------------------------
+Fri Mar 29 12:19:06 UTC 2019 - Dan Čermák <[email protected]>
+
+- Rebuild repositories via add-yast-repos
+  Remove custom /etc/motd
+
+
+-------------------------------------------------------------------
+Thu Mar 28 14:08:49 UTC 2019 - Dan Čermák <[email protected]>
+
+- Initial vagrant box version

New:
----
  Tumbleweed.changes
  Tumbleweed.kiwi
  _constraints
  _multibuild
  aarch64_vagrantfile
  config.sh

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ Tumbleweed.kiwi ++++++
<?xml version="1.0" encoding="utf-8"?>

<!-- The line below is required in order to use the multibuild OBS features -->
<!-- OBS-Profiles: @BUILD_FLAVOR@ -->
<!-- OBS-ExclusiveArch: aarch64 x86_64 -->

<image schemaversion="7.1" name="Tumbleweed">
    <description type="system">
        <author>Dan Cermak</author>
        <contact>[email protected]</contact>
        <specification>
            openSUSE Tumbleweed
        </specification>
    </description>
    <profiles>
        <profile name="libvirt" description="Vagrant Box for Libvirt" 
arch="x86_64"/>
        <profile name="libvirt_aarch64" description="Vagrant Box for Libvirt on 
aarch64" arch="aarch64"/>
        <profile name="virtualbox" description="Vagrant Box for VirtualBox" 
arch="x86_64"/>
    </profiles>
    <preferences>
        <version>1.0</version>
        <packagemanager>zypper</packagemanager>
        <locale>en_US</locale>
        <keytable>us</keytable>
        <timezone>Europe/Berlin</timezone>
        <rpm-excludedocs>true</rpm-excludedocs>
        <rpm-check-signatures>false</rpm-check-signatures>
        <bootsplash-theme>openSUSE</bootsplash-theme>
        <bootloader-theme>openSUSE</bootloader-theme>
    </preferences>
    <preferences profiles="libvirt">
        <type image="vmx" filesystem="ext4" format="vagrant" boottimeout="0" 
bootloader="grub2" firmware="efi" kernelcmdline="net.ifnames=0">
            <vagrantconfig provider="libvirt" virtualsize="42"/>
            <size unit="G">42</size>
        </type>
    </preferences>
    <preferences profiles="libvirt_aarch64">
        <type image="vmx" filesystem="ext4" format="vagrant" boottimeout="0" 
bootloader="grub2" firmware="efi" kernelcmdline="net.ifnames=0">
            <vagrantconfig provider="libvirt" virtualsize="42" 
embedded_vagrantfile="aarch64_vagrantfile"/>
            <size unit="G">42</size>
        </type>
    </preferences>
    <preferences profiles="virtualbox">
        <type image="vmx" filesystem="ext4" format="vagrant" boottimeout="0" 
bootloader="grub2" kernelcmdline="net.ifnames=0">
            <vagrantconfig provider="virtualbox" 
virtualbox_guest_additions_present="true" virtualsize="42"/>
            <size unit="G">42</size>
        </type>
    </preferences>

    <users>
        <user password="vagrant" home="/root" name="root" groups="root" 
pwdformat="plain" />
        <user password="vagrant" home="/home/vagrant" name="vagrant" 
groups="vagrant" pwdformat="plain" />
    </users>

    <repository type="rpm-md" >
        <source path="obsrepositories:/"/>
    </repository>

    <packages type="image">
        <package name="bindfs"/>
        <package name="ca-certificates"/>
        <package name="ca-certificates-mozilla"/>
        <package name="curl"/>
        <package name="ifplugd"/>
        <package name="iputils"/>
        <package name="vim"/>
        <package name="grub2"/>
        <package name="grub2-x86_64-efi" arch="x86_64"/>
        <package name="grub2-arm64-efi" arch="aarch64"/>
        <package name="tar"/>
        <package name="openssh"/>
        <package name="iproute2"/>
        <package name="less"/>
        <package name="bash-completion"/>
        <package name="which"/>
        <package name="shim" arch="x86_64"/>
        <package name="sudo"/>
        <package name="systemd"/>
        <package name="openSUSE-build-key"/>
        <package name="kernel-default"/>
        <package name="timezone"/>

        <!-- FIXME: change this to python3 once Ansible switches to it -->
        <package name="python"/>
        <package name="python-xml"/>

        <!-- for dracut -->
        <package name="keyutils"/>
        <package name="wicked"/>
        <package name="dmraid"/>

        <!-- for add-yast-repos -->
        <package name="live-add-yast-repos"/>

        <!-- to get enough entropy, otherwise network interfaces won't get up 
-->
        <package name="haveged"/>
    </packages>

    <packages type="image" profiles="libvirt,libvirt_aarch64">
        <package name="rsync"/>
    </packages>

    <packages type="image" profiles="virtualbox">
        <package name="virtualbox-guest-tools"/>
        <package name="virtualbox-guest-x11"/>
        <package name="virtualbox-kmp-default"/>
    </packages>

    <packages type="bootstrap">
        <package name="udev"/>
        <package name="filesystem"/>
        <package name="glibc-locale"/>
        <package name="cracklib-dict-full"/>
        <package name="ca-certificates"/>
        <package name="openSUSE-release"/>
        <package name="openSUSE-release-dvd"/>
    </packages>
</image>
++++++ _constraints ++++++
<constraints>
  <hardware>
    <disk>
      <size unit="G">5</size>
    </disk>
  </hardware>
</constraints>
++++++ _multibuild ++++++
<multibuild>
    <flavor>libvirt</flavor>
    <flavor>libvirt_aarch64</flavor>
    <flavor>virtualbox</flavor>
</multibuild>
++++++ aarch64_vagrantfile ++++++
Vagrant.configure("2") do |config|
  config.vm.synced_folder ".", "/vagrant", type: "rsync"
  config.vm.provider :libvirt do |libvirt|
    libvirt.driver = "kvm"
    libvirt.host = 'localhost'
    libvirt.uri = 'qemu:///system'
    libvirt.host = "master"
    libvirt.features = ["apic"]
    libvirt.loader = "/usr/share/qemu/aavmf-aarch64-code.bin"
    libvirt.video_type = "vga"
    libvirt.cpu_mode = "host-passthrough"
    libvirt.machine_type = "virt-3.1"
    libvirt.emulator_path = "/usr/bin/qemu-system-aarch64"
  end
end
++++++ config.sh ++++++
#!/bin/bash
#================
# FILE          : config.sh
#----------------
# PROJECT       : openSUSE KIWI Image System
# COPYRIGHT     : (c) 2019 SUSE LINUX Products GmbH. All rights reserved
#               :
# AUTHOR        : Marcus Schaefer <[email protected]>
#               : Dan Čermák <[email protected]>
#               :
# BELONGS TO    : Operating System images
#               :
# DESCRIPTION   : configuration script for SUSE based
#               : operating systems
#               :
#               :
# STATUS        : BETA
#----------------

set -euo pipefail

#======================================
# Functions...
#--------------------------------------
test -f /.kconfig && . /.kconfig
test -f /.profile && . /.profile

#======================================
# Greeting...
#--------------------------------------
echo "Configure image: [$kiwi_iname]..."

#======================================
# Mount system filesystems
#--------------------------------------
baseMount

#======================================
# Setup baseproduct link
#--------------------------------------
suseSetupProduct

#======================================
# Add missing gpg keys to rpm
#--------------------------------------
suseImportBuildKey

#======================================
# Disable recommends
#--------------------------------------
sed -i 's/.*solver.onlyRequires.*/solver.onlyRequires = true/g' 
/etc/zypp/zypp.conf

#======================================
# Exclude docs installation
#--------------------------------------
sed -i 's/.*rpm.install.excludedocs.*/rpm.install.excludedocs = yes/g' 
/etc/zypp/zypp.conf

#======================================
# Exclude the installation of multiversion kernels
#--------------------------------------
sed -i 's/^multiversion/# multiversion/' /etc/zypp/zypp.conf

#======================================
# Setup default target, multi-user
#--------------------------------------
baseSetRunlevel 3

#==========================================
# remove package docs
#------------------------------------------
rm -rf /usr/share/doc/packages/*
rm -rf /usr/share/doc/manual/*
rm -rf /opt/kde*

#======================================
# only basic version of vim is
# installed; no syntax highlighting
#--------------------------------------
sed -i -e's/^syntax on/" syntax on/' /etc/vimrc

function vagrantSetup {
    # This function configures the image to work as a vagrant box.
    # These are the following steps:
    # - add the vagrant user to /etc/sudoers
    # - insert the insecure vagrant ssh key
    # - create the default /vagrant share
    # - apply some recommended ssh settings

    # insert the default insecure ssh key from here:
    # https://github.com/hashicorp/vagrant/blob/master/keys/vagrant.pub
    mkdir -p /home/vagrant/.ssh/
    echo "ssh-rsa 
AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ==
 vagrant insecure public key" > /home/vagrant/.ssh/authorized_keys
    chmod 0600 /home/vagrant/.ssh/authorized_keys
    chown -R vagrant:vagrant /home/vagrant/

    # recommended ssh settings for vagrant boxes
    echo "UseDNS no" >> /etc/ssh/sshd_config
    echo "GSSAPIAuthentication no" >> /etc/ssh/sshd_config

    # vagrant assumes that it can sudo without a password
    # => add the vagrant user to the sudoers list
    SUDOERS_LINE="vagrant ALL=(ALL) NOPASSWD: ALL"
    if [ -d /etc/sudoers.d ]; then
        echo "$SUDOERS_LINE" >| /etc/sudoers.d/vagrant
        visudo -cf /etc/sudoers.d/vagrant
        chmod 0440 /etc/sudoers.d/vagrant
    else
        echo "$SUDOERS_LINE" >> /etc/sudoers
        visudo -cf /etc/sudoers
    fi

    # the default shared folder
    mkdir -p /vagrant
    chown -R vagrant:vagrant /vagrant

    # SSH service
    baseInsertService sshd

    # start vboxsf service only if the guest tools are present
    if rpm -q virtualbox-guest-tools 2> /dev/null; then
        echo vboxsf > /etc/modules-load.d/vboxsf.conf
    fi

    # drop any network udev rules for libvirt, so that the networks are called
    # ethX
    # this is not required for Virtualbox as it handles networking differently
    # and doesn't need this hack
    if [ "${kiwi_profiles}" != "virtualbox" ]; then
        rm -f /etc/udev/rules.d/*-net.rules
    fi

    # setup DHCP on eth0 properly
    cat << EOF > /etc/sysconfig/network/ifcfg-eth0
STARTMODE=auto
BOOTPROTO=dhcp
EOF
}

vagrantSetup

#=================================================
# enable haveged to get enough entropy in a VM
# see: bsc#1131369
#-------------------------------------------------
baseInsertService haveged

#=================================================
# configure openSUSE repositories from YaST
#-------------------------------------------------

# Leap 42.3's os-release is missing " around some of the values
# => filter them out since they are present in later releases
OS_ID=$(grep '^ID=' /etc/os-release | awk -F'=' '{ print $2 }'| sed 's/"//g')

if [ $(expr match "${OS_ID^^}" "OPENSUSE") -gt 7 ]; then
    add-yast-repos
fi

exit 0

Reply via email to