Home | Content | Search | Navigation | Indexes
 

Mailinglist Archive: opensuse-commit (1093 mails)

< Previous Next >
commit kiwi-config-openSUSE for openSUSE:Factory
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Thu, 11 Mar 2010 01:40:51 +0100
  • Message-id: <20100311004051.A6EB1202A6@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package kiwi-config-openSUSE for
openSUSE:Factory
checked in at Thu Mar 11 01:40:51 CET 2010.



--------
--- kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2010-02-14
09:07:11.000000000 +0100
+++
/mounts/work_src_done/STABLE/kiwi-config-openSUSE/kiwi-config-openSUSE.changes
2010-03-10 15:16:02.000000000 +0100
@@ -1,0 +2,10 @@
+Wed Mar 10 14:15:44 UTC 2010 - coolo@xxxxxxxxxx
+
+- move stuff from patch to kiwi functions
+
+-------------------------------------------------------------------
+Wed Mar 10 11:16:59 UTC 2010 - coolo@xxxxxxxxxx
+
+- do not play with mounts
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
config-gnome.patch
config-kde.patch
config-usb.patch
config.patch
xdm-x11.patch

New:
----
config-firstboot.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kiwi-config-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.t99PIR/_old 2010-03-11 01:40:41.000000000 +0100
+++ /var/tmp/diff_new_pack.t99PIR/_new 2010-03-11 01:40:41.000000000 +0100
@@ -25,7 +25,7 @@
BuildRequires: jing kiwi yast2-country
Summary: KDE live CD
Version: 11.2
-Release: 18
+Release: 19
Group: System/Boot
License: BSD3c(or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -33,21 +33,17 @@
Source2: config-hal.patch
Source3: config.sh
Source4: config.xml.in
-Source5: config.patch
-Source6: config-kde.patch
-Source7: config-gnome.patch
Source8: ifcfg-eth0
Source10: README
Source11: correct_live_for_reboot
Source12: correct_live_install
Source16: boot.langset
Source17: 99-ignore-live-usb.fdi
-Source19: config-usb.patch
+Source19: config-firstboot.patch
Source20: geturls.xsl
Source22: getcountrydata.ycp
Source23: langset.sh
Source24: boot.braille
-Source25: xdm-x11.patch
Source26: xdm-liveinstall.patch
Source27: SoftLocks
ExcludeArch: ia64 ppc64 s390x s390 ppc
@@ -92,6 +88,22 @@
othertype=usb
fi
install -m 755 %{SOURCE3} config.sh
+ if $desktop = kde; then
+ echo 'baseUpdateSysConfig /etc/sysconfig/displaymanager DISPLAYMANAGER
kdm4' >> config.sh
+ fi
+ if $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/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
America\/New_York' >> 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 " | \
xmllint --format - > config.xml
if test $type = usb; then
@@ -126,24 +138,17 @@
cp /CD1/gpg-pubkey* rpmkeys
install -m 644 -D /CD1/control.xml etc/YaST2/control.xml
/usr/bin/xsltproc %{SOURCE20} /CD1/control.xml > tmp/geturls.sh
- install -m 644 %{SOURCE5} tmp/config.patch
- if test "$desktop" = gnome; then
- cat %{SOURCE7} >> tmp/config.patch
- else
- cat %{SOURCE6} >> tmp/config.patch
- fi
mkdir -p var/lib/zypp
install -m 644 %{SOURCE27} var/lib/zypp/SoftLocks
echo 0123456-7890-$desktop-$type-0123456 > var/lib/zypp/AnonymousUniqueId
mkdir -p etc/smolt
echo 0123456-7890-$desktop-$type-0123456 > etc/smolt/uuid
if test $type = usb; then
- cp %{SOURCE19} tmp
+ cp %{SOURCE19} tmp/config-firstboot.patch
mkdir -p var/lib/YaST2
touch var/lib/YaST2/reconfig_system
# still needed due to a bug in yast2-installation
touch etc/reconfig_system
- install -D -m 644
/usr/share/doc/packages/kiwi/examples/suse-$kiwiversion/suse-live-stick/root/etc/X11/xorg.conf
etc/X11/xorg.conf
touch etc/dmidecode.md5
fi
install -D -m 644 %{SOURCE8} etc/sysconfig/network/ifcfg-eth0
@@ -155,17 +160,15 @@
install -D -m 755 %{SOURCE12} usr/bin/correct_live_install
install -D -m 644 %{SOURCE2} etc/YaST2/policy.patch
install -m 644 %{SOURCE26} etc/YaST2/liveinstall.patch
- if test $desktop = x11; then
- cat %{SOURCE25} >> tmp/config.patch
- sed -i -e "s,NETWORKMANAGER=yes,NETWORKMANAGER=no," tmp/config.patch
- fi
mkdir -p var/lib/zypp/
echo livecd-$desktop > var/lib/zypp/LastDistributionFlavor
+ if test $type != usb; then
if test $desktop = kde; then
install -m 644
/usr/share/doc/manual/opensuse-kdequick_en-pdf/opensuse-kdequick_en.pdf tmp/
else
install -m 644
/usr/share/doc/manual/opensuse-gnomequick_en-pdf/opensuse-gnomequick_en.pdf tmp/
fi
+ fi
arch=%{_target_cpu}
plfile=/usr/share/suse/packages/$config-$arch
if test -f $plfile; then


++++++ config-firstboot.patch ++++++
--- /etc/YaST2/firstboot.xml.orig 2008-08-07 11:51:37.000000000 +0200
+++ /etc/YaST2/firstboot.xml 2008-08-07 10:39:51.000000000 +0200
@@ -48,7 +48,10 @@
<stage>firstboot</stage>
<label>Hardware Configuration</label>
<proposal_modules config:type="list">
+ <proposal_module>x11</proposal_module>
<proposal_module>printer</proposal_module>
+ <proposal_module>sound</proposal_module>
+ <proposal_module>bluetooth</proposal_module>
</proposal_modules>
</proposal>
<proposal>
@@ -74,7 +77,7 @@
<modules config:type="list">
<module>
<label>Language</label>
- <enabled config:type="boolean">false</enabled>
+ <enabled config:type="boolean">true</enabled>
<name>firstboot_language</name>
</module>
<module>
@@ -139,7 +142,7 @@
</module>
<module>
<label>Users</label>
- <enabled config:type="boolean">true</enabled>
+ <enabled config:type="boolean">false</enabled>
<name>inst_auth</name>
</module>
<module>
++++++ config.sh ++++++
--- /var/tmp/diff_new_pack.t99PIR/_old 2010-03-11 01:40:41.000000000 +0100
+++ /var/tmp/diff_new_pack.t99PIR/_new 2010-03-11 01:40:41.000000000 +0100
@@ -46,11 +46,13 @@
chkconfig boot.ldconfig off

cd /
-patch -p0 < /tmp/config.patch
-rm /tmp/config.patch

patch -p0 < /etc/YaST2/liveinstall.patch

+if test -f /etc/YaST2/firstboot.xml -a -f /tmp/config-firstboot.patch; then
+ patch -f /etc/YaST2/firstboot.xml /tmp/config-firstboot.patch
+fi
+
# disabled for now - if you reenable, don't forget correct_live_install
# bnc#382158
# patch -p0 < /etc/YaST2/policy.patch
@@ -63,7 +65,6 @@
rmdir /rpmkeys

insserv
-insserv -r boot.apparmor || true

rm -rf /var/cache/zypp/raw/*

@@ -87,14 +88,12 @@

: > /var/log/zypper.log

-mv /tmp/*.pdf /home/linux
+mv /tmp/*.pdf /home/linux || true

#======================================
# SuSEconfig
#--------------------------------------
-mount -o bind /lib/udev/devices /dev
suseConfig
-umount /dev

/usr/lib*/hal/hald-generate-fdi-cache
for script in /usr/share/opensuse-kiwi/live_user_scripts/*.sh; do
@@ -105,14 +104,17 @@

rm -rf /var/cache/zypp/packages

+# bug 544314
+sed -i -e 's,^\(.*pam_gnome_keyring.so.*\),#\1,' /etc/pam.d/common-auth-pc
+
#USB /usr/bin/correct_live_for_reboot usb
#USB /usr/bin/correct_live_install usb

-# bug 544314
-sed -i -e 's,^\(.*pam_gnome_keyring.so.*\),#\1,' /etc/pam.d/common-auth
+echo '127.0.0.2 linux.site linux' >> /etc/hosts
+
+baseSetRunlevel 5
+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"

-#======================================
-# Umount kernel filesystems
-#--------------------------------------
-baseCleanMount || true
-exit 0

++++++ config.xml.in ++++++
--- kiwi-config-openSUSE/config.xml.in 2010-02-01 11:08:45.000000000 +0100
+++ /mounts/work_src_done/STABLE/kiwi-config-openSUSE/config.xml.in
2010-03-10 15:51:34.000000000 +0100
@@ -19,7 +19,7 @@
<packagemanager>zypper</packagemanager>
<rpm-check-signatures>false</rpm-check-signatures>
<rpm-force>false</rpm-force>
- <locale>en_US.UTF-8</locale>
+ <locale>en_US</locale>
<rpm-excludedocs>false</rpm-excludedocs>
</preferences>
<users group="users">

++++++ correct_live_for_reboot ++++++
--- /var/tmp/diff_new_pack.t99PIR/_old 2010-03-11 01:40:41.000000000 +0100
+++ /var/tmp/diff_new_pack.t99PIR/_new 2010-03-11 01:40:41.000000000 +0100
@@ -13,5 +13,7 @@
# TODO make this conditional chkconfig boot.braille off
chkconfig boot.ldconfig on
chkconfig boot.langset off
-chkconfig boot.compcache off
+if test -e /etc/init.d/boot.compcache; then
+ chkconfig boot.compcache off
+fi


++++++ correct_live_install ++++++
--- /var/tmp/diff_new_pack.t99PIR/_old 2010-03-11 01:40:41.000000000 +0100
+++ /var/tmp/diff_new_pack.t99PIR/_new 2010-03-11 01:40:41.000000000 +0100
@@ -18,6 +18,9 @@
# remove live-cd user
userdel linux

+# bug 544314
+sed -i -e 's,^#\(.*pam_gnome_keyring.so.*\),\1,' /etc/pam.d/common-auth-pc
+
# reset pam config
pam-config -d --nullok

@@ -39,17 +42,9 @@
patch -R -p0 < /etc/YaST2/liveinstall.patch
rm /etc/YaST2/liveinstall.patch

-if ! test "$is_usb" = 0; then
- patch -p0 < /tmp/config-usb.patch
- rm /tmp/config-usb.patch
-fi
-
# bug 391798
sed -i -e 's,DISPLAYMANAGER_AUTOLOGIN="linux",DISPLAYMANAGER_AUTOLOGIN="",'
/etc/sysconfig/displaymanager

-# bug 544314
-sed -i -e 's,^#\(.*pam_gnome_keyring.so.*\),\1,' /etc/pam.d/common-auth
-
if test "$is_usb" = 0; then
# not good enough for usb
# there we need something dynamic in firstboot


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread