Hello community,
here is the log from the commit of package kiwi-config-openSUSE for
openSUSE:12.1 checked in at 2011-10-27 11:15:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.1/kiwi-config-openSUSE (Old)
and /work/SRC/openSUSE:12.1/.kiwi-config-openSUSE.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi-config-openSUSE", Maintainer is "co...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:12.1/kiwi-config-openSUSE/kiwi-config-openSUSE.changes
2011-10-24 12:57:54.000000000 +0200
+++
/work/SRC/openSUSE:12.1/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes
2011-10-28 17:10:19.000000000 +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.4IyKSk/_old 2011-10-28 17:10:20.000000000 +0200
+++ /var/tmp/diff_new_pack.4IyKSk/_new 2011-10-28 17:10:20.000000000 +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.4IyKSk/_old 2011-10-28 17:10:20.000000000 +0200
+++ /var/tmp/diff_new_pack.4IyKSk/_new 2011-10-28 17:10:20.000000000 +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.4IyKSk/_old 2011-10-28 17:10:20.000000000 +0200
+++ /var/tmp/diff_new_pack.4IyKSk/_new 2011-10-28 17:10:20.000000000 +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.4IyKSk/_old 2011-10-28 17:10:20.000000000 +0200
+++ /var/tmp/diff_new_pack.4IyKSk/_new 2011-10-28 17:10:20.000000000 +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.4IyKSk/_old 2011-10-28 17:10:20.000000000 +0200
+++ /var/tmp/diff_new_pack.4IyKSk/_new 2011-10-28 17:10:20.000000000 +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, unicodeMap, magic,
Keyboard::keymap, yast_kbd, Keyboard::compose_table, timezone);
+ contents = contents + sformat("\nCONSOLE_ENCODING: %1",
encoding);
if (lang == "zh_HK")
contents = contents + "\nRC_LC_MESSAGES: zh_TW.UTF-8";
@@ -48,6 +53,7 @@
foreach (string key, string val, (map<string,string>) x11data, {
contents = sformat ("%1\n%2: %3", contents, key, val);
});
+ contents = contents + "\n";
SCR::Write (.target.string, dir + fqlanguage, contents);
});
++++++ langset.service ++++++
[Unit]
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
[Service]
Type=oneshot
RemainAfterExit=yes
ExecStart=/bin/sh /etc/langset.sh
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
