commit kiwi-config-openSUSE for openSUSE:12.3
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:12.3 checked in at 2013-03-06 10:55:16 Comparing /work/SRC/openSUSE:12.3/kiwi-config-openSUSE (Old) and /work/SRC/openSUSE:12.3/.kiwi-config-openSUSE.new (New) Package is kiwi-config-openSUSE, Maintainer is co...@suse.com Changes: --- /work/SRC/openSUSE:12.3/kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2013-03-04 17:28:04.0 +0100 +++ /work/SRC/openSUSE:12.3/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2013-03-06 10:55:19.0 +0100 @@ -1,0 +2,5 @@ +Wed Mar 6 09:54:24 UTC 2013 - co...@suse.com + +- include grub2 theming for EFI boot (bnc#807498) + +--- Other differences: -- ++ config.xml.in ++ --- /var/tmp/diff_new_pack.2JDWyj/_old 2013-03-06 10:55:20.0 +0100 +++ /var/tmp/diff_new_pack.2JDWyj/_new 2013-03-06 10:55:20.0 +0100 @@ -28,6 +28,7 @@ /users packages type=image patternType=onlyRequired package name=gfxboot-branding-openSUSE bootinclude=true bootdelete=true/ +package name=grub2-branding-openSUSE bootinclude=true/ package name=yast2-live-installer/ package name=pam/ package name=pam-config/ -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit kiwi-config-openSUSE for openSUSE:12.3
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:12.3 checked in at 2013-03-04 17:28:02 Comparing /work/SRC/openSUSE:12.3/kiwi-config-openSUSE (Old) and /work/SRC/openSUSE:12.3/.kiwi-config-openSUSE.new (New) Package is kiwi-config-openSUSE, Maintainer is co...@suse.com Changes: --- /work/SRC/openSUSE:12.3/kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2013-02-17 17:03:54.0 +0100 +++ /work/SRC/openSUSE:12.3/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2013-03-04 17:28:04.0 +0100 @@ -1,0 +2,5 @@ +Fri Mar 1 08:13:06 UTC 2013 - co...@suse.com + +- cleanup of isopatch + +--- Other differences: -- ++ isopatch.sh.in ++ --- /var/tmp/diff_new_pack.GdVb2u/_old 2013-03-04 17:28:05.0 +0100 +++ /var/tmp/diff_new_pack.GdVb2u/_new 2013-03-04 17:28:05.0 +0100 @@ -3,7 +3,6 @@ set -ex desktop= -label=@VOLID@ #sed -i -e s,label openSUSE.*,label $label, boot/*/loader/isolinux.cfg if test $desktop != x11; then -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit kiwi-config-openSUSE for openSUSE:12.3
Hello community,
here is the log from the commit of package kiwi-config-openSUSE for
openSUSE:12.3 checked in at 2013-02-17 17:03:48
Comparing /work/SRC/openSUSE:12.3/kiwi-config-openSUSE (Old)
and /work/SRC/openSUSE:12.3/.kiwi-config-openSUSE.new (New)
Package is kiwi-config-openSUSE, Maintainer is co...@suse.com
Changes:
--- /work/SRC/openSUSE:12.3/kiwi-config-openSUSE/kiwi-config-openSUSE.changes
2013-02-14 21:09:19.0 +0100
+++
/work/SRC/openSUSE:12.3/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes
2013-02-17 17:03:54.0 +0100
@@ -1,0 +2,10 @@
+Fri Feb 15 08:55:05 UTC 2013 - co...@suse.com
+
+- remove langset.service before reboot (bnc#802747)
+
+---
+Wed Feb 13 08:25:54 UTC 2013 - co...@suse.com
+
+- rename failsafe on x11 too
+
+---
Other differences:
--
++ kiwi-config-openSUSE.spec ++
--- /var/tmp/diff_new_pack.JTxN6B/_old 2013-02-17 17:03:54.0 +0100
+++ /var/tmp/diff_new_pack.JTxN6B/_new 2013-02-17 17:03:54.0 +0100
@@ -136,10 +136,11 @@
sed -i -e '/yast2-live-installer/d' config.xml
;;
esac
+ label=`echo $volid | sed -e 's, ,_,g'`
if test $type = usb; then
sed -i -e s,yast2-live-installer,yast2-firstboot, config.xml
fi
- sed -i -e s,@VOLID@,$volid, config.xml
+ sed -i -e s,@VOLID@,$volid,; s,@LABEL@,$label, config.xml
%ifarch x86_64
sed -i -e s,@BOOTKERNEL@,desktop, config.xml
%else
++ config.xml.in ++
--- /var/tmp/diff_new_pack.JTxN6B/_old 2013-02-17 17:03:54.0 +0100
+++ /var/tmp/diff_new_pack.JTxN6B/_new 2013-02-17 17:03:54.0 +0100
@@ -1,5 +1,5 @@
?xml version=1.0?
-image schemaversion=5.6 name=openSUSE-@VERSION@-@FLAVOR@
+image schemaversion=5.6 name=openSUSE-@VERSION@-@FLAVOR@
displayname=@LABEL@
description type=system
authorStephan Kulow/author
contactco...@novell.com/contact
++ correct_live_for_reboot ++
--- /var/tmp/diff_new_pack.JTxN6B/_old 2013-02-17 17:03:54.0 +0100
+++ /var/tmp/diff_new_pack.JTxN6B/_new 2013-02-17 17:03:54.0 +0100
@@ -13,7 +13,9 @@
if test -e /etc/init.d/boot.compcache; then
chkconfig boot.compcache off
fi
-rm /etc/systemd/system/multi-user.target.wants/clicfs.service
/lib/systemd/system/sysinit.target.wants/langset.service
+rm /etc/systemd/system/multi-user.target.wants/clicfs.service
/usr/lib/systemd/system/sysinit.target.wants/langset.service
+rm /etc/systemd/system/clicfs.service
/etc/systemd/system/multi-user.target.wants/clicfs.service
+rm /usr/lib/systemd/system/langset.service
/usr/lib/systemd/system/sysinit.target.wants/langset.service
: /var/run/utmp
++ correct_live_install ++
--- /var/tmp/diff_new_pack.JTxN6B/_old 2013-02-17 17:03:54.0 +0100
+++ /var/tmp/diff_new_pack.JTxN6B/_new 2013-02-17 17:03:54.0 +0100
@@ -30,8 +30,6 @@
# remove langset stuff
rm /etc/langset.sh
rm -rf /etc/langset/
-rm -f '/etc/systemd/system/clicfs.service'
'/etc/systemd/system/multi-user.target.wants/clicfs.service'
-rm -f '/usr/lib/systemd/system/langset.service'
'/usr/lib/systemd/system/sysinit.target.wants/langset.service'
cd /
# patch -R -p0 /etc/YaST2/policy.patch
++ isopatch.sh.in ++
--- /var/tmp/diff_new_pack.JTxN6B/_old 2013-02-17 17:03:54.0 +0100
+++ /var/tmp/diff_new_pack.JTxN6B/_new 2013-02-17 17:03:54.0 +0100
@@ -3,28 +3,19 @@
set -ex
desktop=
-case $desktop in
- gnome)
-label=openSUSE_Live_GNOME
-;;
- kde*)
-label=openSUSE_Live_KDE
-;;
- x11)
-label=openSUSE_Live_X11
-;;
-esac
+label=@VOLID@
-sed -i -e s,label openSUSE.*,label $label, boot/*/loader/isolinux.cfg
+#sed -i -e s,label openSUSE.*,label $label, boot/*/loader/isolinux.cfg
if test $desktop != x11; then
sed -i -e s,label Failsafe.*,label linux, boot/*/loader/isolinux.cfg
sed -i -e s,showopts ide=nodma.*,liveinstall showopts,
boot/*/loader/isolinux.cfg
else
sed -i -ne ':ss;/^label media/{:s;n;/^ /b s;b ss};p'
boot/*/loader/isolinux.cfg
+ #sed -i -e s,label Failsafe.*,label Failsafe $label,
boot/*/loader/isolinux.cfg
fi
sed -i -e s,label Hard-Disk,label harddisk, boot/*/loader/isolinux.cfg
-sed -i -e s,default open.*,default $label, boot/*/loader/isolinux.cfg
-sed -i -e s,openSUSE[^ ]*,$label, boot/*/loader/isolinux.msg
+#sed -i -e s,default open.*,default $label, boot/*/loader/isolinux.cfg
+#sed -i -e s,openSUSE[^ ]*,$label, boot/*/loader/isolinux.msg
sed -i -e s,splash=silent,splash=silent quiet preloadlog=/dev/null,
boot/*/loader/isolinux.cfg
sed -i -e 's,key.F4=$,key.F4=kernelopts,' boot/*/loader/gfxboot.cfg
--
To unsubscribe, e-mail:
commit kiwi-config-openSUSE for openSUSE:12.3
Hello community,
here is the log from the commit of package kiwi-config-openSUSE for
openSUSE:12.3 checked in at 2013-02-07 10:26:15
Comparing /work/SRC/openSUSE:12.3/kiwi-config-openSUSE (Old)
and /work/SRC/openSUSE:12.3/.kiwi-config-openSUSE.new (New)
Package is kiwi-config-openSUSE, Maintainer is co...@suse.com
Changes:
--- /work/SRC/openSUSE:12.3/kiwi-config-openSUSE/kiwi-config-openSUSE.changes
2013-01-31 01:22:29.0 +0100
+++
/work/SRC/openSUSE:12.3/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes
2013-02-07 10:26:18.0 +0100
@@ -1,0 +2,31 @@
+Mon Feb 4 15:19:55 UTC 2013 - co...@suse.com
+
+- patch the isolinux.cfg within kiwi image
+
+---
+Sat Feb 2 18:33:10 UTC 2013 - co...@suse.com
+
+- systemd is in /usr
+
+---
+Thu Jan 31 15:58:29 UTC 2013 - m...@suse.com
+
+- Adopted to enable/disable NetworkManager.service on 12.3 instead
+ of setting the NETWORKMANAGER=yes/no variable (bnc#800817).
+
+---
+Thu Jan 31 15:38:45 UTC 2013 - co...@suse.com
+
+- change distribution repos
+
+---
+Thu Jan 31 10:27:08 UTC 2013 - co...@suse.com
+
+- bump version to 12.3
+
+---
+Fri Jan 25 11:48:11 UTC 2013 - co...@suse.com
+
+- use X11-cd package list for x11 rescue
+
+---
New:
isopatch.sh.in
Other differences:
--
++ kiwi-config-openSUSE.spec ++
--- /var/tmp/diff_new_pack.lmGVGA/_old 2013-02-07 10:26:20.0 +0100
+++ /var/tmp/diff_new_pack.lmGVGA/_new 2013-02-07 10:26:20.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package kiwi-config-openSUSE
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -35,7 +35,7 @@
Summary:KDE live CD
License:BSD-3-Clause
Group: System/Boot
-Version:12.2
+Version:12.3
Release:0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source1:COPYING
@@ -43,6 +43,7 @@
Source3:config.sh
Source4:config.xml.in
Source8:ifcfg-eth0
+Source9:isopatch.sh.in
Source10: README
Source11: correct_live_for_reboot
Source12: correct_live_install
@@ -71,7 +72,7 @@
patch -p0 %{SOURCE26}
%build
-kiwiversion=12.2
+kiwiversion=12.3
BASEDIR=$PWD
localedir=`mktemp -d`
OUTPUTDIR=$localedir/ /usr/lib/YaST2/bin/y2base %{SOURCE22} UI
@@ -101,15 +102,16 @@
echo 'baseUpdateSysConfig /etc/sysconfig/displaymanager DISPLAYMANAGER
gdm' config.sh
echo 'baseUpdateSysConfig /etc/sysconfig/windowmanager DEFAULT_WM gnome'
config.sh
fi
- if test $desktop = x11; then
- echo 'baseUpdateSysConfig /etc/sysconfig/network/config NETWORKMANAGER
no' config.sh
- else
- echo 'baseUpdateSysConfig /etc/sysconfig/network/config NETWORKMANAGER
yes' config.sh
- fi
if test $type = usb; then
echo 'baseUpdateSysConfig /etc/sysconfig/clock TIMEZONE UTC' config.sh
fi
+ if test $desktop = x11; then
+ echo '/usr/bin/systemctl disable NetworkManager.service || true'
config.sh
+ else
+ echo '/usr/bin/systemctl -f enable NetworkManager.service' config.sh
+ fi
+
grep -v type:$othertype %{SOURCE4} | \
xmllint --format - config.xml
if test $type = usb; then
@@ -121,17 +123,35 @@
sed -i -e s,@CONFIG@,/usr/share/openSUSE-kiwi/$config, config.xml
sed -i -e s,@VERSION@,$kiwiversion, config.xml
sed -i -e s,@FLAVOR@,$config, config.xml
- if test $desktop = gnome; then
+ case $desktop in
+gnome)
sed -i -e s,@PLIST@,GNOME-cd, config.xml
- else
+ ;;
+kde)
sed -i -e s,@PLIST@,KDE-cd, config.xml
- fi
+ ;;
+x11)
+ sed -i -e s,@PLIST@,X11-cd, config.xml
+ ;;
+ esac
%ifarch x86_64
sed -i -e s,@BOOTKERNEL@,desktop, config.xml
%else
sed -i -e s,@BOOTKERNEL@,std, config.xml
%endif
jing /usr/share/kiwi/modules/KIWISchema.rng config.xml
+
+ case $desktop in
+gnome)
+ sed -e 's,^label=,label=openSUSE_Live_GNOME', %{SOURCE9} isopatch.sh
+ ;;
+kde*)
+ sed -e 's,^label=,label=openSUSE_Live_KDE', %{SOURCE9} isopatch.sh
+ ;;
+x11)
+ sed -e 's,^label=,label=openSUSE_Live_X11', %{SOURCE9} isopatch.sh
+ ;;
+ esac
#test -z $out #
