Hello community,
here is the log from the commit of package kiwi-config-openSUSE for
openSUSE:Factory checked in at 2016-07-21 08:19:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kiwi-config-openSUSE (Old)
and /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi-config-openSUSE"
Changes:
--------
---
/work/SRC/openSUSE:Factory/kiwi-config-openSUSE/kiwi-config-openSUSE.changes
2016-07-09 09:26:12.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes
2016-07-21 08:19:30.000000000 +0200
@@ -1,0 +2,9 @@
+Tue Jul 12 11:43:28 UTC 2016 - fv...@suse.com
+
+- Clean up live installer remains and add net installer icon:
+ - Remove correct_live_install, correct_live_for_reboot and
+ xdm-liveinstall.patch
+ - Add installation.desktop and start-install.sh
+- Use tumbleweed template instead of 13.2
+
+-------------------------------------------------------------------
Old:
----
correct_live_for_reboot
correct_live_install
xdm-liveinstall.patch
New:
----
installation.desktop
start-install.sh
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi-config-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.VgjnZC/_old 2016-07-21 08:19:33.000000000 +0200
+++ /var/tmp/diff_new_pack.VgjnZC/_new 2016-07-21 08:19:33.000000000 +0200
@@ -42,14 +42,13 @@
Source4: config.xml.in
Source9: isopatch.sh.in
Source10: README
-Source11: correct_live_for_reboot
-Source12: correct_live_install
+Source13: start-install.sh
+Source14: installation.desktop
Source16: langset.service
Source17: 99-ignore-live-usb.fdi
Source20: geturls.xsl
Source22: getcountrydata.rb
Source23: langset.sh
-Source26: xdm-liveinstall.patch
Source27: SoftLocks
Source30: GPL-2.0.txt
Source31: gpl-3.0.txt
@@ -61,14 +60,9 @@
%prep
%setup -T -c
-testdir=$(mktemp -d)
-install -D /usr/lib/YaST2/startup/YaST2.call
$testdir/usr/lib/YaST2/startup/YaST2.call
-install -D /usr/lib/X11/display-manager $testdir/usr/lib/X11/display-manager
-cd $testdir
-#patch -p0 < %{SOURCE26}
%build
-kiwiversion=13.2
+kiwiversion=tumbleweed
BASEDIR=$PWD
localedir=`mktemp -d`
OUTPUTDIR=$localedir/ /usr/lib/YaST2/bin/y2base %{SOURCE22} UI
@@ -147,10 +141,9 @@
cp -a $localedir etc/langset
install -m 755 %{SOURCE23} etc/langset.sh
install -D -m 644 %{SOURCE16} usr/lib/systemd/system/langset.service
-# live-installer was dropped on 2016-05-17 - dimstar
-# install -D -m 755 %{SOURCE11} usr/bin/correct_live_for_reboot
-# install -D -m 755 %{SOURCE12} usr/bin/correct_live_install
-# install -m 644 %{SOURCE26} etc/YaST2/liveinstall.patch
+ # Add icon for net installation to desktop
+ install -D -m 755 %{SOURCE13} usr/bin/start-install.sh
+ install -D -m 644 %{SOURCE14} usr/share/applications/live-installer.desktop
mkdir -p var/lib/zypp/
echo livecd-$desktop > var/lib/zypp/LastDistributionFlavor
++++++ config.sh ++++++
--- /var/tmp/diff_new_pack.VgjnZC/_old 2016-07-21 08:19:33.000000000 +0200
+++ /var/tmp/diff_new_pack.VgjnZC/_new 2016-07-21 08:19:33.000000000 +0200
@@ -73,6 +73,11 @@
: > /var/log/zypper.log
+# 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/
+
mv /var/lib/livecd/*.pdf /home/linux || true
rmdir /var/lib/livecd || true
++++++ config.xml.in ++++++
--- /var/tmp/diff_new_pack.VgjnZC/_old 2016-07-21 08:19:33.000000000 +0200
+++ /var/tmp/diff_new_pack.VgjnZC/_new 2016-07-21 08:19:33.000000000 +0200
@@ -25,6 +25,8 @@
<!-- workaround for bnc#892087 -->
<package name="e2fsprogs" bootinclude="true"/>
<!--package name="yast2-live-installer"/-->
+ <!-- branding for the installer -->
+ <package name="yast2-qt-branding-openSUSE"/>
<package name="pam"/>
<package name="pam-config"/>
<package name="pam-modules"/>
++++++ installation.desktop ++++++
[Desktop Entry]
Type=Application
Name=Installation
Comment=Install the system from online repositories
Icon=yast-live-install
Categories=Settings;System;
Exec=xdg-su -c "/usr/bin/start-install.sh"
StartupNotify=true
++++++ isopatch.sh.in ++++++
--- /var/tmp/diff_new_pack.VgjnZC/_old 2016-07-21 08:19:33.000000000 +0200
+++ /var/tmp/diff_new_pack.VgjnZC/_new 2016-07-21 08:19:33.000000000 +0200
@@ -2,8 +2,6 @@
set -ex
-desktop=
-
sed -i -e "s,label Hard-Disk,label harddisk," boot/*/loader/isolinux.cfg
# remove splash for mediacheck
sed -i -e 's,mediacheck=1 splash=silent quiet,mediacheck=1,'
boot/*/loader/isolinux.cfg
++++++ start-install.sh ++++++
#!/bin/bash
echo "ZyppRepoURL: http://download.opensuse.org/tumbleweed/repo/oss"; >>
/etc/install.inf
echo "InstMode: net" >> /etc/install.inf
/usr/lib/YaST2/startup/YaST2.call installation initial
