Hello community, here is the log from the commit of package kiwi-image-livecd-kde checked in at Tue May 13 12:24:36 CEST 2008. -------- --- arch/i686/kiwi-image-livecd-kde/kiwi-image-livecd-gnome.changes 2008-05-10 00:17:48.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi-image-livecd-kde/kiwi-image-livecd-gnome.changes 2008-05-13 12:24:00.800324000 +0200 @@ -1,0 +2,11 @@ +Tue May 13 10:17:28 CEST 2008 - coolo@suse.de + +- do not disable device mapper (bnc#389188) + +------------------------------------------------------------------- +Mon May 12 18:44:41 CEST 2008 - coolo@suse.de + +- create linux with uid 999 (bnc#388739) +- use new way to register (bnc#385868) + +------------------------------------------------------------------- kiwi-image-livecd-kde.changes: same change Old: ---- content content-x86_64.diff gpg-pubkey-8BB1F40D.asc gpg-seckey-8BB1F40D.asc livecd_product_repo.repo New: ---- openSUSE-release.prod ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi-image-livecd-gnome.spec ++++++ --- /var/tmp/diff_new_pack.k20764/_old 2008-05-13 12:24:09.000000000 +0200 +++ /var/tmp/diff_new_pack.k20764/_new 2008-05-13 12:24:09.000000000 +0200 @@ -28,7 +28,7 @@ BuildRequires: ghostscript-fonts-std ghostscript-library Summary: GNOME Live CD Version: 11.0 -Release: 87 +Release: 91 Group: Productivity/Other License: BSD 3-Clause BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -45,11 +45,7 @@ Source11: configure-x.sh Source12: correct_live_install Source13: SoftLocks -Source14: livecd_product_repo.repo -Source15: content -Source16: content-x86_64.diff -Source17: gpg-pubkey-8BB1F40D.asc -Source18: gpg-seckey-8BB1F40D.asc +Source15: openSUSE-release.prod ExcludeArch: ia64 ppc64 s390x s390 ppc # do not compress the ISO - takes ages %define _binary_payload w.ufdio @@ -98,36 +94,23 @@ mkdir rpmkeys cp /CD1/gpg-pubkey* rpmkeys install -m 644 -D /CD1/control.xml etc/YaST2/control.xml -mkdir gpgkeys -install -m 644 %{SOURCE17} gpgkeys -install -m 644 %{SOURCE17} rpmkeys -install -m 644 %{SOURCE18} gpgkeys install -m 644 %{SOURCE5} tmp/config.patch -mkdir -p var/lib/zypp/livecd_product +mkdir -p etc/zypp/products.d # see above if test GNOME = GNOME; then cat %{SOURCE7} >> tmp/config.patch - sed -e "s,@NAME@,openSUSE-Live-Gnome," %{SOURCE15} > var/lib/zypp/livecd_product/content + sed -e "s,@NAME@,openSUSE-Live-Gnome," %{SOURCE15} > etc/zypp/products.d/openSUSE-release.prod else cat %{SOURCE6} >> tmp/config.patch - sed -e "s,@NAME@,openSUSE-Live-GNOME," %{SOURCE15} > var/lib/zypp/livecd_product/content + sed -e "s,@NAME@,openSUSE-Live-GNOME," %{SOURCE15} > etc/zypp/products.d/openSUSE-release.prod fi -%ifarch x86_64 -patch var/lib/zypp/livecd_product/content %{SOURCE16} -%endif -install -m 644 %{SOURCE13} var/lib/zypp/SoftLocks +install -D -m 644 %{SOURCE13} var/lib/zypp/SoftLocks install -D -m 644 %{SOURCE8} etc/sysconfig/network/ifcfg-eth0 tar xvf %{SOURCE9} install -D -m 755 %{SOURCE10} etc/init.d/create_xconf install -D -m 755 %{SOURCE11} usr/sbin/configure-x.sh install -D -m 755 %{SOURCE12} usr/bin/correct_live_install install -D -m 644 %{SOURCE2} etc/YaST2/policy.patch -install -D -m 644 %{SOURCE14} etc/zypp/repos.d/livecd_product_repo.repo -for i in var/lib/zypp/livecd_product/media.1/media \ - var/lib/zypp/livecd_product/suse/setup/descr/packages; do \ - mkdir -p $(dirname $i) - touch $i -done %build . /.buildenv @@ -171,6 +154,11 @@ /usr/share/openSUSE %changelog +* Tue May 13 2008 coolo@suse.de +- do not disable device mapper (bnc#389188) +* Mon May 12 2008 coolo@suse.de +- create linux with uid 999 (bnc#388739) +- use new way to register (bnc#385868) * Fri May 09 2008 coolo@suse.de - do not use sax2 at boot time * Fri May 02 2008 coolo@suse.de ++++++ kiwi-image-livecd-kde.spec ++++++ --- /var/tmp/diff_new_pack.k20764/_old 2008-05-13 12:24:09.000000000 +0200 +++ /var/tmp/diff_new_pack.k20764/_new 2008-05-13 12:24:09.000000000 +0200 @@ -28,7 +28,7 @@ BuildRequires: ghostscript-fonts-std ghostscript-library Summary: KDE live CD Version: 11.0 -Release: 87 +Release: 91 Group: System/Boot License: BSD 3-Clause BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -45,11 +45,7 @@ Source11: configure-x.sh Source12: correct_live_install Source13: SoftLocks -Source14: livecd_product_repo.repo -Source15: content -Source16: content-x86_64.diff -Source17: gpg-pubkey-8BB1F40D.asc -Source18: gpg-seckey-8BB1F40D.asc +Source15: openSUSE-release.prod ExcludeArch: ia64 ppc64 s390x s390 ppc # do not compress the ISO - takes ages %define _binary_payload w.ufdio @@ -98,36 +94,23 @@ mkdir rpmkeys cp /CD1/gpg-pubkey* rpmkeys install -m 644 -D /CD1/control.xml etc/YaST2/control.xml -mkdir gpgkeys -install -m 644 %{SOURCE17} gpgkeys -install -m 644 %{SOURCE17} rpmkeys -install -m 644 %{SOURCE18} gpgkeys install -m 644 %{SOURCE5} tmp/config.patch -mkdir -p var/lib/zypp/livecd_product +mkdir -p etc/zypp/products.d # see above if test KDE = GNOME; then cat %{SOURCE7} >> tmp/config.patch - sed -e "s,@NAME@,openSUSE-Live-Gnome," %{SOURCE15} > var/lib/zypp/livecd_product/content + sed -e "s,@NAME@,openSUSE-Live-Gnome," %{SOURCE15} > etc/zypp/products.d/openSUSE-release.prod else cat %{SOURCE6} >> tmp/config.patch - sed -e "s,@NAME@,openSUSE-Live-KDE," %{SOURCE15} > var/lib/zypp/livecd_product/content + sed -e "s,@NAME@,openSUSE-Live-KDE," %{SOURCE15} > etc/zypp/products.d/openSUSE-release.prod fi -%ifarch x86_64 -patch var/lib/zypp/livecd_product/content %{SOURCE16} -%endif -install -m 644 %{SOURCE13} var/lib/zypp/SoftLocks +install -D -m 644 %{SOURCE13} var/lib/zypp/SoftLocks install -D -m 644 %{SOURCE8} etc/sysconfig/network/ifcfg-eth0 tar xvf %{SOURCE9} install -D -m 755 %{SOURCE10} etc/init.d/create_xconf install -D -m 755 %{SOURCE11} usr/sbin/configure-x.sh install -D -m 755 %{SOURCE12} usr/bin/correct_live_install install -D -m 644 %{SOURCE2} etc/YaST2/policy.patch -install -D -m 644 %{SOURCE14} etc/zypp/repos.d/livecd_product_repo.repo -for i in var/lib/zypp/livecd_product/media.1/media \ - var/lib/zypp/livecd_product/suse/setup/descr/packages; do \ - mkdir -p $(dirname $i) - touch $i -done %build . /.buildenv @@ -171,6 +154,11 @@ /usr/share/openSUSE %changelog +* Tue May 13 2008 coolo@suse.de +- do not disable device mapper (bnc#389188) +* Mon May 12 2008 coolo@suse.de +- create linux with uid 999 (bnc#388739) +- use new way to register (bnc#385868) * Fri May 09 2008 coolo@suse.de - do not use sax2 at boot time * Fri May 02 2008 coolo@suse.de ++++++ config.sh ++++++ --- arch/i686/kiwi-image-livecd-kde/config.sh 2008-05-02 08:03:03.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi-image-livecd-kde/config.sh 2008-05-13 10:17:08.371054000 +0200 @@ -32,14 +32,7 @@ perl -pi -e 's,/sbin/alsactl -F restore,/bin/set_default_volume -f,;' \ /etc/udev/rules.d/40-alsa.rules -# Deactivate services #-------------------------------------- -suseRemoveService boot.device-mapper -suseRemoveService mdadmd -suseRemoveService rpasswdd -suseRemoveService boot.scsidev -suseRemoveService boot.md - # these two we want to disable for policy reasons chkconfig sshd off chkconfig cron off @@ -59,19 +52,9 @@ rpm --import $i && rm $i done rmdir /rpmkeys -for i in /gpgkeys/gpg*.asc; do - gpg --import $i && rm $i -done -rmdir /gpgkeys -echo "B0462FBF0F7838BD707C125D2E82F4308BB1F40D:6:" | gpg --import-ownertrust insserv -gpg -a --detach /var/lib/zypp/livecd_product/content -gpg -a --export 8BB1F40D > /var/lib/zypp/livecd_product/content.key - -zypper ref livecd_product_repo - rm -rf /var/cache/zypp/raw/* #zypper addrepo http://download.opensuse.org/repositories/openSUSE:10.3/standard/ 10.3-oss @@ -84,9 +67,11 @@ # /etc/sudoers hack to fix #297695 # (Installation Live CD: no need to ask for password of root) #-------------------------------------- -sed -e "s/ALL ALL=(ALL) ALL/ALL ALL=(ALL) NOPASSWD: ALL/" /etc/sudoers > /tmp/sudoers && mv /tmp/sudoers /etc/sudoers +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 ++++++ config.xml.in ++++++ --- arch/i686/kiwi-image-livecd-kde/config.xml.in 2008-05-08 20:05:24.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi-image-livecd-kde/config.xml.in 2008-05-12 14:09:18.790152000 +0200 @@ -18,7 +18,6 @@ <locale>en_US.UTF-8</locale> </preferences> <users group="users"> - <user name="linux" pwd="" home="/home/linux" realname="Live-CD User"/> <user name="root" pwd="" home="/root"/> </users> <repository type="rpm-md"> ++++++ correct_live_install ++++++ --- arch/i686/kiwi-image-livecd-kde/correct_live_install 2008-05-09 08:13:55.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi-image-livecd-kde/correct_live_install 2008-05-13 10:17:23.224565000 +0200 @@ -4,16 +4,15 @@ # image. So the goal of this script is to fix whatever configs were changed for the # live system -chkconfig boot.rootfsck on chkconfig sshd on chkconfig cron on -chkconfig create_xconf on +chkconfig create_xconf off #====================================== # /etc/sudoers hack to fix #297695 # (Installation Live CD: no need to ask for password of root) #-------------------------------------- -sed -e "s/ALL ALL=(ALL) NOPASSWD: ALL/ALL ALL=(ALL) ALL/" /etc/sudoers > /tmp/sudoers && mv /tmp/sudoers /etc/sudoers +sed -i -e "s/ALL ALL=(ALL) NOPASSWD: ALL/ALL ALL=(ALL) ALL/" /etc/sudoers chmod 0440 /etc/sudoers # remove live-cd user ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org