commit kiwi-config-openSUSE for openSUSE:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2017-08-01 09:25:14 Comparing /work/SRC/openSUSE:Factory/kiwi-config-openSUSE (Old) and /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new (New) Package is "kiwi-config-openSUSE" Tue Aug 1 09:25:14 2017 rev:122 rq:513078 version:13.3 Changes: --- /work/SRC/openSUSE:Factory/kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2017-07-17 09:10:49.902696472 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2017-08-01 09:25:17.832391541 +0200 @@ -1,0 +2,6 @@ +Sat Jul 29 08:15:13 UTC 2017 - fab...@ritter-vogt.de + +- Configure XDG_CURRENT_DESKTOP and KDE_SESSION_VERSION to avoid + loading the KDE platform plugin in YaST (boo#1045798) + +--- Other differences: -- ++ config.xml.in ++ --- /var/tmp/diff_new_pack.ilDOQJ/_old 2017-08-01 09:25:18.764260211 +0200 +++ /var/tmp/diff_new_pack.ilDOQJ/_new 2017-08-01 09:25:18.784257393 +0200 @@ -37,6 +37,7 @@ + @@ -44,7 +45,6 @@ - http://download.opensuse.org/distribution/13.1/repo/oss/"/> ++ start-install.sh ++ --- /var/tmp/diff_new_pack.ilDOQJ/_old 2017-08-01 09:25:18.948234283 +0200 +++ /var/tmp/diff_new_pack.ilDOQJ/_new 2017-08-01 09:25:18.948234283 +0200 @@ -3,8 +3,11 @@ #snippet from man 1 flock [ "${FLOCKER}" != "$0" ] && exec env FLOCKER="$0" flock -en "$0" "$0" "$@" || : -#Look like the DVD installer everywhere -unset XDG_CURRENT_DESKTOP +#Look like the DVD installer everywhere (if this is unset, it looks for X atoms) +export XDG_CURRENT_DESKTOP=DOESNOTMATTER + +#Don't load the KDE platform theme, to avoid messing with accelerator mnemonics (boo#1045798) +export KDE_SESSION_VERSION=0 cat >/etc/install.inf
commit kiwi-config-openSUSE for openSUSE:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2017-07-17 09:10:48 Comparing /work/SRC/openSUSE:Factory/kiwi-config-openSUSE (Old) and /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new (New) Package is "kiwi-config-openSUSE" Mon Jul 17 09:10:48 2017 rev:121 rq:510103 version:13.3 Changes: --- /work/SRC/openSUSE:Factory/kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2017-04-20 20:57:47.529911329 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2017-07-17 09:10:49.902696472 +0200 @@ -1,0 +2,6 @@ +Thu Jul 6 12:28:15 UTC 2017 - dleuenber...@suse.com + +- Change bootkernel to 'default': we don't use other kernels for + the live image for a long time already. + +--- Other differences: -- ++ kiwi-config-openSUSE.spec ++ --- /var/tmp/diff_new_pack.gEOUxP/_old 2017-07-17 09:10:50.586600144 +0200 +++ /var/tmp/diff_new_pack.gEOUxP/_new 2017-07-17 09:10:50.590599581 +0200 @@ -102,9 +102,11 @@ label=`echo "$volid" | sed -e 's, ,_,g'` sed -i -e "s,@VOLID@,$volid,; s,@LABEL@,$label," config.xml %ifarch x86_64 -sed -i -e "s,@BOOTKERNEL@,desktop," config.xml +sed -i -e "s,@BOOTKERNEL@,default," config.xml +#sed -i -e "s,@BOOTKERNEL@,desktop," config.xml %else -sed -i -e "s,@BOOTKERNEL@,std," config.xml +sed -i -e "s,@BOOTKERNEL@,default," config.xml +#sed -i -e "s,@BOOTKERNEL@,std," config.xml sed -i -e 's,firmware="uefi",,' config.xml %endif xmllint --format config.xml > t && mv t config.xml ++ config.xml.in ++ --- /var/tmp/diff_new_pack.gEOUxP/_old 2017-07-17 09:10:50.690585498 +0200 +++ /var/tmp/diff_new_pack.gEOUxP/_new 2017-07-17 09:10:50.690585498 +0200 @@ -6,7 +6,7 @@ openSUSE @VERSION@ Live system - + 2.8.0 openSUSE openSUSE @@ -20,6 +20,7 @@ +
commit kiwi-config-openSUSE for openSUSE:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2017-04-20 20:57:44 Comparing /work/SRC/openSUSE:Factory/kiwi-config-openSUSE (Old) and /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new (New) Package is "kiwi-config-openSUSE" Thu Apr 20 20:57:44 2017 rev:120 rq:489012 version:13.3 Changes: --- /work/SRC/openSUSE:Factory/kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2017-03-24 02:22:44.162883206 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2017-04-20 20:57:47.529911329 +0200 @@ -1,0 +2,5 @@ +Wed Mar 29 11:23:29 UTC 2017 - fv...@suse.com + +- Use eurlatgr.psfu instead of lat9w-16.psfu as default font + +--- Other differences: -- ++ config.sh.in ++ --- /var/tmp/diff_new_pack.9S2LtF/_old 2017-04-20 20:57:48.421785200 +0200 +++ /var/tmp/diff_new_pack.9S2LtF/_new 2017-04-20 20:57:48.421785200 +0200 @@ -129,7 +129,7 @@ baseUpdateSysConfig /etc/sysconfig/language RC_LANG "en_US.UTF-8" -baseUpdateSysConfig /etc/sysconfig/console CONSOLE_FONT "lat9w-16.psfu" +baseUpdateSysConfig /etc/sysconfig/console CONSOLE_FONT "eurlatgr.psfu" baseUpdateSysConfig /etc/sysconfig/console CONSOLE_SCREENMAP trivial baseUpdateSysConfig /etc/sysconfig/console CONSOLE_MAGIC "(K" baseUpdateSysConfig /etc/sysconfig/console CONSOLE_ENCODING "UTF-8"
commit kiwi-config-openSUSE for openSUSE:Factory
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.0 +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 - dims...@opensuse.org + +- 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 - fab...@ritter-vogt.de + +- Use localectl in langset to also change X11 keyboard layout + +--- +Sun Mar 5 11:19:32 UTC 2017 - fab...@ritter-vogt.de + +- 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 @@ openSUSE @VERSION@ Live system - + 2.8.0 openSUSE openSUSE @@ -43,6 +43,7 @@ + http://download.opensuse.org/distribution/13.1/repo/oss/"/>
commit kiwi-config-openSUSE for openSUSE:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2016-09-20 13:27:00 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-08-25 09:56:47.0 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2016-09-20 13:27:01.0 +0200 @@ -1,0 +2,7 @@ +Thu Sep 8 08:01:50 UTC 2016 - lsle...@suse.cz + +- start-install.sh: disable the YaST self-update feature + (FATE#319716) in the Live installer, it works only in + the installation inst-sys (bsc#997829) + +--- Other differences: -- ++ start-install.sh ++ --- /var/tmp/diff_new_pack.wPIoWH/_old 2016-09-20 13:27:03.0 +0200 +++ /var/tmp/diff_new_pack.wPIoWH/_new 2016-09-20 13:27:03.0 +0200 @@ -9,6 +9,8 @@ cat >/etc/install.inf
commit kiwi-config-openSUSE for openSUSE:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2016-08-25 09:56:45 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-24 19:53:31.0 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2016-08-25 09:56:47.0 +0200 @@ -1,0 +2,9 @@ +Thu Aug 18 16:28:21 UTC 2016 - fab...@ritter-vogt.de + +- Improve start-install.sh: + - Prevent simultaneous calls + - Same look everywhere: +- Display accelerators on KDE +- Same accelerators and font everywhere + +--- Other differences: -- ++ start-install.sh ++ --- /var/tmp/diff_new_pack.Dxflah/_old 2016-08-25 09:56:48.0 +0200 +++ /var/tmp/diff_new_pack.Dxflah/_new 2016-08-25 09:56:48.0 +0200 @@ -1,4 +1,14 @@ #!/bin/bash -echo "ZyppRepoURL: http://download.opensuse.org/tumbleweed/repo/oss; >> /etc/install.inf -echo "InstMode: net" >> /etc/install.inf +#YaST takes a certain time to show up, so we need to prevent calling it twice simultaneously +#snippet from man 1 flock +[ "${FLOCKER}" != "$0" ] && exec env FLOCKER="$0" flock -en "$0" "$0" "$@" || : + +#Look like the DVD installer everywhere +unset XDG_CURRENT_DESKTOP + +cat >/etc/install.inf
commit kiwi-config-openSUSE for openSUSE:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2016-07-24 19:53:12 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-21 08:19:30.0 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2016-07-24 19:53:31.0 +0200 @@ -1,0 +2,9 @@ +Thu Jul 21 08:01:42 UTC 2016 - fv...@suse.com + +- Rename config.sh to config.sh.in to have desktop flavor available + - Move desktop-specific parts from .spec into config.sh.in +- Copy live-installer.desktop icon to different location on Plasma + - Fix for boo#989897 +- Use "Tumbleweed" instead of "13.3" as name + +--- Old: config.sh New: config.sh.in Other differences: -- ++ kiwi-config-openSUSE.spec ++ --- /var/tmp/diff_new_pack.VLQ7qB/_old 2016-07-24 19:53:32.0 +0200 +++ /var/tmp/diff_new_pack.VLQ7qB/_new 2016-07-24 19:53:32.0 +0200 @@ -38,7 +38,7 @@ Release:0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source1:COPYING -Source3:config.sh +Source3:config.sh.in Source4:config.xml.in Source9:isopatch.sh.in Source10: README @@ -77,31 +77,21 @@ cd $config desktop=`echo $config | cut -d- -f2` type=`echo $config | cut -d- -f1` - install -m 755 %{SOURCE3} config.sh - if test $desktop = kde; then -echo 'baseUpdateSysConfig /etc/sysconfig/displaymanager DISPLAYMANAGER sddm' >> config.sh - fi - if test $desktop = gnome; then -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/displaymanager DISPLAYMANAGER lightdm' >> config.sh -echo 'baseUpdateSysConfig /etc/sysconfig/windowmanager DEFAULT_WM xfce' >> config.sh - fi + + sed -e "s,^desktop=,desktop=$desktop," %{SOURCE3} > config.sh sed -e "s,@CONFIG@,/usr/share/openSUSE-kiwi/$config," %{SOURCE4} > config.xml sed -i -e "s,@VERSION@,$kiwiversion," config.xml sed -i -e "s,@FLAVOR@,$config," config.xml - volid="openSUSE %{version} Live" + volid="openSUSE Tumbleweed Live" case $desktop in gnome) sed -i -e "s,@PLIST@,GNOME-cd," config.xml - volid="openSUSE %{version} GNOME Live" + volid="openSUSE Tumbleweed GNOME Live" ;; kde) sed -i -e "s,@PLIST@,KDE-cd," config.xml - volid="openSUSE %{version} KDE Live" + volid="openSUSE Tumbleweed KDE Live" ;; x11) sed -i -e "s,@PLIST@,X11-cd," config.xml ++ config.sh.in ++ #!/bin/bash # # FILE : config.sh # # PROJECT : OpenSuSE KIWI Image System # COPYRIGHT : (c) 2006,2007,2008 SUSE LINUX Products GmbH. All rights reserved # : # AUTHOR: Marcus Schaefer, Stephan Kulow # : # LICENSE : BSD #== # Functions... #-- test -f /.kconfig && . /.kconfig test -f /.profile && . /.profile set -e set -x # Filled by the .spec file desktop= exec | tee /var/log/config.log exec 2>&1 pl=`rpmqpack | grep package-lists-` || true test -z "$pl" || rpm -e $pl #== # Greeting... #-- echo "Configure image: [$name]..." #-- # enable and disable services for i in langset NetworkManager SuSEfirewall2; do systemctl -f enable $i done for i in sshd cron wicked purge-kernels; do systemctl -f disable $i done cd / if test -e /etc/YaST2/liveinstall.patch; then patch -p0 < /etc/YaST2/liveinstall.patch fi for i in /rpmkeys/gpg*.asc; do # the import fails if kiwi already had this key rpm --import $i || true rm $i done rmdir /rpmkeys rm -rf /var/cache/zypp/raw/* bash -x /var/lib/livecd/geturls.sh rm /var/lib/livecd/geturls.sh #== # /etc/sudoers hack to fix #297695 # (Installation Live CD: no need to ask for password of root) #-- sed -i -e "s/ALL ALL=(ALL) ALL/ALL ALL=(ALL) NOPASSWD: ALL/" /etc/sudoers chmod 0440 /etc/sudoers /usr/sbin/useradd -m -u 999 linux -c "Live-CD User" -p "" # delete passwords passwd -d root passwd -d linux #
commit kiwi-config-openSUSE for openSUSE:Factory
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.0 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2016-07-21 08:19:30.0 +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.0 +0200 +++ /var/tmp/diff_new_pack.VgjnZC/_new 2016-07-21 08:19:33.0 +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.0 +0200 +++ /var/tmp/diff_new_pack.VgjnZC/_new 2016-07-21 08:19:33.0 +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.0 +0200 +++ /var/tmp/diff_new_pack.VgjnZC/_new 2016-07-21 08:19:33.0 +0200 @@ -25,6 +25,8 @@ + + ++ 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.0 +0200 +++ /var/tmp/diff_new_pack.VgjnZC/_new 2016-07-21 08:19:33.0 +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
commit kiwi-config-openSUSE for openSUSE:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2016-07-09 09:25:52 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-05-25 21:29:48.0 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2016-07-09 09:26:12.0 +0200 @@ -1,0 +2,5 @@ +Fri Jul 8 18:30:55 UTC 2016 - co...@suse.com + +- simplify isopatch.sh and leave kiwi defaults + +--- Other differences: -- ++ isopatch.sh.in ++ --- /var/tmp/diff_new_pack.xkacIl/_old 2016-07-09 09:26:13.0 +0200 +++ /var/tmp/diff_new_pack.xkacIl/_new 2016-07-09 09:26:13.0 +0200 @@ -4,20 +4,9 @@ desktop= -#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 - sed -i -e "s,showopts ide=nodma.*,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 # remove splash for mediacheck sed -i -e 's,mediacheck=1 splash=silent quiet,mediacheck=1,' 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,key.F4=$,key.F4=kernelopts,' boot/*/loader/gfxboot.cfg bootd=$(ls -1d boot/*/loader)
commit kiwi-config-openSUSE for openSUSE:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2016-05-25 21:29:47 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-03-26 15:25:28.0 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2016-05-25 21:29:48.0 +0200 @@ -1,0 +2,6 @@ +Wed May 18 08:55:36 UTC 2016 - dleuenber...@suse.com + +- Do not apply the live-installer patch anymore: + yast2-live-installer has been dropped. + +--- Other differences: -- ++ kiwi-config-openSUSE.spec ++ --- /var/tmp/diff_new_pack.DOQ7yf/_old 2016-05-25 21:29:50.0 +0200 +++ /var/tmp/diff_new_pack.DOQ7yf/_new 2016-05-25 21:29:50.0 +0200 @@ -65,7 +65,7 @@ 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} +#patch -p0 < %{SOURCE26} %build kiwiversion=13.2 @@ -147,9 +147,10 @@ cp -a $localedir etc/langset install -m 755 %{SOURCE23} etc/langset.sh install -D -m 644 %{SOURCE16} usr/lib/systemd/system/langset.service - 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 +# 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 mkdir -p var/lib/zypp/ echo livecd-$desktop > var/lib/zypp/LastDistributionFlavor ++ config.xml.in ++ --- /var/tmp/diff_new_pack.DOQ7yf/_old 2016-05-25 21:29:50.0 +0200 +++ /var/tmp/diff_new_pack.DOQ7yf/_new 2016-05-25 21:29:50.0 +0200 @@ -24,7 +24,7 @@ - + ++ isopatch.sh.in ++ --- /var/tmp/diff_new_pack.DOQ7yf/_old 2016-05-25 21:29:50.0 +0200 +++ /var/tmp/diff_new_pack.DOQ7yf/_new 2016-05-25 21:29:50.0 +0200 @@ -7,7 +7,8 @@ #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 + #sed -i -e "s,showopts ide=nodma.*,liveinstall showopts," boot/*/loader/isolinux.cfg + sed -i -e "s,showopts ide=nodma.*,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
commit kiwi-config-openSUSE for openSUSE:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2016-03-26 15:25:22 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-02-22 08:57:54.0 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2016-03-26 15:25:28.0 +0100 @@ -1,0 +2,5 @@ +Wed Mar 16 01:21:22 UTC 2016 - dval...@suse.com + +- Add ppc64le to excludearch + +--- Other differences: -- ++ kiwi-config-openSUSE.spec ++ --- /var/tmp/diff_new_pack.MRNKIM/_old 2016-03-26 15:25:30.0 +0100 +++ /var/tmp/diff_new_pack.MRNKIM/_new 2016-03-26 15:25:30.0 +0100 @@ -54,7 +54,7 @@ Source30: GPL-2.0.txt Source31: gpl-3.0.txt Source32: kiwi-config-openSUSE-rpmlintrc -ExcludeArch:ia64 ppc64 s390x s390 ppc +ExcludeArch:ia64 ppc64 ppc64le s390x s390 ppc %description The package contains various kiwi configs for openSUSE live media
commit kiwi-config-openSUSE for openSUSE:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2016-02-22 08:57:47 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 2015-12-23 08:50:39.0 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2016-02-22 08:57:54.0 +0100 @@ -1,0 +2,6 @@ +Thu Feb 4 05:15:31 UTC 2016 - cyber...@opensuse.org + +- Use ext4 for hybridpersistent_filesystem, boo #950999 +- disable journaling in live mode, fixes boo #950999 + +--- Other differences: -- ++ kiwi-config-openSUSE.spec ++ --- /var/tmp/diff_new_pack.CYAELz/_old 2016-02-22 08:57:55.0 +0100 +++ /var/tmp/diff_new_pack.CYAELz/_new 2016-02-22 08:57:55.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package kiwi-config-openSUSE # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 ++ config.sh ++ --- /var/tmp/diff_new_pack.CYAELz/_old 2016-02-22 08:57:55.0 +0100 +++ /var/tmp/diff_new_pack.CYAELz/_new 2016-02-22 08:57:55.0 +0100 @@ -109,3 +109,7 @@ # bug 891183 yast2 live-installer --gtk segfaults baseUpdateSysConfig /etc/sysconfig/yast2 WANTED_GUI qt + +#Disable journal write to disk in live mode, bug 950999 +echo "Storage=volatile" >> /etc/systemd/journald.conf + ++ config.xml.in ++ --- /var/tmp/diff_new_pack.CYAELz/_old 2016-02-22 08:57:55.0 +0100 +++ /var/tmp/diff_new_pack.CYAELz/_new 2016-02-22 08:57:55.0 +0100 @@ -6,7 +6,7 @@ openSUSE @VERSION@ Live system - + 2.8.0 openSUSE openSUSE ++ correct_live_for_reboot ++ --- /var/tmp/diff_new_pack.CYAELz/_old 2016-02-22 08:57:55.0 +0100 +++ /var/tmp/diff_new_pack.CYAELz/_new 2016-02-22 08:57:55.0 +0100 @@ -25,3 +25,5 @@ rm -rf /home/linux/.local/share/akonadi mv /home/linux /home/linux~ +#undo journald.conf changes, bug 950999 +sed -i -e s@Storage=volatile@@ /etc/systemd/journald.conf
commit kiwi-config-openSUSE for openSUSE:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2015-12-23 08:50:37 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 2015-11-02 12:55:04.0 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2015-12-23 08:50:39.0 +0100 @@ -1,0 +2,5 @@ +Mon Dec 14 15:00:47 UTC 2015 - dleuenber...@suse.com + +- Change skelcd-openSUSE-CD BuildRequires to skelcd-openSUSE. + +--- Other differences: -- ++ kiwi-config-openSUSE.spec ++ --- /var/tmp/diff_new_pack.FJMsGe/_old 2015-12-23 08:50:40.0 +0100 +++ /var/tmp/diff_new_pack.FJMsGe/_new 2015-12-23 08:50:40.0 +0100 @@ -27,7 +27,7 @@ BuildRequires: libxml2-tools BuildRequires: libxslt BuildRequires: skelcd-control-openSUSE >= 13.2.15 -BuildRequires: skelcd-openSUSE-CD +BuildRequires: skelcd-openSUSE BuildRequires: xdm BuildRequires: yast2-country BuildRequires: yast2-installation
commit kiwi-config-openSUSE for openSUSE:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2015-11-02 12:55:01 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 2015-05-24 19:33:49.0 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2015-11-02 12:55:04.0 +0100 @@ -1,0 +2,6 @@ +Fri Oct 23 15:31:30 UTC 2015 - dims...@opensuse.org + +- Rebase kiwi-config-openSUSE.changes: xdm's display-manager + received a minor fix. + +--- Other differences: -- ++ kiwi-config-openSUSE.spec ++ --- /var/tmp/diff_new_pack.ofjfff/_old 2015-11-02 12:55:05.0 +0100 +++ /var/tmp/diff_new_pack.ofjfff/_new 2015-11-02 12:55:05.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package kiwi-config-openSUSE # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 ++ xdm-liveinstall.patch ++ --- /var/tmp/diff_new_pack.ofjfff/_old 2015-11-02 12:55:05.0 +0100 +++ /var/tmp/diff_new_pack.ofjfff/_new 2015-11-02 12:55:05.0 +0100 @@ -1,6 +1,27 @@ usr/lib/YaST2/startup/YaST2.call.orig 2011-02-17 14:54:48.0 + -+++ usr/lib/YaST2/startup/YaST2.call2011-04-08 08:01:31.0 + -@@ -646,7 +646,9 @@ +Index: usr/lib/X11/display-manager +=== +--- usr/lib/X11/display-manager.orig usr/lib/X11/display-manager +@@ -182,7 +182,13 @@ case "$1" in + rc_exit + fi + fi +- startproc -p $PIDFILE $DISPLAYMANAGER $XDMOPTIONS || rc_failed ++ if cat /proc/cmdline | grep -q liveinstall; then ++ [ -x /usr/bin/plymouth ] && /usr/bin/plymouth quit ++ startproc -p $PIDFILE /usr/lib/YaST2/startup/YaST2.call live-installer ++ else ++ startproc -p $PIDFILE $DISPLAYMANAGER $XDMOPTIONS || rc_failed ++ fi ++ + if rc_status ; then + # when started up successfuly, use DMs PID file as ours + ln -snf $PIDFILE $PIDFILELNK +Index: usr/lib/YaST2/startup/YaST2.call +=== +--- usr/lib/YaST2/startup/YaST2.call.orig usr/lib/YaST2/startup/YaST2.call +@@ -632,7 +632,9 @@ esac # 8) Call YaST2 #- Y2_MODULE_NAME=${1:-installation}; shift @@ -10,21 +31,3 @@ start_yast #= - usr/lib/X11/display-manager.orig 2012-09-19 14:09:30.0 + -+++ usr/lib/X11/display-manager2012-09-19 14:10:05.0 + -@@ -182,7 +182,13 @@ - rc_exit - fi - fi -- startproc -p $PIDFILE $DISPLAYMANAGER $XDMOPTIONS || rc_failed -+if cat /proc/cmdline | grep -q liveinstall; then -+[ -x /usr/bin/plymouth ] && /usr/bin/plymouth quit -+startproc -p $PIDFILE /usr/lib/YaST2/startup/YaST2.call live-installer -+else -+ startproc -p $PIDFILE $DISPLAYMANAGER $XDMOPTIONS || rc_failed -+fi -+ - # After a crash or a kill signal we may have - # a wrong ownership of /dev/xconsole - if rc_status ; then
commit kiwi-config-openSUSE for openSUSE:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2015-05-24 19:33:48 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 2015-05-15 10:06:07.0 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2015-05-24 19:33:49.0 +0200 @@ -1,0 +2,5 @@ +Fri May 22 10:36:06 UTC 2015 - jseg...@novell.com + +- Enable firewall by default + +--- Other differences: -- ++ kiwi-config-openSUSE.spec ++ --- /var/tmp/diff_new_pack.q2FoGb/_old 2015-05-24 19:33:50.0 +0200 +++ /var/tmp/diff_new_pack.q2FoGb/_new 2015-05-24 19:33:50.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package kiwi-config-openSUSE # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 ++ config.sh ++ --- /var/tmp/diff_new_pack.q2FoGb/_old 2015-05-24 19:33:50.0 +0200 +++ /var/tmp/diff_new_pack.q2FoGb/_new 2015-05-24 19:33:50.0 +0200 @@ -31,7 +31,7 @@ #-- # enable and disable services -for i in langset NetworkManager; do +for i in langset NetworkManager SuSEfirewall2; do systemctl -f enable $i done for i in sshd cron wicked purge-kernels; do
commit kiwi-config-openSUSE for openSUSE:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2014-12-05 21:04:01 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 2014-11-18 22:44:50.0 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2014-12-05 21:03:53.0 +0100 @@ -1,0 +2,5 @@ +Thu Dec 4 08:05:09 UTC 2014 - dims...@opensuse.org + +- Update schemaversion to 6.2 for new kiwi version. + +--- Other differences: -- ++ config.xml.in ++ --- /var/tmp/diff_new_pack.J27q6Q/_old 2014-12-05 21:03:54.0 +0100 +++ /var/tmp/diff_new_pack.J27q6Q/_new 2014-12-05 21:03:54.0 +0100 @@ -1,5 +1,5 @@ ?xml version=1.0? -image schemaversion=6.1 name=openSUSE-@VERSION@-@FLAVOR@ displayname=@LABEL@ +image schemaversion=6.2 name=openSUSE-@VERSION@-@FLAVOR@ displayname=@LABEL@ description type=system authorStephan Kulow/author contactco...@novell.com/contact -- 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:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2014-11-18 22:44:41 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 2014-11-03 13:13:27.0 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2014-11-18 22:44:50.0 +0100 @@ -1,0 +2,5 @@ +Wed Nov 12 14:52:26 UTC 2014 - dims...@opensuse.org + +- Also remove quiet from mediacheck (or kiwi swallows the output). + +--- Other differences: -- ++ kiwi-config-openSUSE.spec ++ --- /var/tmp/diff_new_pack.L6fbyY/_old 2014-11-18 22:44:52.0 +0100 +++ /var/tmp/diff_new_pack.L6fbyY/_new 2014-11-18 22:44:52.0 +0100 @@ -34,7 +34,7 @@ Summary:KDE live CD License:BSD-3-Clause Group: System/Boot -Version:13.2 +Version:13.3 Release:0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source1:COPYING ++ isopatch.sh.in ++ --- /var/tmp/diff_new_pack.L6fbyY/_old 2014-11-18 22:44:52.0 +0100 +++ /var/tmp/diff_new_pack.L6fbyY/_new 2014-11-18 22:44:52.0 +0100 @@ -14,7 +14,7 @@ fi 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,mediacheck=1,' boot/*/loader/isolinux.cfg +sed -i -e 's,mediacheck=1 splash=silent quiet,mediacheck=1,' 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,key.F4=$,key.F4=kernelopts,' boot/*/loader/gfxboot.cfg -- 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:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2014-11-03 13:12:05 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 2014-10-29 21:11:02.0 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2014-11-03 13:13:27.0 +0100 @@ -1,0 +2,5 @@ +Sat Nov 1 07:22:29 UTC 2014 - co...@suse.com + +- remove splash from mediacheck + +--- Other differences: -- ++ isopatch.sh.in ++ --- /var/tmp/diff_new_pack.4bDZGD/_old 2014-11-03 13:13:28.0 +0100 +++ /var/tmp/diff_new_pack.4bDZGD/_new 2014-11-03 13:13:28.0 +0100 @@ -13,6 +13,8 @@ #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 +# remove splash for mediacheck +sed -i -e 's,mediacheck=1 splash=silent,mediacheck=1,' 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,key.F4=$,key.F4=kernelopts,' boot/*/loader/gfxboot.cfg -- 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:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2014-10-29 21:10:16 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 2014-10-15 08:52:30.0 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2014-10-29 21:11:02.0 +0100 @@ -1,0 +2,8 @@ +Mon Oct 27 14:27:23 UTC 2014 - dims...@opensuse.org + +- Add kernelcmdline=splash=silent quite to the preferences in + config.xml.in. +- No longer mangle the kernel cmdline in isopatch, as we pass the + wanted splash mode in kernelcmdline directly now. + +--- Other differences: -- ++ config.xml.in ++ --- /var/tmp/diff_new_pack.NQYDWO/_old 2014-10-29 21:11:04.0 +0100 +++ /var/tmp/diff_new_pack.NQYDWO/_new 2014-10-29 21:11:04.0 +0100 @@ -6,7 +6,7 @@ specificationopenSUSE @VERSION@ Live system/specification /description preferences -type primary=true boot=isoboot/suse-@VERSION@ bootprofile=default bootkernel=@BOOTKERNEL@ filesystem=ext4 flags=overlay hybrid=true hybridpersistent=true image=iso editbootconfig=isopatch.sh firmware=uefi volid=@VOLID@/ +type primary=true boot=isoboot/suse-@VERSION@ bootprofile=default bootkernel=@BOOTKERNEL@ kernelcmdline=splash=silent quiet filesystem=ext4 flags=overlay hybrid=true hybridpersistent=true image=iso editbootconfig=isopatch.sh firmware=uefi volid=@VOLID@/ version2.8.0/version bootloader-themeopenSUSE/bootloader-theme bootsplash-themeopenSUSE/bootsplash-theme ++ isopatch.sh.in ++ --- /var/tmp/diff_new_pack.NQYDWO/_old 2014-10-29 21:11:04.0 +0100 +++ /var/tmp/diff_new_pack.NQYDWO/_new 2014-10-29 21:11:04.0 +0100 @@ -15,7 +15,6 @@ 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,splash=silent,splash=silent quiet, boot/*/loader/isolinux.cfg sed -i -e 's,key.F4=$,key.F4=kernelopts,' boot/*/loader/gfxboot.cfg bootd=$(ls -1d boot/*/loader) -- 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:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2014-10-15 08:51:50 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 2014-09-23 10:42:54.0 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2014-10-15 08:52:30.0 +0200 @@ -1,0 +2,5 @@ +Tue Oct 14 13:05:41 UTC 2014 - jreidin...@suse.com + +- convert yast script to ruby (bnc#897483) + +--- Old: getcountrydata.ycp New: getcountrydata.rb Other differences: -- ++ kiwi-config-openSUSE.spec ++ --- /var/tmp/diff_new_pack.ZYDWKT/_old 2014-10-15 08:52:31.0 +0200 +++ /var/tmp/diff_new_pack.ZYDWKT/_new 2014-10-15 08:52:31.0 +0200 @@ -47,7 +47,7 @@ Source16: langset.service Source17: 99-ignore-live-usb.fdi Source20: geturls.xsl -Source22: getcountrydata.ycp +Source22: getcountrydata.rb Source23: langset.sh Source26: xdm-liveinstall.patch Source27: SoftLocks ++ getcountrydata.rb ++ # encoding: utf-8 module Yast class GetcountrydataClient Client def main Yast.import Language Yast.import Keyboard Yast.import Console langs = Language.GetLanguagesMap(true) consolefonts = SCR.Read(path(.target.yast2), consolefonts.ycp) timezonemap = Language.GetLang2TimezoneMap(true) dir = ENV[OUTPUTDIR] raise OUTPUTDIR is not set unless dir Builtins.foreach(langs) do |lang, ll| suffix = ll[2] || fqlanguage = lang + suffix kbd = Keyboard.GetKeyboardForLanguage(lang, us) # does not really set keyboard, only fills some data Keyboard.SetKeyboard(kbd) # set language for encoding WFM.SetLanguage(fqlanguage) yast_kbd = #{kbd},#{Keyboard.kb_model} consolefont = consolefonts[fqlanguage] || consolefonts[lang] || [] font = consolefont[0] || unicodeMap = consolefont[1] || screenMap = consolefont[2] || magic = consolefont[3] || timezone = timezonemap[lang] || contents = RC_LANG: #{fqlanguage}\n + CONSOLE_FONT: #{font}\n + CONSOLE_SCREENMAP: #{screenMap}\n + CONSOLE_UNICODEMAP: #{unicodeMap}\n + CONSOLE_MAGIC: #{magic}\n + KEYTABLE: #{Keyboard.keymap}\n + YAST_KEYBOARD: #{yast_kbd}\n + COMPOSETABLE: #{Keyboard.compose_table}\n + TIMEZONE: #{timezone}\n + CONSOLE_ENCODING: #{WFM.GetEncoding} contents \nRC_LC_MESSAGES: zh_TW.UTF-8 if lang == zh_HK x11data = Keyboard.GetX11KeyData(Keyboard.keymap) Builtins.foreach(x11data) do |key, val| contents \n#{key}: #{val} end contents \n SCR.Write(path(.target.string), dir + fqlanguage, contents) end end end end Yast::GetcountrydataClient.new.main -- 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:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2014-09-23 10:42:35 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 2014-09-22 09:23:30.0 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2014-09-23 10:42:54.0 +0200 @@ -1,0 +2,5 @@ +Mon Sep 22 09:37:45 UTC 2014 - co...@suse.com + +- fix previous change, it's RC_LANG not RC_ALL + +--- Other differences: -- ++ config.sh ++ --- /var/tmp/diff_new_pack.cRdcuS/_old 2014-09-23 10:42:56.0 +0200 +++ /var/tmp/diff_new_pack.cRdcuS/_new 2014-09-23 10:42:56.0 +0200 @@ -97,10 +97,10 @@ ln -s /usr/lib/systemd/system/runlevel5.target /etc/systemd/system/default.target baseUpdateSysConfig /etc/sysconfig/displaymanager DISPLAYMANAGER_AUTOLOGIN linux baseUpdateSysConfig /etc/sysconfig/keyboard KEYTABLE us.map.gz -baseUpdateSysConfig /etc/sysconfig/keyboard YAST_KEYBOARD english-us,pc104 +baseUpdateSysConfig /etc/sysconfig/keyboard YAST_KEYBOARD english-us,pc104 baseUpdateSysConfig /etc/sysconfig/keyboard COMPOSETABLE clear latin1.add -baseUpdateSysConfig /etc/sysconfig/language RC_ALL en_US.UTF-8 +baseUpdateSysConfig /etc/sysconfig/language RC_LANG en_US.UTF-8 baseUpdateSysConfig /etc/sysconfig/console CONSOLE_FONT lat9w-16.psfu baseUpdateSysConfig /etc/sysconfig/console CONSOLE_SCREENMAP trivial ++ langset.service ++ --- /var/tmp/diff_new_pack.cRdcuS/_old 2014-09-23 10:42:56.0 +0200 +++ /var/tmp/diff_new_pack.cRdcuS/_new 2014-09-23 10:42:56.0 +0200 @@ -2,7 +2,7 @@ Description=setup language based on kernel commandline DefaultDependencies=no Conflicts=shutdown.target -Before=sysinit.target shutdown.target systemd-vconsole-setup.service +Before=sysinit.target shutdown.target systemd-vconsole-setup.service systemd-localed.service ConditionPathExists=!/var/lib/zypp/RequestedLocales [Service] -- 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:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2014-09-22 09:23:27 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 2014-09-18 07:12:53.0 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2014-09-22 09:23:30.0 +0200 @@ -1,0 +2,11 @@ +Fri Sep 19 11:25:12 UTC 2014 - co...@suse.com + +- set some english defaults to get the console into proper UTF-8 + during boot + +--- +Fri Sep 19 09:15:58 UTC 2014 - co...@suse.com + +- fix permissions of langset.service + +--- New: kiwi-config-openSUSE-rpmlintrc Other differences: -- ++ kiwi-config-openSUSE.spec ++ --- /var/tmp/diff_new_pack.TOcv4A/_old 2014-09-22 09:23:31.0 +0200 +++ /var/tmp/diff_new_pack.TOcv4A/_new 2014-09-22 09:23:31.0 +0200 @@ -53,6 +53,7 @@ Source27: SoftLocks Source30: GPL-2.0.txt Source31: gpl-3.0.txt +Source32: kiwi-config-openSUSE-rpmlintrc ExcludeArch:ia64 ppc64 s390x s390 ppc %description @@ -124,6 +125,7 @@ jing /usr/share/kiwi/modules/KIWISchema.rng config.xml sed -e s,^desktop=,desktop=$desktop, %{SOURCE9} isopatch.sh + chmod a+x isopatch.sh #test -z $out # jing is a great tool always exit 0 mkdir config-cdroot cd config-cdroot @@ -144,7 +146,7 @@ echo 0123456-7890-$desktop-$type-0123456 var/lib/zypp/AnonymousUniqueId cp -a $localedir etc/langset install -m 755 %{SOURCE23} etc/langset.sh - install -D -m 755 %{SOURCE16} usr/lib/systemd/system/langset.service + install -D -m 644 %{SOURCE16} usr/lib/systemd/system/langset.service 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 ++ config.sh ++ --- /var/tmp/diff_new_pack.TOcv4A/_old 2014-09-22 09:23:31.0 +0200 +++ /var/tmp/diff_new_pack.TOcv4A/_new 2014-09-22 09:23:31.0 +0200 @@ -98,6 +98,14 @@ baseUpdateSysConfig /etc/sysconfig/displaymanager DISPLAYMANAGER_AUTOLOGIN linux baseUpdateSysConfig /etc/sysconfig/keyboard KEYTABLE us.map.gz baseUpdateSysConfig /etc/sysconfig/keyboard YAST_KEYBOARD english-us,pc104 +baseUpdateSysConfig /etc/sysconfig/keyboard COMPOSETABLE clear latin1.add + +baseUpdateSysConfig /etc/sysconfig/language RC_ALL en_US.UTF-8 + +baseUpdateSysConfig /etc/sysconfig/console CONSOLE_FONT lat9w-16.psfu +baseUpdateSysConfig /etc/sysconfig/console CONSOLE_SCREENMAP trivial +baseUpdateSysConfig /etc/sysconfig/console CONSOLE_MAGIC (K +baseUpdateSysConfig /etc/sysconfig/console CONSOLE_ENCODING UTF-8 # bug 891183 yast2 live-installer --gtk segfaults baseUpdateSysConfig /etc/sysconfig/yast2 WANTED_GUI qt ++ kiwi-config-openSUSE-rpmlintrc ++ # we're just config addFilter(systemd-service-without-service_.*); ++ langset.sh ++ --- /var/tmp/diff_new_pack.TOcv4A/_old 2014-09-22 09:23:31.0 +0200 +++ /var/tmp/diff_new_pack.TOcv4A/_new 2014-09-22 09:23:31.0 +0200 @@ -25,7 +25,6 @@ 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 -# sed -i -e s#$key=\.*#$key=\$value\# /etc/sysconfig/clock done echo $Language_$Country /var/lib/zypp/RequestedLocales -- 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:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2014-09-18 07:12:52 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 2014-09-10 17:03:09.0 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2014-09-18 07:12:53.0 +0200 @@ -1,0 +2,16 @@ +Wed Sep 17 04:49:28 UTC 2014 - co...@suse.com + +- buildrequire the fixed control.xml + +--- +Mon Sep 15 10:00:53 UTC 2014 - co...@suse.com + +- more cleanup of old usb stuff + +--- +Sun Sep 14 10:28:37 UTC 2014 - cyber...@opensuse.org + +- Fix langset.service to start on boot by adding install section + in langset.service + +--- Other differences: -- ++ kiwi-config-openSUSE.spec ++ --- /var/tmp/diff_new_pack.oTkT9n/_old 2014-09-18 07:12:54.0 +0200 +++ /var/tmp/diff_new_pack.oTkT9n/_new 2014-09-18 07:12:54.0 +0200 @@ -26,7 +26,7 @@ BuildRequires: kiwi-tools BuildRequires: libxml2-tools BuildRequires: libxslt -BuildRequires: skelcd-control-openSUSE +BuildRequires: skelcd-control-openSUSE = 13.2.15 BuildRequires: skelcd-openSUSE-CD BuildRequires: xdm BuildRequires: yast2-country @@ -110,7 +110,6 @@ ;; x11) sed -i -e s,@PLIST@,X11-cd, config.xml - sed -i -e '/yast2-live-installer/d' config.xml ;; esac label=`echo $volid | sed -e 's, ,_,g'` @@ -148,9 +147,7 @@ install -D -m 755 %{SOURCE16} usr/lib/systemd/system/langset.service install -D -m 755 %{SOURCE11} usr/bin/correct_live_for_reboot install -D -m 755 %{SOURCE12} usr/bin/correct_live_install - if test $desktop != x11; then install -m 644 %{SOURCE26} etc/YaST2/liveinstall.patch - fi mkdir -p var/lib/zypp/ echo livecd-$desktop var/lib/zypp/LastDistributionFlavor ++ config.sh ++ --- /var/tmp/diff_new_pack.oTkT9n/_old 2014-09-18 07:12:54.0 +0200 +++ /var/tmp/diff_new_pack.oTkT9n/_new 2014-09-18 07:12:54.0 +0200 @@ -44,10 +44,6 @@ patch -p0 /etc/YaST2/liveinstall.patch fi -if test -f /etc/YaST2/firstboot.xml -a -f /var/lib/livecd/config-firstboot.patch; then - patch -f /etc/YaST2/firstboot.xml /var/lib/livecd/config-firstboot.patch -fi - for i in /rpmkeys/gpg*.asc; do # the import fails if kiwi already had this key rpm --import $i || true @@ -103,3 +99,5 @@ baseUpdateSysConfig /etc/sysconfig/keyboard KEYTABLE us.map.gz baseUpdateSysConfig /etc/sysconfig/keyboard YAST_KEYBOARD english-us,pc104 +# bug 891183 yast2 live-installer --gtk segfaults +baseUpdateSysConfig /etc/sysconfig/yast2 WANTED_GUI qt ++ correct_live_install ++ --- /var/tmp/diff_new_pack.oTkT9n/_old 2014-09-18 07:12:54.0 +0200 +++ /var/tmp/diff_new_pack.oTkT9n/_new 2014-09-18 07:12:54.0 +0200 @@ -3,11 +3,6 @@ # this script is called from the live installer once it is done (including 2nd stage) # So the goal of this script is to fix whatever configs were changed for the live system -is_usb=0 -if test $1 = usb; then - is_usb=1 -fi - #== # /etc/sudoers hack to fix #297695 # (Installation Live CD: no need to ask for password of root) @@ -22,10 +17,8 @@ # reset pam config pam-config -d --nullok -if test $is_usb = 0; then - # remove unneeded /license.tar.gz - rm /license.tar.gz -fi +# remove unneeded /license.tar.gz +rm /license.tar.gz # remove langset stuff rm /etc/langset.sh @@ -38,13 +31,6 @@ # bug 391798 sed -i -e 's,DISPLAYMANAGER_AUTOLOGIN=linux,DISPLAYMANAGER_AUTOLOGIN=,' /etc/sysconfig/displaymanager -if test $is_usb = 0; then - # not good enough for usb - # there we need something dynamic in firstboot - /bin/cat /proc/sys/kernel/random/uuid /etc/smolt/uuid - rm /license.tar.gz -fi - rm -f /var/lib/zypp/AnonymousUniqueId rmdir /livecd || true rmdir /read-only || true ++ langset.service ++ --- /var/tmp/diff_new_pack.oTkT9n/_old 2014-09-18 07:12:54.0 +0200 +++ /var/tmp/diff_new_pack.oTkT9n/_new 2014-09-18 07:12:54.0 +0200 @@ -9,3 +9,6 @@ Type=oneshot RemainAfterExit=yes ExecStart=/bin/sh /etc/langset.sh + +[Install] +WantedBy=default.target -- 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:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2014-09-10 17:02:28 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 2014-08-25 11:05:10.0 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2014-09-10 17:03:09.0 +0200 @@ -1,0 +2,21 @@ +Tue Sep 9 14:30:01 UTC 2014 - co...@suse.com + +- disable usb configs, remove config-hal.patch and config-firstboot.patch + +--- +Tue Sep 9 14:20:31 UTC 2014 - co...@suse.com + +- remove clicfs support - we don't use it anymore + +--- +Tue Sep 9 14:16:14 UTC 2014 - lnus...@suse.de + +- remove ifcfg-eth0, not used anymore + +--- +Tue Sep 9 12:41:10 UTC 2014 - lnus...@suse.de + +- disable wicked +- throw out obsolete sound card hacks, /etc/hosts hack + +--- Old: clicfs.service config-firstboot.patch config-hal.patch ifcfg-eth0 Other differences: -- ++ kiwi-config-openSUSE.spec ++ --- /var/tmp/diff_new_pack.mXg0f2/_old 2014-09-10 17:03:10.0 +0200 +++ /var/tmp/diff_new_pack.mXg0f2/_new 2014-09-10 17:03:10.0 +0200 @@ -38,23 +38,19 @@ Release:0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source1:COPYING -Source2:config-hal.patch 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 Source16: langset.service Source17: 99-ignore-live-usb.fdi -Source19: config-firstboot.patch Source20: geturls.xsl Source22: getcountrydata.ycp Source23: langset.sh Source26: xdm-liveinstall.patch Source27: SoftLocks -Source28: clicfs.service Source30: GPL-2.0.txt Source31: gpl-3.0.txt ExcludeArch:ia64 ppc64 s390x s390 ppc @@ -80,19 +76,12 @@ mv $i ${i/.UTF-8/} done popd -for config in livecd-kde livecd-gnome usb-kde usb-gnome livecd-x11 usb-x11; do +for config in livecd-kde livecd-gnome livecd-x11; do cd $BASEDIR mkdir $config cd $config desktop=`echo $config | cut -d- -f2` type=`echo $config | cut -d- -f1` - if test $type = usb; then -#sed -i -e s,yast2-live-installer,yast2-firstboot, wanted.list -#sed -i -e s,release-livecd,release-usb, wanted.list -othertype=livecd - else -othertype=usb - fi install -m 755 %{SOURCE3} config.sh if test $desktop = kde; then echo 'baseUpdateSysConfig /etc/sysconfig/displaymanager DISPLAYMANAGER kdm4' config.sh @@ -106,18 +95,7 @@ echo 'baseUpdateSysConfig /etc/sysconfig/windowmanager DEFAULT_WM xfce' config.sh fi - if test $type = usb; then - echo 'baseUpdateSysConfig /etc/sysconfig/clock TIMEZONE UTC' config.sh - fi - - echo '/usr/bin/systemctl -f enable NetworkManager.service' config.sh - - grep -v type:$othertype %{SOURCE4} | \ -xmllint --format - config.xml - if test $type = usb; then -sed -i -e 's,#USB ,,' config.sh - fi - sed -i -e s,@CONFIG@,/usr/share/openSUSE-kiwi/$config, config.xml + sed -e s,@CONFIG@,/usr/share/openSUSE-kiwi/$config, %{SOURCE4} config.xml sed -i -e s,@VERSION@,$kiwiversion, config.xml sed -i -e s,@FLAVOR@,$config, config.xml volid=openSUSE %{version} Live @@ -136,9 +114,6 @@ ;; 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,; s,@LABEL@,$label, config.xml %ifarch x86_64 sed -i -e s,@BOOTKERNEL@,desktop, config.xml @@ -146,6 +121,7 @@ sed -i -e s,@BOOTKERNEL@,std, config.xml sed -i -e 's,firmware=uefi,,' config.xml %endif + xmllint --format config.xml t mv t config.xml jing /usr/share/kiwi/modules/KIWISchema.rng config.xml sed -e s,^desktop=,desktop=$desktop, %{SOURCE9} isopatch.sh @@ -167,22 +143,11 @@ mkdir -p var/lib/zypp install -m 644 %{SOURCE27} var/lib/zypp/SoftLocks echo 0123456-7890-$desktop-$type-0123456 var/lib/zypp/AnonymousUniqueId - if test $type = usb; then -cp %{SOURCE19} var/lib/livecd/config-firstboot.patch -mkdir -p var/lib/YaST2 -touch var/lib/YaST2/reconfig_system -#
commit kiwi-config-openSUSE for openSUSE:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2014-08-25 11:04:02 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 2014-04-29 17:35:24.0 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2014-08-25 11:05:10.0 +0200 @@ -1,0 +2,5 @@ +Fri Aug 15 12:04:06 UTC 2014 - lnus...@suse.de + +- workaround for bnc#892087, add e2fsprogs to bootinclude packages + +--- Other differences: -- ++ config.xml.in ++ --- /var/tmp/diff_new_pack.OnlRBy/_old 2014-08-25 11:05:11.0 +0200 +++ /var/tmp/diff_new_pack.OnlRBy/_new 2014-08-25 11:05:11.0 +0200 @@ -29,6 +29,8 @@ packages type=image patternType=onlyRequired package name=gfxboot-branding-openSUSE bootinclude=true bootdelete=true/ package name=grub2-branding-openSUSE bootinclude=true/ +!-- workaround for bnc#892087 -- +package name=e2fsprogs 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:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2014-04-29 17:35:23 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 2014-03-25 13:23:26.0 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2014-04-29 17:35:24.0 +0200 @@ -1,0 +2,6 @@ +Tue Apr 29 11:23:50 UTC 2014 - co...@suse.com + +- create a PIDFILE for systemd even for live installer (2nd greatest + hack of all times) + +--- Other differences: -- ++ xdm-liveinstall.patch ++ --- /var/tmp/diff_new_pack.m0H1eO/_old 2014-04-29 17:35:25.0 +0200 +++ /var/tmp/diff_new_pack.m0H1eO/_new 2014-04-29 17:35:25.0 +0200 @@ -20,7 +20,7 @@ - startproc -p $PIDFILE $DISPLAYMANAGER $XDMOPTIONS || rc_failed +if cat /proc/cmdline | grep -q liveinstall; then +[ -x /usr/bin/plymouth ] /usr/bin/plymouth quit -+/usr/lib/YaST2/startup/YaST2.call live-installer ++startproc -p $PIDFILE /usr/lib/YaST2/startup/YaST2.call live-installer +else + startproc -p $PIDFILE $DISPLAYMANAGER $XDMOPTIONS || rc_failed +fi -- 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:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2014-03-25 13:23:25 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 2014-03-04 13:31:38.0 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2014-03-25 13:23:26.0 +0100 @@ -1,0 +2,5 @@ +Sun Mar 23 15:10:44 UTC 2014 - co...@suse.com + +- adapt to latest xdm changes + +--- Other differences: -- ++ kiwi-config-openSUSE.spec ++ --- /var/tmp/diff_new_pack.uyMUIH/_old 2014-03-25 13:23:28.0 +0100 +++ /var/tmp/diff_new_pack.uyMUIH/_new 2014-03-25 13:23:28.0 +0100 @@ -66,7 +66,7 @@ %setup -T -c testdir=$(mktemp -d) install -D /usr/lib/YaST2/startup/YaST2.call $testdir/usr/lib/YaST2/startup/YaST2.call -install -D /etc/init.d/xdm $testdir/etc/init.d/xdm +install -D /usr/lib/X11/display-manager $testdir/usr/lib/X11/display-manager cd $testdir patch -p0 %{SOURCE26} ++ xdm-liveinstall.patch ++ --- /var/tmp/diff_new_pack.uyMUIH/_old 2014-03-25 13:23:28.0 +0100 +++ /var/tmp/diff_new_pack.uyMUIH/_new 2014-03-25 13:23:28.0 +0100 @@ -11,9 +11,9 @@ #= etc/init.d/xdm.orig2012-09-19 14:09:30.0 + -+++ etc/init.d/xdm 2012-09-19 14:10:05.0 + -@@ -208,7 +208,13 @@ +--- usr/lib/X11/display-manager.orig 2012-09-19 14:09:30.0 + usr/lib/X11/display-manager2012-09-19 14:10:05.0 + +@@ -182,7 +182,13 @@ rc_exit fi fi -- 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:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2014-03-04 13:31:37 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 2014-02-22 18:10:49.0 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2014-03-04 13:31:38.0 +0100 @@ -1,0 +2,5 @@ +Mon Mar 3 08:58:53 UTC 2014 - co...@suse.com + +- increase schema version to 6.1 + +--- Other differences: -- ++ config.xml.in ++ --- /var/tmp/diff_new_pack.qn4Qz6/_old 2014-03-04 13:31:39.0 +0100 +++ /var/tmp/diff_new_pack.qn4Qz6/_new 2014-03-04 13:31:39.0 +0100 @@ -1,5 +1,5 @@ ?xml version=1.0? -image schemaversion=6.0 name=openSUSE-@VERSION@-@FLAVOR@ displayname=@LABEL@ +image schemaversion=6.1 name=openSUSE-@VERSION@-@FLAVOR@ displayname=@LABEL@ description type=system authorStephan Kulow/author contactco...@novell.com/contact -- 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:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2014-02-22 18:10:48 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 2014-01-16 14:13:47.0 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2014-02-22 18:10:49.0 +0100 @@ -1,0 +2,5 @@ +Sat Feb 22 06:01:49 UTC 2014 - co...@suse.com + +- do no longer patch sysconfig/clock + +--- Other differences: -- ++ config.sh ++ --- /var/tmp/diff_new_pack.s6DNRz/_old 2014-02-22 18:10:50.0 +0100 +++ /var/tmp/diff_new_pack.s6DNRz/_new 2014-02-22 18:10:50.0 +0100 @@ -119,5 +119,4 @@ baseUpdateSysConfig /etc/sysconfig/displaymanager DISPLAYMANAGER_AUTOLOGIN linux baseUpdateSysConfig /etc/sysconfig/keyboard KEYTABLE us.map.gz baseUpdateSysConfig /etc/sysconfig/keyboard YAST_KEYBOARD english-us,pc104 -baseUpdateSysConfig /etc/sysconfig/clock HWCLOCK -u ++ langset.sh ++ --- /var/tmp/diff_new_pack.s6DNRz/_old 2014-02-22 18:10:50.0 +0100 +++ /var/tmp/diff_new_pack.s6DNRz/_new 2014-02-22 18:10:50.0 +0100 @@ -25,7 +25,7 @@ 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 - sed -i -e s#$key=\.*#$key=\$value\# /etc/sysconfig/clock +# sed -i -e s#$key=\.*#$key=\$value\# /etc/sysconfig/clock done echo $Language_$Country /var/lib/zypp/RequestedLocales -- 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:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2014-01-16 14:13:46 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 2014-01-07 06:53:52.0 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2014-01-16 14:13:47.0 +0100 @@ -1,0 +2,5 @@ +Thu Jan 16 06:38:35 UTC 2014 - co...@suse.com + +- use schema version 6.0 + +--- Other differences: -- ++ config.xml.in ++ --- /var/tmp/diff_new_pack.M5DzQO/_old 2014-01-16 14:13:48.0 +0100 +++ /var/tmp/diff_new_pack.M5DzQO/_new 2014-01-16 14:13:48.0 +0100 @@ -1,5 +1,5 @@ ?xml version=1.0? -image schemaversion=5.9 name=openSUSE-@VERSION@-@FLAVOR@ displayname=@LABEL@ +image schemaversion=6.0 name=openSUSE-@VERSION@-@FLAVOR@ displayname=@LABEL@ description type=system authorStephan Kulow/author contactco...@novell.com/contact -- 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:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2014-01-07 06:53:51 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 2013-12-16 07:07:49.0 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2014-01-07 06:53:52.0 +0100 @@ -1,0 +2,5 @@ +Sun Jan 5 13:49:55 UTC 2014 - co...@suse.com + +- use kiwiversion 13.2 + +--- Other differences: -- ++ kiwi-config-openSUSE.spec ++ --- /var/tmp/diff_new_pack.mRb0fM/_old 2014-01-07 06:53:52.0 +0100 +++ /var/tmp/diff_new_pack.mRb0fM/_new 2014-01-07 06:53:52.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package kiwi-config-openSUSE # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -34,7 +34,7 @@ Summary:KDE live CD License:BSD-3-Clause Group: System/Boot -Version:13.1 +Version:13.2 Release:0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source1:COPYING @@ -71,7 +71,7 @@ patch -p0 %{SOURCE26} %build -kiwiversion=13.1 +kiwiversion=13.2 BASEDIR=$PWD localedir=`mktemp -d` OUTPUTDIR=$localedir/ /usr/lib/YaST2/bin/y2base %{SOURCE22} UI -- 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:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2013-12-16 07:07:47 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 2013-11-22 07:11:25.0 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2013-12-16 07:07:49.0 +0100 @@ -1,0 +2,7 @@ +Fri Dec 13 17:02:08 UTC 2013 - meiss...@suse.com + +- root should be in group root, not users. + Otherwise installing will lead to a chain of events that + makes /etc/shadow be owned by root:users (bnc#843230) + +--- Other differences: -- ++ config.xml.in ++ --- /var/tmp/diff_new_pack.frigCF/_old 2013-12-16 07:07:50.0 +0100 +++ /var/tmp/diff_new_pack.frigCF/_new 2013-12-16 07:07:50.0 +0100 @@ -23,7 +23,7 @@ localeen_US/locale rpm-excludedocsfalse/rpm-excludedocs /preferences - users group=users + users group=root user name=root password= home=/root/ /users packages type=image patternType=onlyRequired -- 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:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2013-11-22 07:11:24 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 2013-06-13 16:47:01.0 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2013-11-22 07:11:25.0 +0100 @@ -1,0 +2,16 @@ +Thu Nov 21 11:02:27 UTC 2013 - co...@suse.com + +- increase schema version to 5.9 + +--- +Tue Nov 5 12:50:35 UTC 2013 - co...@suse.com + +- fix for bnc#845569 + +--- +Wed Oct 30 10:17:13 UTC 2013 - lnus...@suse.de + +- don't put After=localfs.target in langset.service as that creates + a dependency cycle (bnc#845535) + +--- Other differences: -- ++ kiwi-config-openSUSE.spec ++ --- /var/tmp/diff_new_pack.vaaXhb/_old 2013-11-22 07:11:26.0 +0100 +++ /var/tmp/diff_new_pack.vaaXhb/_new 2013-11-22 07:11:26.0 +0100 @@ -18,6 +18,8 @@ Name: kiwi-config-openSUSE BuildRequires: fdupes +BuildRequires: jing +BuildRequires: kiwi BuildRequires: kiwi-desc-isoboot BuildRequires: kiwi-desc-oemboot BuildRequires: kiwi-doc @@ -27,11 +29,8 @@ BuildRequires: skelcd-control-openSUSE BuildRequires: skelcd-openSUSE-CD BuildRequires: xdm -BuildRequires: yast2-installation -#opensuse-gnomequick_en-pdf opensuse-kdequick_en-pdf -BuildRequires: jing -BuildRequires: kiwi BuildRequires: yast2-country +BuildRequires: yast2-installation Summary:KDE live CD License:BSD-3-Clause Group: System/Boot ++ config.xml.in ++ --- /var/tmp/diff_new_pack.vaaXhb/_old 2013-11-22 07:11:26.0 +0100 +++ /var/tmp/diff_new_pack.vaaXhb/_new 2013-11-22 07:11:26.0 +0100 @@ -1,5 +1,5 @@ ?xml version=1.0? -image schemaversion=5.8 name=openSUSE-@VERSION@-@FLAVOR@ displayname=@LABEL@ +image schemaversion=5.9 name=openSUSE-@VERSION@-@FLAVOR@ displayname=@LABEL@ description type=system authorStephan Kulow/author contactco...@novell.com/contact @@ -45,6 +45,7 @@ package name=bundle-lang-common-en/ package name=openSUSE-release/ package name=openSUSE-release-@FLAVOR@/ +package name=branding-openSUSE/ /packages repository type=yast2 source path=http://download.opensuse.org/distribution/13.1/repo/oss// ++ langset.service ++ --- /var/tmp/diff_new_pack.vaaXhb/_old 2013-11-22 07:11:26.0 +0100 +++ /var/tmp/diff_new_pack.vaaXhb/_new 2013-11-22 07:11:26.0 +0100 @@ -2,7 +2,6 @@ Description=setup language based on kernel commandline DefaultDependencies=no Conflicts=shutdown.target -After=local-fs.target Before=sysinit.target shutdown.target systemd-vconsole-setup.service ConditionPathExists=!/var/lib/zypp/RequestedLocales -- 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:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2013-06-13 16:47:00 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 2013-05-27 09:51:09.0 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2013-06-13 16:47:01.0 +0200 @@ -1,0 +2,15 @@ +Mon Jun 10 15:24:02 UTC 2013 - co...@suse.com + +- increase schema_version + +--- +Tue Jun 4 12:22:57 UTC 2013 - co...@suse.com + +- change the volid to 13.1 + +--- +Tue Jun 4 08:21:25 UTC 2013 - co...@suse.com + +- trying overlayfs type + +--- Other differences: -- ++ kiwi-config-openSUSE.spec ++ --- /var/tmp/diff_new_pack.Kv9FQ0/_old 2013-06-13 16:47:02.0 +0200 +++ /var/tmp/diff_new_pack.Kv9FQ0/_new 2013-06-13 16:47:02.0 +0200 @@ -121,15 +121,15 @@ 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 - volid=openSUSE 12.3 Live + volid=openSUSE %{version} Live case $desktop in gnome) sed -i -e s,@PLIST@,GNOME-cd, config.xml - volid=openSUSE 12.3 GNOME Live + volid=openSUSE %{version} GNOME Live ;; kde) sed -i -e s,@PLIST@,KDE-cd, config.xml - volid=openSUSE 12.3 KDE Live + volid=openSUSE %{version} KDE Live ;; x11) sed -i -e s,@PLIST@,X11-cd, config.xml ++ config.xml.in ++ --- /var/tmp/diff_new_pack.Kv9FQ0/_old 2013-06-13 16:47:02.0 +0200 +++ /var/tmp/diff_new_pack.Kv9FQ0/_new 2013-06-13 16:47:02.0 +0200 @@ -1,12 +1,12 @@ ?xml version=1.0? -image schemaversion=5.7 name=openSUSE-@VERSION@-@FLAVOR@ displayname=@LABEL@ +image schemaversion=5.8 name=openSUSE-@VERSION@-@FLAVOR@ displayname=@LABEL@ description type=system authorStephan Kulow/author contactco...@novell.com/contact specificationopenSUSE @VERSION@ Live system/specification /description preferences -type primary=true boot=isoboot/suse-@VERSION@ bootprofile=default bootkernel=@BOOTKERNEL@ filesystem=ext4 flags=clic hybrid=true hybridpersistent=false image=iso editbootconfig=isopatch.sh firmware=uefi volid=@VOLID@/ !-- type:livecd -- +type primary=true boot=isoboot/suse-@VERSION@ bootprofile=default bootkernel=@BOOTKERNEL@ filesystem=ext4 flags=overlay hybrid=true hybridpersistent=true image=iso editbootconfig=isopatch.sh firmware=uefi volid=@VOLID@/ !-- type:livecd -- type boot=oemboot/suse-@VERSION@ filesystem=ext4 image=oem !-- type:usb -- oemconfig !-- type:usb -- oem-swapfalse/oem-swap !-- type:usb -- @@ -47,9 +47,9 @@ package name=openSUSE-release-@FLAVOR@/ /packages repository type=yast2 -source path=http://download.opensuse.org/distribution/12.3/repo/oss// +source path=http://download.opensuse.org/distribution/13.1/repo/oss// /repository repository type=rpm-md -source path=http://download.opensuse.org/repositories/openSUSE:/12.3:/Live/standard// +source path=http://download.opensuse.org/repositories/openSUSE:/13.1:/Live/standard// /repository /image -- 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:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2013-05-27 09:51:07 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 2013-04-29 14:24:58.0 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2013-05-27 09:51:09.0 +0200 @@ -1,0 +2,5 @@ +Tue May 14 14:39:57 UTC 2013 - co...@suse.com + +- emulate install.inf for live installer + +--- Other differences: -- ++ isopatch.sh.in ++ --- /var/tmp/diff_new_pack.g1DtkF/_old 2013-05-27 09:51:10.0 +0200 +++ /var/tmp/diff_new_pack.g1DtkF/_new 2013-05-27 09:51:10.0 +0200 @@ -15,7 +15,7 @@ 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,splash=silent,splash=silent quiet preloadlog=/dev/null, boot/*/loader/isolinux.cfg +sed -i -e s,splash=silent,splash=silent quiet, boot/*/loader/isolinux.cfg sed -i -e 's,key.F4=$,key.F4=kernelopts,' boot/*/loader/gfxboot.cfg bootd=$(ls -1d boot/*/loader) ++ langset.sh ++ --- /var/tmp/diff_new_pack.g1DtkF/_old 2013-05-27 09:51:10.0 +0200 +++ /var/tmp/diff_new_pack.g1DtkF/_new 2013-05-27 09:51:10.0 +0200 @@ -29,3 +29,11 @@ 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 + echo EFI: 1 /etc/install.inf +else + echo EFI: 0 /etc/install.inf +fi -- 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:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2013-04-29 14:23:37 Comparing /work/SRC/openSUSE:Factory/kiwi-config-openSUSE (Old) and /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new (New) Package is kiwi-config-openSUSE, Maintainer is co...@suse.com Changes: --- /work/SRC/openSUSE:Factory/kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2013-04-24 15:52:37.0 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2013-04-29 14:24:58.0 +0200 @@ -1,0 +2,5 @@ +Mon Apr 29 09:42:25 UTC 2013 - co...@suse.com + +- switch to 13.1 version + +--- Other differences: -- ++ kiwi-config-openSUSE.spec ++ --- /var/tmp/diff_new_pack.kfNIgl/_old 2013-04-29 14:25:01.0 +0200 +++ /var/tmp/diff_new_pack.kfNIgl/_new 2013-04-29 14:25:01.0 +0200 @@ -35,7 +35,7 @@ Summary:KDE live CD License:BSD-3-Clause Group: System/Boot -Version:12.3 +Version:13.1 Release:0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source1:COPYING @@ -72,7 +72,7 @@ patch -p0 %{SOURCE26} %build -kiwiversion=12.3 +kiwiversion=13.1 BASEDIR=$PWD localedir=`mktemp -d` OUTPUTDIR=$localedir/ /usr/lib/YaST2/bin/y2base %{SOURCE22} UI -- 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:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2013-04-24 15:52:35 Comparing /work/SRC/openSUSE:Factory/kiwi-config-openSUSE (Old) and /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new (New) Package is kiwi-config-openSUSE, Maintainer is co...@suse.com Changes: --- /work/SRC/openSUSE:Factory/kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2013-03-08 09:13:46.0 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2013-04-24 15:52:37.0 +0200 @@ -1,0 +2,5 @@ +Thu Apr 18 05:28:16 UTC 2013 - co...@suse.com + +- new schema version, no changes required + +--- Other differences: -- ++ config.xml.in ++ --- /var/tmp/diff_new_pack.nBiJ3f/_old 2013-04-24 15:52:39.0 +0200 +++ /var/tmp/diff_new_pack.nBiJ3f/_new 2013-04-24 15:52:39.0 +0200 @@ -1,5 +1,5 @@ ?xml version=1.0? -image schemaversion=5.6 name=openSUSE-@VERSION@-@FLAVOR@ displayname=@LABEL@ +image schemaversion=5.7 name=openSUSE-@VERSION@-@FLAVOR@ displayname=@LABEL@ description type=system authorStephan Kulow/author contactco...@novell.com/contact -- 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:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2013-03-08 09:13:45 Comparing /work/SRC/openSUSE:Factory/kiwi-config-openSUSE (Old) and /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new (New) Package is kiwi-config-openSUSE, Maintainer is co...@suse.com Changes: --- /work/SRC/openSUSE:Factory/kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2013-03-04 17:28:00.0 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2013-03-08 09:13:46.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.5k4pa8/_old 2013-03-08 09:13:48.0 +0100 +++ /var/tmp/diff_new_pack.5k4pa8/_new 2013-03-08 09:13:48.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:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2013-03-04 17:27:59 Comparing /work/SRC/openSUSE:Factory/kiwi-config-openSUSE (Old) and /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new (New) Package is kiwi-config-openSUSE, Maintainer is co...@suse.com Changes: --- /work/SRC/openSUSE:Factory/kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2013-02-17 17:03:43.0 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2013-03-04 17:28:00.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.rm3Cm9/_old 2013-03-04 17:28:02.0 +0100 +++ /var/tmp/diff_new_pack.rm3Cm9/_new 2013-03-04 17:28:02.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:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2013-02-17 17:03: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, Maintainer is co...@suse.com Changes: --- /work/SRC/openSUSE:Factory/kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2013-02-14 21:12:57.0 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2013-02-17 17:03:43.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.KIRZIc/_old 2013-02-17 17:03:45.0 +0100 +++ /var/tmp/diff_new_pack.KIRZIc/_new 2013-02-17 17:03:45.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.KIRZIc/_old 2013-02-17 17:03:45.0 +0100 +++ /var/tmp/diff_new_pack.KIRZIc/_new 2013-02-17 17:03:45.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.KIRZIc/_old 2013-02-17 17:03:45.0 +0100 +++ /var/tmp/diff_new_pack.KIRZIc/_new 2013-02-17 17:03:45.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.KIRZIc/_old 2013-02-17 17:03:45.0 +0100 +++ /var/tmp/diff_new_pack.KIRZIc/_new 2013-02-17 17:03:45.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.KIRZIc/_old 2013-02-17 17:03:45.0 +0100 +++ /var/tmp/diff_new_pack.KIRZIc/_new 2013-02-17 17:03:45.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
commit kiwi-config-openSUSE for openSUSE:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2013-02-07 10:26:11 Comparing /work/SRC/openSUSE:Factory/kiwi-config-openSUSE (Old) and /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new (New) Package is kiwi-config-openSUSE, Maintainer is co...@suse.com Changes: --- /work/SRC/openSUSE:Factory/kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2012-12-19 11:03:09.0 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2013-02-07 10:26:13.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.OWtenE/_old 2013-02-07 10:26:18.0 +0100 +++ /var/tmp/diff_new_pack.OWtenE/_new 2013-02-07 10:26:18.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
commit kiwi-config-openSUSE for openSUSE:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2012-12-19 11:03:08 Comparing /work/SRC/openSUSE:Factory/kiwi-config-openSUSE (Old) and /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new (New) Package is kiwi-config-openSUSE, Maintainer is co...@suse.com Changes: --- /work/SRC/openSUSE:Factory/kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2012-10-29 20:03:08.0 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2012-12-19 11:03:09.0 +0100 @@ -1,0 +2,5 @@ +Wed Dec 19 06:08:01 UTC 2012 - co...@suse.com + +- adapt to new kiwi schema + +--- Other differences: -- ++ config.sh ++ --- /var/tmp/diff_new_pack.ttADr1/_old 2012-12-19 11:03:12.0 +0100 +++ /var/tmp/diff_new_pack.ttADr1/_new 2012-12-19 11:03:12.0 +0100 @@ -46,7 +46,7 @@ chkconfig cron off ln -s '/etc/systemd/system/clicfs.service' '/etc/systemd/system/multi-user.target.wants/clicfs.service' -ln -s '/lib/systemd/system/langset.service' '/lib/systemd/system/sysinit.target.wants/langset.service' +ln -s '/lib/systemd/system/langset.service' '/usr/lib/systemd/system/sysinit.target.wants/langset.service' cd / patch -p0 /etc/YaST2/liveinstall.patch ++ config.xml.in ++ --- /var/tmp/diff_new_pack.ttADr1/_old 2012-12-19 11:03:12.0 +0100 +++ /var/tmp/diff_new_pack.ttADr1/_new 2012-12-19 11:03:12.0 +0100 @@ -1,5 +1,5 @@ ?xml version=1.0? -image schemaversion=5.5 name=openSUSE-@VERSION@-@FLAVOR@ +image schemaversion=5.6 name=openSUSE-@VERSION@-@FLAVOR@ description type=system authorStephan Kulow/author contactco...@novell.com/contact @@ -24,7 +24,7 @@ rpm-excludedocsfalse/rpm-excludedocs /preferences users group=users -user name=root pwd= home=/root/ +user name=root password= home=/root/ /users packages type=image patternType=onlyRequired package name=gfxboot-branding-openSUSE bootinclude=true bootdelete=true/ -- 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:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2012-10-29 20:03:03 Comparing /work/SRC/openSUSE:Factory/kiwi-config-openSUSE (Old) and /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new (New) Package is kiwi-config-openSUSE, Maintainer is co...@suse.com Changes: --- /work/SRC/openSUSE:Factory/kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2012-10-09 13:56:52.0 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2012-10-29 20:03:08.0 +0100 @@ -1,0 +2,5 @@ +Sat Oct 27 11:20:43 UTC 2012 - co...@suse.com + +- there is no more boot.ldconfig + +--- Other differences: -- ++ config.sh ++ --- /var/tmp/diff_new_pack.PIZ2Ym/_old 2012-10-29 20:03:10.0 +0100 +++ /var/tmp/diff_new_pack.PIZ2Ym/_new 2012-10-29 20:03:10.0 +0100 @@ -45,9 +45,6 @@ chkconfig sshd off chkconfig cron off -# disable for now chkconfig boot.compcache on -chkconfig boot.ldconfig off - ln -s '/etc/systemd/system/clicfs.service' '/etc/systemd/system/multi-user.target.wants/clicfs.service' ln -s '/lib/systemd/system/langset.service' '/lib/systemd/system/sysinit.target.wants/langset.service' cd / @@ -116,7 +113,7 @@ echo '127.0.0.2 linux.site linux' /etc/hosts -baseSetRunlevel 5 +ln -s /lib/systemd/system/runlevel5.target /etc/systemd/system/default.target baseUpdateSysConfig /etc/sysconfig/displaymanager DISPLAYMANAGER_AUTOLOGIN linux baseUpdateSysConfig /etc/sysconfig/keyboard KEYTABLE us.map.gz baseUpdateSysConfig /etc/sysconfig/keyboard YAST_KEYBOARD english-us,pc104 ++ correct_live_for_reboot ++ --- /var/tmp/diff_new_pack.PIZ2Ym/_old 2012-10-29 20:03:10.0 +0100 +++ /var/tmp/diff_new_pack.PIZ2Ym/_new 2012-10-29 20:03:10.0 +0100 @@ -10,7 +10,6 @@ chkconfig sshd on chkconfig cron on -chkconfig boot.ldconfig on if test -e /etc/init.d/boot.compcache; then chkconfig boot.compcache off fi ++ correct_live_install ++ --- /var/tmp/diff_new_pack.PIZ2Ym/_old 2012-10-29 20:03:10.0 +0100 +++ /var/tmp/diff_new_pack.PIZ2Ym/_new 2012-10-29 20:03:10.0 +0100 @@ -30,8 +30,6 @@ # remove langset stuff rm /etc/langset.sh rm -rf /etc/langset/ -grep -v ^perl /etc/init.d/boot.local /etc/init.d/boot.local.1 mv /etc/init.d/boot.local.1 /etc/init.d/boot.local -chmod 0755 /etc/init.d/boot.local rm -f '/etc/systemd/system/clicfs.service' '/etc/systemd/system/multi-user.target.wants/clicfs.service' rm -f '/lib/systemd/system/langset.service' '/lib/systemd/system/sysinit.target.wants/langset.service' -- 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:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2012-10-09 13:50:47 Comparing /work/SRC/openSUSE:Factory/kiwi-config-openSUSE (Old) and /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new (New) Package is kiwi-config-openSUSE, Maintainer is co...@suse.com Changes: --- /work/SRC/openSUSE:Factory/kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2012-09-26 10:02:54.0 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2012-10-09 13:56:52.0 +0200 @@ -1,0 +2,5 @@ +Tue Oct 9 04:56:01 UTC 2012 - co...@suse.com + +- do no longer call SuSEconfig + +--- Other differences: -- ++ config.sh ++ --- /var/tmp/diff_new_pack.BMhBCj/_old 2012-10-09 13:56:55.0 +0200 +++ /var/tmp/diff_new_pack.BMhBCj/_new 2012-10-09 13:56:55.0 +0200 @@ -98,11 +98,7 @@ chown -R linux /home/linux -#== -# SuSEconfig -#-- -suseConfig -SuSEconfig --module permissions +chkstat --system --set for script in /usr/share/opensuse-kiwi/live_user_scripts/*.sh; do if test -f $script; then ++ config.xml.in ++ --- /var/tmp/diff_new_pack.BMhBCj/_old 2012-10-09 13:56:55.0 +0200 +++ /var/tmp/diff_new_pack.BMhBCj/_new 2012-10-09 13:56:55.0 +0200 @@ -38,7 +38,6 @@ package name=patch/ package name=zypper/ package name=package-lists-openSUSE-@PLIST@/ -package name=yast2-live-installer/ /packages packages type=bootstrap package name=filesystem/ -- 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:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2012-09-26 10:02:50 Comparing /work/SRC/openSUSE:Factory/kiwi-config-openSUSE (Old) and /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new (New) Package is kiwi-config-openSUSE, Maintainer is co...@suse.com Changes: --- /work/SRC/openSUSE:Factory/kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2012-09-23 08:05:15.0 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2012-09-26 10:02:54.0 +0200 @@ -1,0 +2,5 @@ +Tue Sep 25 11:19:18 UTC 2012 - co...@suse.com + +- adapt to new kiwi schema version + +--- Other differences: -- ++ config.xml.in ++ --- /var/tmp/diff_new_pack.u1CMCo/_old 2012-09-26 10:02:56.0 +0200 +++ /var/tmp/diff_new_pack.u1CMCo/_new 2012-09-26 10:02:56.0 +0200 @@ -1,5 +1,5 @@ ?xml version=1.0? -image schemaversion=5.4 name=openSUSE-@VERSION@-@FLAVOR@ +image schemaversion=5.5 name=openSUSE-@VERSION@-@FLAVOR@ description type=system authorStephan Kulow/author contactco...@novell.com/contact @@ -15,7 +15,8 @@ size unit=M3000/size !-- type:usb -- /type !-- type:usb -- version2.8.0/version -boot-themeopenSUSE/boot-theme +bootloader-themeopenSUSE/bootloader-theme +bootsplash-themeopenSUSE/bootsplash-theme packagemanagerzypper/packagemanager rpm-check-signaturesfalse/rpm-check-signatures rpm-forcefalse/rpm-force -- 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:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2012-09-23 08:05:12 Comparing /work/SRC/openSUSE:Factory/kiwi-config-openSUSE (Old) and /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new (New) Package is kiwi-config-openSUSE, Maintainer is co...@suse.com Changes: --- /work/SRC/openSUSE:Factory/kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2012-08-04 09:19:41.0 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2012-09-23 08:05:15.0 +0200 @@ -1,0 +2,5 @@ +Wed Sep 19 14:07:48 UTC 2012 - co...@suse.com + +- add test for the xdm patch to apply cleanly - and fix it + +--- Other differences: -- ++ kiwi-config-openSUSE.spec ++ --- /var/tmp/diff_new_pack.7XcDjY/_old 2012-09-23 08:05:23.0 +0200 +++ /var/tmp/diff_new_pack.7XcDjY/_new 2012-09-23 08:05:23.0 +0200 @@ -26,6 +26,8 @@ BuildRequires: libxslt BuildRequires: skelcd-control-openSUSE BuildRequires: skelcd-openSUSE-CD +BuildRequires: xdm +BuildRequires: yast2-installation #opensuse-gnomequick_en-pdf opensuse-kdequick_en-pdf BuildRequires: jing BuildRequires: kiwi @@ -62,6 +64,11 @@ %prep %setup -T -c +testdir=$(mktemp -d) +install -D /usr/lib/YaST2/startup/YaST2.call $testdir/usr/lib/YaST2/startup/YaST2.call +install -D /etc/init.d/xdm $testdir/etc/init.d/xdm +cd $testdir +patch -p0 %{SOURCE26} %build kiwiversion=12.2 ++ xdm-liveinstall.patch ++ --- /var/tmp/diff_new_pack.7XcDjY/_old 2012-09-23 08:05:23.0 +0200 +++ /var/tmp/diff_new_pack.7XcDjY/_new 2012-09-23 08:05:23.0 +0200 @@ -11,19 +11,20 @@ #= etc/init.d/xdm.orig2011-04-12 10:21:03.911449606 +0200 -+++ etc/init.d/xdm 2011-04-12 10:21:43.831694748 +0200 -@@ -211,7 +211,12 @@ case $1 in - fi - ;; - esac +--- etc/init.d/xdm.orig2012-09-19 14:09:30.0 + etc/init.d/xdm 2012-09-19 14:10:05.0 + +@@ -208,7 +208,13 @@ + rc_exit + fi + fi - startproc -p $PIDFILE $DISPLAYMANAGER $XDMOPTIONS || rc_failed -+ if cat /proc/cmdline | grep -q liveinstall; then ++if cat /proc/cmdline | grep -q liveinstall; then +[ -x /usr/bin/plymouth ] /usr/bin/plymouth quit +/usr/lib/YaST2/startup/YaST2.call live-installer +else + startproc -p $PIDFILE $DISPLAYMANAGER $XDMOPTIONS || rc_failed +fi ++ # After a crash or a kill signal we may have # a wrong ownership of /dev/xconsole if rc_status ; 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:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2012-08-04 09:18:29 Comparing /work/SRC/openSUSE:Factory/kiwi-config-openSUSE (Old) and /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new (New) Package is kiwi-config-openSUSE, Maintainer is co...@suse.com Changes: --- /work/SRC/openSUSE:Factory/kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2012-07-22 15:16:15.0 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2012-08-04 09:19:41.0 +0200 @@ -1,0 +2,5 @@ +Fri Aug 3 14:28:29 CEST 2012 - fcro...@suse.com + +- Update xdm-liveinstall.patch to terminate plymouth if present + +--- Other differences: -- ++ xdm-liveinstall.patch ++ --- /var/tmp/diff_new_pack.0OP4UV/_old 2012-08-04 09:19:42.0 +0200 +++ /var/tmp/diff_new_pack.0OP4UV/_new 2012-08-04 09:19:42.0 +0200 @@ -13,12 +13,13 @@ --- etc/init.d/xdm.orig2011-04-12 10:21:03.911449606 +0200 +++ etc/init.d/xdm 2011-04-12 10:21:43.831694748 +0200 -@@ -211,7 +211,11 @@ case $1 in +@@ -211,7 +211,12 @@ case $1 in fi ;; esac - startproc -p $PIDFILE $DISPLAYMANAGER $XDMOPTIONS || rc_failed + if cat /proc/cmdline | grep -q liveinstall; then ++[ -x /usr/bin/plymouth ] /usr/bin/plymouth quit +/usr/lib/YaST2/startup/YaST2.call live-installer +else + startproc -p $PIDFILE $DISPLAYMANAGER $XDMOPTIONS || rc_failed -- 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:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2012-07-22 15:16:13 Comparing /work/SRC/openSUSE:Factory/kiwi-config-openSUSE (Old) and /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new (New) Package is kiwi-config-openSUSE, Maintainer is co...@suse.com Changes: --- /work/SRC/openSUSE:Factory/kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2012-07-02 21:53:16.0 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2012-07-22 15:16:15.0 +0200 @@ -1,0 +2,5 @@ +Sat Jul 21 05:35:29 UTC 2012 - co...@suse.com + +- use 12.2 repos + +--- Other differences: -- ++ config.xml.in ++ --- /var/tmp/diff_new_pack.ZYmvDc/_old 2012-07-22 15:16:17.0 +0200 +++ /var/tmp/diff_new_pack.ZYmvDc/_new 2012-07-22 15:16:17.0 +0200 @@ -46,9 +46,9 @@ package name=openSUSE-release-@FLAVOR@/ /packages repository type=yast2 -source path=http://download.opensuse.org/factory/repo/oss// +source path=http://download.opensuse.org/distribution/12.2/repo/oss// /repository repository type=rpm-md -source path=http://download.opensuse.org/repositories/openSUSE:/Factory:/Live/standard// +source path=http://download.opensuse.org/repositories/openSUSE:/12.2:/Live/standard// /repository /image -- 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:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2012-07-02 21:42:31 Comparing /work/SRC/openSUSE:Factory/kiwi-config-openSUSE (Old) and /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new (New) Package is kiwi-config-openSUSE, Maintainer is co...@suse.com Changes: --- /work/SRC/openSUSE:Factory/kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2012-06-12 21:58:37.0 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2012-07-02 21:42:33.0 +0200 @@ -1,0 +2,10 @@ +Mon Jul 2 12:51:23 UTC 2012 - idon...@suse.com + +- Update xdm-liveinstall.patch + +--- +Sun Jun 17 05:18:37 UTC 2012 - co...@suse.com + +- remove bootsplash-branding + +--- Other differences: -- ++ config.xml.in ++ --- /var/tmp/diff_new_pack.5uYrCy/_old 2012-07-02 21:42:35.0 +0200 +++ /var/tmp/diff_new_pack.5uYrCy/_new 2012-07-02 21:42:35.0 +0200 @@ -26,7 +26,6 @@ user name=root pwd= home=/root/ /users packages type=image patternType=onlyRequired -!--package name=bootsplash-branding-openSUSE bootinclude=true bootdelete=true/ -- package name=gfxboot-branding-openSUSE bootinclude=true bootdelete=true/ package name=yast2-live-installer/ package name=pam/ ++ xdm-liveinstall.patch ++ --- /var/tmp/diff_new_pack.5uYrCy/_old 2012-07-02 21:42:35.0 +0200 +++ /var/tmp/diff_new_pack.5uYrCy/_new 2012-07-02 21:42:35.0 +0200 @@ -13,10 +13,10 @@ --- etc/init.d/xdm.orig2011-04-12 10:21:03.911449606 +0200 +++ etc/init.d/xdm 2011-04-12 10:21:43.831694748 +0200 -@@ -246,7 +246,11 @@ - rc_exit - fi - fi +@@ -211,7 +211,11 @@ case $1 in + fi + ;; + esac - startproc -p $PIDFILE $DISPLAYMANAGER $XDMOPTIONS || rc_failed + if cat /proc/cmdline | grep -q liveinstall; then +/usr/lib/YaST2/startup/YaST2.call live-installer @@ -24,5 +24,5 @@ + startproc -p $PIDFILE $DISPLAYMANAGER $XDMOPTIONS || rc_failed +fi # After a crash or a kill signal we may have - # a wrong owner ship of /dev/xconsole + # a wrong ownership of /dev/xconsole if rc_status ; 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:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2012-06-12 21:58:29 Comparing /work/SRC/openSUSE:Factory/kiwi-config-openSUSE (Old) and /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new (New) Package is kiwi-config-openSUSE, Maintainer is co...@suse.com Changes: --- /work/SRC/openSUSE:Factory/kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2012-05-31 17:06:01.0 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2012-06-12 21:58:37.0 +0200 @@ -1,0 +2,5 @@ +Mon Jun 11 07:58:04 UTC 2012 - co...@suse.com + +- kiwi changed schema versions + +--- Other differences: -- ++ config.xml.in ++ --- /var/tmp/diff_new_pack.uDEmGA/_old 2012-06-12 21:58:39.0 +0200 +++ /var/tmp/diff_new_pack.uDEmGA/_new 2012-06-12 21:58:39.0 +0200 @@ -1,5 +1,5 @@ ?xml version=1.0? -image schemaversion=5.3 name=openSUSE-@VERSION@-@FLAVOR@ +image schemaversion=5.4 name=openSUSE-@VERSION@-@FLAVOR@ description type=system authorStephan Kulow/author contactco...@novell.com/contact @@ -26,7 +26,7 @@ user name=root pwd= home=/root/ /users packages type=image patternType=onlyRequired -package name=bootsplash-branding-openSUSE bootinclude=true bootdelete=true/ +!--package name=bootsplash-branding-openSUSE bootinclude=true bootdelete=true/ -- package name=gfxboot-branding-openSUSE bootinclude=true bootdelete=true/ package name=yast2-live-installer/ package name=pam/ -- 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:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2012-05-31 17:06:00 Comparing /work/SRC/openSUSE:Factory/kiwi-config-openSUSE (Old) and /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new (New) Package is kiwi-config-openSUSE, Maintainer is co...@suse.com Changes: --- /work/SRC/openSUSE:Factory/kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2012-02-27 18:35:39.0 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2012-05-31 17:06:01.0 +0200 @@ -1,0 +2,5 @@ +Tue May 29 07:56:22 UTC 2012 - co...@suse.com + +- use version 12.2 + +--- Other differences: -- ++ kiwi-config-openSUSE.spec ++ --- /var/tmp/diff_new_pack.jleTzN/_old 2012-05-31 17:06:03.0 +0200 +++ /var/tmp/diff_new_pack.jleTzN/_new 2012-05-31 17:06:03.0 +0200 @@ -33,7 +33,7 @@ Summary:KDE live CD License:BSD-3-Clause Group: System/Boot -Version:12.1 +Version:12.2 Release:0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source1:COPYING @@ -64,7 +64,7 @@ %setup -T -c %build -kiwiversion=12.1 +kiwiversion=12.2 BASEDIR=$PWD localedir=`mktemp -d` OUTPUTDIR=$localedir/ /usr/lib/YaST2/bin/y2base %{SOURCE22} UI -- 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:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2011-12-14 14:33: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, Maintainer is co...@suse.com Changes: --- /work/SRC/openSUSE:Factory/kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2011-11-08 11:07:24.0 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2011-12-14 14:33:45.0 +0100 @@ -1,0 +2,5 @@ +Tue Dec 13 10:49:56 UTC 2011 - co...@suse.com + +- update kiwi schema version + +--- Other differences: -- ++ kiwi-config-openSUSE.spec ++ --- /var/tmp/diff_new_pack.zIqoJf/_old 2011-12-14 14:33:46.0 +0100 +++ /var/tmp/diff_new_pack.zIqoJf/_new 2011-12-14 14:33:46.0 +0100 @@ -15,20 +15,24 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: kiwi-config-openSUSE -BuildRequires: fdupes kiwi-desc-isoboot -BuildRequires: kiwi-desc-oemboot kiwi-doc kiwi-tools -BuildRequires: skelcd-control-openSUSE skelcd-openSUSE-CD +BuildRequires: fdupes +BuildRequires: kiwi-desc-isoboot +BuildRequires: kiwi-desc-oemboot +BuildRequires: kiwi-doc +BuildRequires: kiwi-tools BuildRequires: libxslt +BuildRequires: skelcd-control-openSUSE +BuildRequires: skelcd-openSUSE-CD #opensuse-gnomequick_en-pdf opensuse-kdequick_en-pdf -BuildRequires: jing kiwi yast2-country +BuildRequires: jing +BuildRequires: kiwi +BuildRequires: yast2-country Summary:KDE live CD -Version:12.1 -Release:1 -Group: System/Boot License:BSD-3-Clause +Group: System/Boot +Version:12.1 +Release:0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source1:COPYING Source2:config-hal.patch ++ config.xml.in ++ --- /var/tmp/diff_new_pack.zIqoJf/_old 2011-12-14 14:33:46.0 +0100 +++ /var/tmp/diff_new_pack.zIqoJf/_new 2011-12-14 14:33:46.0 +0100 @@ -1,5 +1,5 @@ ?xml version=1.0? -image schemaversion=4.6 name=openSUSE-@VERSION@-@FLAVOR@ +image schemaversion=5.3 name=openSUSE-@VERSION@-@FLAVOR@ description type=system authorStephan Kulow/author contactco...@novell.com/contact @@ -25,12 +25,6 @@ users group=users user name=root pwd= home=/root/ /users - repository type=yast2 -source path=http://download.opensuse.org/factory/repo/oss// - /repository - repository type=rpm-md -source path=http://download.opensuse.org/repositories/openSUSE:/Factory:/Live/standard// - /repository packages type=image patternType=onlyRequired package name=bootsplash-branding-openSUSE bootinclude=true bootdelete=true/ package name=gfxboot-branding-openSUSE bootinclude=true bootdelete=true/ @@ -52,4 +46,10 @@ package name=openSUSE-release/ package name=openSUSE-release-@FLAVOR@/ /packages + repository type=yast2 +source path=http://download.opensuse.org/factory/repo/oss// + /repository + repository type=rpm-md +source path=http://download.opensuse.org/repositories/openSUSE:/Factory:/Live/standard// + /repository /image -- 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:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2011-12-06 18:21:48 Comparing /work/SRC/openSUSE:Factory/kiwi-config-openSUSE (Old) and /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new (New) Package is kiwi-config-openSUSE, Maintainer is co...@suse.com Changes: Other differences: -- ++ kiwi-config-openSUSE.spec ++ --- /var/tmp/diff_new_pack.NaX3Fa/_old 2011-12-06 18:38:00.0 +0100 +++ /var/tmp/diff_new_pack.NaX3Fa/_new 2011-12-06 18:38:00.0 +0100 @@ -28,7 +28,7 @@ Version:12.1 Release:1 Group: System/Boot -License:BSD3c(or similar) +License:BSD-3-Clause BuildRoot: %{_tmppath}/%{name}-%{version}-build Source1:COPYING Source2:config-hal.patch -- 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:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2011-11-08 11:07:22 Comparing /work/SRC/openSUSE:Factory/kiwi-config-openSUSE (Old) and /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new (New) Package is kiwi-config-openSUSE, Maintainer is co...@suse.com Changes: --- /work/SRC/openSUSE:Factory/kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2011-10-27 11:21:02.0 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2011-11-08 11:07:24.0 +0100 @@ -1,0 +2,10 @@ +Tue Nov 8 09:25:08 UTC 2011 - co...@suse.com + +- disable hybridpersistent for now (bnc#728261, bnc#728788) + +--- +Thu Oct 27 18:00:34 UTC 2011 - co...@suse.com + +- change eth0 to ifplugd (bnc#725523) + +--- Other differences: -- ++ config.xml.in ++ --- /var/tmp/diff_new_pack.bjFmqy/_old 2011-11-08 11:07:26.0 +0100 +++ /var/tmp/diff_new_pack.bjFmqy/_new 2011-11-08 11:07:26.0 +0100 @@ -6,7 +6,7 @@ specificationopenSUSE @VERSION@ Live system/specification /description preferences -type primary=true boot=isoboot/suse-@VERSION@ bootprofile=default bootkernel=@BOOTKERNEL@ flags=clic hybrid=true hybridpersistent=true image=iso/ !-- type:livecd -- +type primary=true boot=isoboot/suse-@VERSION@ bootprofile=default bootkernel=@BOOTKERNEL@ flags=clic hybrid=true hybridpersistent=false image=iso/ !-- type:livecd -- type boot=oemboot/suse-@VERSION@ filesystem=ext3 image=oem !-- type:usb -- oemconfig !-- type:usb -- oem-swapfalse/oem-swap !-- type:usb -- ++ ifcfg-eth0 ++ --- /var/tmp/diff_new_pack.bjFmqy/_old 2011-11-08 11:07:26.0 +0100 +++ /var/tmp/diff_new_pack.bjFmqy/_new 2011-11-08 11:07:26.0 +0100 @@ -1,4 +1,4 @@ BOOTPROTO='dhcp' MTU='' REMOTE_IPADDR='' -STARTMODE='onboot' +STARTMODE='ifplugd' -- 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:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2011-10-27 11:15: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, Maintainer is co...@suse.com Changes: --- /work/SRC/openSUSE:Factory/kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2011-10-21 16:31:51.0 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2011-10-27 11:21:02.0 +0200 @@ -1,0 +2,10 @@ +Thu Oct 27 08:40:52 UTC 2011 - co...@suse.com + +- previous fix was not the problem, so give it another try (bnc#726120) + +--- +Tue Oct 25 08:41:43 UTC 2011 - co...@suse.com + +- also write out CONSOLE_ENCODING (bnc#726120) + +--- Old: boot.langset New: langset.service Other differences: -- ++ kiwi-config-openSUSE.spec ++ --- /var/tmp/diff_new_pack.u0sbYz/_old 2011-10-27 11:21:04.0 +0200 +++ /var/tmp/diff_new_pack.u0sbYz/_new 2011-10-27 11:21:04.0 +0200 @@ -38,7 +38,7 @@ Source10: README Source11: correct_live_for_reboot Source12: correct_live_install -Source16: boot.langset +Source16: langset.service Source17: 99-ignore-live-usb.fdi Source19: config-firstboot.patch Source20: geturls.xsl @@ -150,7 +150,7 @@ install -D -m 644 %{SOURCE8} etc/sysconfig/network/ifcfg-eth0 cp -a $localedir etc/langset install -m 755 %{SOURCE23} etc/langset.sh - install -D -m 755 %{SOURCE16} etc/init.d/boot.langset + install -D -m 755 %{SOURCE16} lib/systemd/system/langset.service install -D -m 755 %{SOURCE11} usr/bin/correct_live_for_reboot install -D -m 755 %{SOURCE12} usr/bin/correct_live_install install -D -m 644 %{SOURCE2} etc/YaST2/policy.patch ++ config.sh ++ --- /var/tmp/diff_new_pack.u0sbYz/_old 2011-10-27 11:21:04.0 +0200 +++ /var/tmp/diff_new_pack.u0sbYz/_new 2011-10-27 11:21:04.0 +0200 @@ -45,12 +45,11 @@ chkconfig sshd off chkconfig cron off -# enable create_xconf -chkconfig boot.langset on # disable for now chkconfig boot.compcache on chkconfig boot.ldconfig off ln -s '/etc/systemd/system/clicfs.service' '/etc/systemd/system/multi-user.target.wants/clicfs.service' +ln -s '/lib/systemd/system/langset.service' '/lib/systemd/system/sysinit.target.wants/langset.service' cd / patch -p0 /etc/YaST2/liveinstall.patch ++ correct_live_for_reboot ++ --- /var/tmp/diff_new_pack.u0sbYz/_old 2011-10-27 11:21:04.0 +0200 +++ /var/tmp/diff_new_pack.u0sbYz/_new 2011-10-27 11:21:04.0 +0200 @@ -11,10 +11,11 @@ chkconfig sshd on chkconfig cron on chkconfig boot.ldconfig on -chkconfig boot.langset off 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 + : /var/run/utmp ++ correct_live_install ++ --- /var/tmp/diff_new_pack.u0sbYz/_old 2011-10-27 11:21:04.0 +0200 +++ /var/tmp/diff_new_pack.u0sbYz/_new 2011-10-27 11:21:04.0 +0200 @@ -32,7 +32,8 @@ rm -rf /etc/langset/ grep -v ^perl /etc/init.d/boot.local /etc/init.d/boot.local.1 mv /etc/init.d/boot.local.1 /etc/init.d/boot.local chmod 0755 /etc/init.d/boot.local -rm /etc/init.d/boot.langset +rm -f '/etc/systemd/system/clicfs.service' '/etc/systemd/system/multi-user.target.wants/clicfs.service' +rm -f '/lib/systemd/system/langset.service' '/lib/systemd/system/sysinit.target.wants/langset.service' cd / # patch -R -p0 /etc/YaST2/policy.patch ++ getcountrydata.ycp ++ --- /var/tmp/diff_new_pack.u0sbYz/_old 2011-10-27 11:21:04.0 +0200 +++ /var/tmp/diff_new_pack.u0sbYz/_new 2011-10-27 11:21:04.0 +0200 @@ -20,6 +20,9 @@ // does not really set keyboard, only fills some data Keyboard::SetKeyboard (kbd); + // set language for encoding +WFM::SetLanguage (fqlanguage); + string yast_kbd = kbd + , + Keyboard::kb_model; list consolefont=consolefonts[fqlanguage]:consolefonts[lang]:[]; @@ -29,6 +32,7 @@ string magic = consolefont[3]:; string timezone= timezonemap[lang]:; + string encoding= WFM::GetEncoding(); string contents = sformat (RC_LANG: %1 CONSOLE_FONT: %2 CONSOLE_SCREENMAP: %3 @@ -41,6 +45,7 @@ fqlanguage, font, screenMap,
commit kiwi-config-openSUSE for openSUSE:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at Tue Jun 14 12:25:04 CEST 2011. --- kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2011-06-07 10:01:28.0 +0200 +++ /mounts/work_src_done/STABLE/kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2011-06-10 11:24:17.0 +0200 @@ -1,0 +2,5 @@ +Fri Jun 10 09:23:36 UTC 2011 - co...@novell.com + +- update version + +--- calling whatdependson for head-i586 Other differences: -- ++ kiwi-config-openSUSE.spec ++ --- /var/tmp/diff_new_pack.2Fsp0R/_old 2011-06-14 12:24:08.0 +0200 +++ /var/tmp/diff_new_pack.2Fsp0R/_new 2011-06-14 12:24:08.0 +0200 @@ -25,8 +25,8 @@ #opensuse-gnomequick_en-pdf opensuse-kdequick_en-pdf BuildRequires: jing kiwi yast2-country Summary:KDE live CD -Version:11.4 -Release:15 +Version:12.1 +Release:1 Group: System/Boot License:BSD3c(or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -57,7 +57,7 @@ %setup -T -c %build -kiwiversion=11.4 +kiwiversion=12.1 BASEDIR=$PWD localedir=`mktemp -d` OUTPUTDIR=$localedir/ /usr/lib/YaST2/bin/y2base %{SOURCE22} UI Remember to have fun... -- 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:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at Tue Jun 7 14:23:22 CEST 2011. --- kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2011-04-08 10:03:17.0 +0200 +++ /mounts/work_src_done/STABLE/kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2011-06-07 10:01:28.0 +0200 @@ -1,0 +2,10 @@ +Tue Jun 7 08:01:19 UTC 2011 - co...@novell.com + +- remove obsolete buildrequire + +--- +Tue Apr 12 08:22:36 UTC 2011 - co...@opensuse.org + +- fix white space in the patch + +--- calling whatdependson for head-i586 Other differences: -- ++ kiwi-config-openSUSE.spec ++ --- /var/tmp/diff_new_pack.7sjsLx/_old 2011-06-07 14:23:10.0 +0200 +++ /var/tmp/diff_new_pack.7sjsLx/_new 2011-06-07 14:23:10.0 +0200 @@ -19,14 +19,14 @@ Name: kiwi-config-openSUSE BuildRequires: fdupes kiwi-desc-isoboot -BuildRequires: kiwi-desc-oemboot kiwi-desc-usbboot kiwi-doc kiwi-tools +BuildRequires: kiwi-desc-oemboot kiwi-doc kiwi-tools BuildRequires: skelcd-control-openSUSE skelcd-openSUSE-CD BuildRequires: libxslt #opensuse-gnomequick_en-pdf opensuse-kdequick_en-pdf BuildRequires: jing kiwi yast2-country Summary:KDE live CD Version:11.4 -Release:11 +Release:15 Group: System/Boot License:BSD3c(or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build ++ xdm-liveinstall.patch ++ --- /var/tmp/diff_new_pack.7sjsLx/_old 2011-06-07 14:23:10.0 +0200 +++ /var/tmp/diff_new_pack.7sjsLx/_new 2011-06-07 14:23:10.0 +0200 @@ -1,18 +1,3 @@ etc/init.d/xdm.orig 2011-02-22 13:13:21.0 + -+++ etc/init.d/xdm 2011-04-08 08:01:31.0 + -@@ -246,7 +246,11 @@ - rc_exit - fi -fi -- startproc -p $PIDFILE $DISPLAYMANAGER $XDMOPTIONS || rc_failed -+ if cat /proc/cmdline | grep -q liveinstall; then -+/usr/lib/YaST2/startup/YaST2.call live-installer -+else -+ startproc -p $PIDFILE $DISPLAYMANAGER $XDMOPTIONS || rc_failed -+fi -# After a crash or a kill signal we may have -# a wrong owner ship of /dev/xconsole -if rc_status ; then --- usr/lib/YaST2/startup/YaST2.call.orig 2011-02-17 14:54:48.0 + +++ usr/lib/YaST2/startup/YaST2.call2011-04-08 08:01:31.0 + @@ -646,7 +646,9 @@ @@ -26,3 +11,18 @@ #= +--- etc/init.d/xdm.orig2011-04-12 10:21:03.911449606 +0200 etc/init.d/xdm 2011-04-12 10:21:43.831694748 +0200 +@@ -246,7 +246,11 @@ + rc_exit + fi + fi +- startproc -p $PIDFILE $DISPLAYMANAGER $XDMOPTIONS || rc_failed ++ if cat /proc/cmdline | grep -q liveinstall; then ++/usr/lib/YaST2/startup/YaST2.call live-installer ++else ++ startproc -p $PIDFILE $DISPLAYMANAGER $XDMOPTIONS || rc_failed ++fi + # After a crash or a kill signal we may have + # a wrong owner ship of /dev/xconsole + if rc_status ; then Remember to have fun... -- 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:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at Tue Mar 22 17:39:17 CET 2011. --- kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2011-03-06 12:35:26.0 +0100 +++ /mounts/work_src_done/STABLE/kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2011-03-21 17:55:38.0 +0100 @@ -1,0 +2,5 @@ +Mon Mar 21 16:55:21 UTC 2011 - co...@novell.com + +- licenses package is about to die + +--- calling whatdependson for head-i586 New: GPL-2.0.txt gpl-3.0.txt Other differences: -- ++ kiwi-config-openSUSE.spec ++ --- /var/tmp/diff_new_pack.OvKPP8/_old 2011-03-22 17:38:22.0 +0100 +++ /var/tmp/diff_new_pack.OvKPP8/_new 2011-03-22 17:38:22.0 +0100 @@ -20,13 +20,13 @@ Name: kiwi-config-openSUSE BuildRequires: fdupes kiwi-desc-isoboot BuildRequires: kiwi-desc-oemboot kiwi-desc-usbboot kiwi-doc kiwi-tools -BuildRequires: licenses skelcd-control-openSUSE skelcd-openSUSE-CD +BuildRequires: skelcd-control-openSUSE skelcd-openSUSE-CD BuildRequires: libxslt #opensuse-gnomequick_en-pdf opensuse-kdequick_en-pdf BuildRequires: jing kiwi yast2-country Summary:KDE live CD Version:11.4 -Release:9 +Release:10 Group: System/Boot License:BSD3c(or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -46,6 +46,8 @@ Source23: langset.sh Source26: xdm-liveinstall.patch Source27: SoftLocks +Source30: GPL-2.0.txt +Source31: gpl-3.0.txt ExcludeArch:ia64 ppc64 s390x s390 ppc %description @@ -119,8 +121,8 @@ #test -z $out # jing is a great tool always exit 0 mkdir config-cdroot cd config-cdroot - install -m 644 /usr/share/doc/licenses/GPL-2.0.txt GPLv2.txt - install -m 644 /usr/share/doc/licenses/gpl-3.0.txt GPLv3.txt + install -m 644 %{SOURCE30} GPLv2.txt + install -m 644 %{SOURCE31} GPLv3.txt tar czf ../config-cdroot.tgz * cd .. rm -rf config-cdroot ++ GPL-2.0.txt ++ GNU GENERAL PUBLIC LICENSE Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for
commit kiwi-config-openSUSE for openSUSE:Factory
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at Mon Mar 7 15:20:40 CET 2011. --- kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2011-02-20 12:48:31.0 +0100 +++ /mounts/work_src_done/STABLE/kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2011-03-06 12:35:26.0 +0100 @@ -1,0 +2,10 @@ +Sun Mar 6 11:35:08 UTC 2011 - co...@novell.com + +- remove package lists package + +--- +Sat Mar 5 11:43:57 UTC 2011 - co...@novell.com + +- do not use package lists anymore, but require them in config + +--- calling whatdependson for head-i586 Other differences: -- ++ kiwi-config-openSUSE.spec ++ --- /var/tmp/diff_new_pack.iz32Jk/_old 2011-03-07 15:17:47.0 +0100 +++ /var/tmp/diff_new_pack.iz32Jk/_new 2011-03-07 15:17:47.0 +0100 @@ -18,7 +18,7 @@ Name: kiwi-config-openSUSE -BuildRequires: fdupes kiwi-desc-isoboot package-lists-openSUSE-all +BuildRequires: fdupes kiwi-desc-isoboot BuildRequires: kiwi-desc-oemboot kiwi-desc-usbboot kiwi-doc kiwi-tools BuildRequires: licenses skelcd-control-openSUSE skelcd-openSUSE-CD BuildRequires: libxslt @@ -26,7 +26,7 @@ BuildRequires: jing kiwi yast2-country Summary:KDE live CD Version:11.4 -Release:8 +Release:9 Group: System/Boot License:BSD3c(or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -70,15 +70,9 @@ cd $config desktop=`echo $config | cut -d- -f2` type=`echo $config | cut -d- -f1` - cdlist=/usr/share/suse/packages/$desktop_cd.%{_target_cpu}.list - if test $desktop = kde; then - cdlist=/usr/share/suse/packages/kde4_cd.%{_target_cpu}.list - fi - test -f $cdlist || exit 1 - sort -u $cdlist wanted.list if test $type = usb; then -sed -i -e s,yast2-live-installer,yast2-firstboot, wanted.list -sed -i -e s,release-livecd,release-usb, wanted.list +#sed -i -e s,yast2-live-installer,yast2-firstboot, wanted.list +#sed -i -e s,release-livecd,release-usb, wanted.list othertype=livecd else othertype=usb @@ -100,18 +94,22 @@ echo 'baseUpdateSysConfig /etc/sysconfig/clock TIMEZONE UTC' config.sh fi - (sed -n -e '1,/ PACKAGES BEGIN/p' %{SOURCE4} ; cat wanted.list | while read pack; do echo 'package name='$pack'/'; done; sed -n -e '/ PACKAGES END/,$p' %{SOURCE4} ) | grep -v type:$othertype | \ + grep -v type:$othertype %{SOURCE4} | \ xmllint --format - config.xml if test $type = usb; then sed -i -e s,yast2-live-installer,yast2-firstboot, config.xml fi - rm wanted.list if test $type = usb; then sed -i -e 's,#USB ,,' config.sh fi 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 +sed -i -e s,@PLIST@,GNOME-cd, config.xml + else +sed -i -e s,@PLIST@,KDE-cd, config.xml + fi %ifarch x86_64 sed -i -e s,@BOOTKERNEL@,desktop, config.xml %else ++ config.sh ++ --- /var/tmp/diff_new_pack.iz32Jk/_old 2011-03-07 15:17:47.0 +0100 +++ /var/tmp/diff_new_pack.iz32Jk/_new 2011-03-07 15:17:47.0 +0100 @@ -19,6 +19,9 @@ exec | tee /var/log/config.log exec 21 +pl=`rpmqpack | grep package-lists-` +rpm -e $pl + #== # Greeting... #-- ++ config.xml.in ++ --- /var/tmp/diff_new_pack.iz32Jk/_old 2011-03-07 15:17:47.0 +0100 +++ /var/tmp/diff_new_pack.iz32Jk/_new 2011-03-07 15:17:47.0 +0100 @@ -26,10 +26,10 @@ user name=root pwd= home=/root/ /users repository type=yast2 -source path=http://download.opensuse.org/distribution/11.4/repo/oss// +source path=http://download.opensuse.org/factory/repo/oss// /repository repository type=rpm-md -source path=http://download.opensuse.org/repositories/openSUSE:/11.4:/Live/standard// +source path=http://download.opensuse.org/repositories/openSUSE:/Factory:/Live/standard// /repository packages type=image patternType=onlyRequired package name=bootsplash-branding-openSUSE bootinclude=true bootdelete=true/ @@ -43,8 +43,8 @@ package name=tar/ package name=patch/ package name=zypper/ -!-- PACKAGES BEGIN -- -!-- PACKAGES END -- +package name=package-lists-openSUSE-@PLIST@/ +package name=yast2-live-installer/ /packages packages type=bootstrap package name=filesystem/ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: