Hello community,
here is the log from the commit of package kiwi-config-openSUSE for
openSUSE:Factory checked in at 2017-03-24 02:22:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kiwi-config-openSUSE (Old)
and /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi-config-openSUSE"
Fri Mar 24 02:22:42 2017 rev:119 rq:481961 version:13.3
Changes:
--------
---
/work/SRC/openSUSE:Factory/kiwi-config-openSUSE/kiwi-config-openSUSE.changes
2016-09-20 13:27:01.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes
2017-03-24 02:22:44.162883206 +0100
@@ -1,0 +2,19 @@
+Wed Mar 15 09:49:06 UTC 2017 - [email protected]
+
+- Do not show the installer icon on the desktop of rescue CDs, as
+ it not available in first place (boo#1025728).
+
+-------------------------------------------------------------------
+Mon Mar 6 15:07:19 UTC 2017 - [email protected]
+
+- Use localectl in langset to also change X11 keyboard layout
+
+-------------------------------------------------------------------
+Sun Mar 5 11:19:32 UTC 2017 - [email protected]
+
+- Import keys for installation to avoid trust prompt
+- Remove useless cp command from config.sh.in
+- Add BuildRequires: openSUSE-release to make YaST2 pick the correct
+ keymaps
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi-config-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.AOdJti/_old 2017-03-24 02:22:45.014762669 +0100
+++ /var/tmp/diff_new_pack.AOdJti/_new 2017-03-24 02:22:45.018762104 +0100
@@ -1,7 +1,7 @@
#
# spec file for package kiwi-config-openSUSE
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -26,6 +26,8 @@
BuildRequires: kiwi-tools
BuildRequires: libxml2-tools
BuildRequires: libxslt
+# Required to make YaST2 pick the right keyboard mappings
+BuildRequires: openSUSE-release
BuildRequires: skelcd-control-openSUSE >= 13.2.15
BuildRequires: skelcd-openSUSE
BuildRequires: xdm
++++++ config.sh.in ++++++
--- /var/tmp/diff_new_pack.AOdJti/_old 2017-03-24 02:22:45.122747391 +0100
+++ /var/tmp/diff_new_pack.AOdJti/_new 2017-03-24 02:22:45.122747391 +0100
@@ -54,6 +54,16 @@
done
rmdir /rpmkeys
+# Import keys for installation
+if [ -d /usr/lib/rpm/gnupg/keys ] ; then
+ touch /installkey.gpg
+ gpg --batch --homedir /root/.gnupg --no-default-keyring
--ignore-time-conflict --ignore-valid-from --keyring /installkey.gpg --import
/usr/lib/rpm/gnupg/keys/*
+ mkdir -p /pubkeys
+ for i in /usr/lib/rpm/gnupg/keys/*.asc ; do
+ [ -f "$i" ] && ln -s "$i" "/pubkeys/${i##*/}.key"
+ done
+fi
+
rm -rf /var/cache/zypp/raw/*
bash -x /var/lib/livecd/geturls.sh
@@ -76,21 +86,21 @@
: > /var/log/zypper.log
-if [ "$desktop" != "kde" ]; then
- # Add Installation icon to desktop folder
- mkdir -p /home/linux/.config /home/linux/Desktop
- echo 'XDG_DESKTOP_DIR="$HOME/Desktop"' > /home/linux/.config/user-dirs.dirs
- ln -s /usr/share/applications/live-installer.desktop /home/linux/Desktop/
- # Set the application as being "trusted"
- chmod a+x /home/linux/Desktop/live-installer.desktop
-else
+if [ "$desktop" = "kde" ]; then
# bug 989897, avoid creating desktop directory on KDE so that the default
items are added on first login
cp /usr/share/applications/live-installer.desktop
/usr/share/kio_desktop/DesktopLinks/
# Set the application as being "trusted"
chmod a+x /usr/share/kio_desktop/DesktopLinks/live-installer.desktop
+# else case disabled: 'x11' (rescue) does not contain the installer, GNOME
Shell has no concept of 'desktop'
+#else
+# # Add Installation icon to desktop folder
+# mkdir -p /home/linux/.config /home/linux/Desktop
+# echo 'XDG_DESKTOP_DIR="$HOME/Desktop"' >
/home/linux/.config/user-dirs.dirs
+# ln -s /usr/share/applications/live-installer.desktop /home/linux/Desktop/
+# # Set the application as being "trusted"
+# chmod a+x /home/linux/Desktop/live-installer.desktop
fi
-mv /var/lib/livecd/*.pdf /home/linux || true
rmdir /var/lib/livecd || true
chown -R linux /home/linux
++++++ config.xml.in ++++++
--- /var/tmp/diff_new_pack.AOdJti/_old 2017-03-24 02:22:45.138745127 +0100
+++ /var/tmp/diff_new_pack.AOdJti/_new 2017-03-24 02:22:45.138745127 +0100
@@ -6,7 +6,7 @@
<specification>openSUSE @VERSION@ Live system</specification>
</description>
<preferences>
- <type primary="true" boot="isoboot/suse-@VERSION@" bootprofile="default"
bootkernel="@BOOTKERNEL@" kernelcmdline="splash=silent quiet" filesystem="ext4"
flags="overlay" hybrid="true" hybridpersistent="true"
hybridpersistent_filesystem="ext4" image="iso" editbootconfig="isopatch.sh"
firmware="uefi" volid="@VOLID@"/>
+ <type primary="true" boot="isoboot/suse-@VERSION@" bootprofile="default"
bootkernel="@BOOTKERNEL@" kernelcmdline="splash=silent quiet" flags="overlay"
hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4"
image="iso" editbootconfig="isopatch.sh" firmware="uefi" volid="@VOLID@"/>
<version>2.8.0</version>
<bootloader-theme>openSUSE</bootloader-theme>
<bootsplash-theme>openSUSE</bootsplash-theme>
@@ -43,6 +43,7 @@
<package name="openSUSE-release"/>
<package name="openSUSE-release-@FLAVOR@"/>
<package name="branding-openSUSE"/>
+ <package name="memtest86+"/>
</packages>
<repository type="yast2">
<source path="http://download.opensuse.org/distribution/13.1/repo/oss/"/>
++++++ langset.service ++++++
--- /var/tmp/diff_new_pack.AOdJti/_old 2017-03-24 02:22:45.238730979 +0100
+++ /var/tmp/diff_new_pack.AOdJti/_new 2017-03-24 02:22:45.238730979 +0100
@@ -1,8 +1,8 @@
[Unit]
Description=setup language based on kernel commandline
-DefaultDependencies=no
-Conflicts=shutdown.target
-Before=sysinit.target shutdown.target systemd-vconsole-setup.service
systemd-localed.service
+Requires=dbus.service sysinit.target
+Before=multi-user.target shutdown.target
+After=dbus.service sysinit.target
ConditionPathExists=!/var/lib/zypp/RequestedLocales
[Service]
++++++ langset.sh ++++++
--- /var/tmp/diff_new_pack.AOdJti/_old 2017-03-24 02:22:45.254728716 +0100
+++ /var/tmp/diff_new_pack.AOdJti/_new 2017-03-24 02:22:45.258728150 +0100
@@ -18,17 +18,34 @@
file="/etc/langset/$Language"
fi
+layout=
+model=
+variant=
+options=
sed -e 's,: *,:,' "$file" | while read line; do
key=`echo $line | cut -d: -f1`
value=`echo $line | cut -d: -f2-`
+ if [ "$key" = "XkbLayout" ]; then
+ layout="$value"
+ elif [ "$key" = "XkbModel" ]; then
+ model="$value"
+ elif [ "$key" = "XkbVariant" ]; then
+ variant="$value"
+ elif [ "$key" = "XkbOptions" ]; then
+ options="$value"
+ fi
+
sed -i -e "s#$key=\".*#$key=\"$value\"#" /etc/sysconfig/language
sed -i -e "s#$key=\".*#$key=\"$value\"#" /etc/sysconfig/keyboard
sed -i -e "s#$key=\".*#$key=\"$value\"#" /etc/sysconfig/console
+
+ if [ -n "$layout" ] && [ -n "$model" ] && [ -n "$variant" ] && [ -n
"$options" ]; then
+ localectl set-x11-keymap "$layout" "$model" "$variant" "$options"
+ fi
done
echo "$Language""_$Country" > /var/lib/zypp/RequestedLocales
-
cmdline=$(cat /proc/cmdline | sed -e 's,.*splash=silent,splash=silent,')
echo "Cmdline: $cmdline" >> /etc/install.inf
if test -d /sys/firmware/efi/vars/; then
