diff options
| -rw-r--r-- | rescue/list.xml | 16 | ||||
| -rwxr-xr-x | rescue/make_rescue_img | 7 | ||||
| -rwxr-xr-x | rescue/tree/etc/rc.sysinit | 2 |
3 files changed, 25 insertions, 0 deletions
diff --git a/rescue/list.xml b/rescue/list.xml index 8e6fdbde2..8a812b662 100644 --- a/rescue/list.xml +++ b/rescue/list.xml @@ -146,6 +146,22 @@ <from expand="command"> perl -Mkeyboard -I../perl-install -le 'print foreach keyboard::loadkeys_files()' </from> + + <if set="LANGUAGE_fr_FR"> + /usr/lib/gconv/gconv-modules + /usr/lib/gconv/ISO8859-15.so + /usr/share/locale/ISO-8859-15 + /usr/share/locale/fr_FR + /usr/share/locale/fr/LC_MESSAGES/partimage.mo + </if> + <if set="LANGUAGE_pt_BR"> + /usr/lib/gconv/gconv-modules + /usr/lib/gconv/ISO8859-15.so + /usr/share/locale/ISO-8859-15 + /usr/share/locale/pt_BR + /usr/share/locale/pt/LC_MESSAGES/partimage.mo + </if> + </from> <from dir="/usr/lib/rpm" expand="glob"> diff --git a/rescue/make_rescue_img b/rescue/make_rescue_img index bd4778523..08e35e937 100755 --- a/rescue/make_rescue_img +++ b/rescue/make_rescue_img @@ -76,6 +76,13 @@ foreach (cat_("aliases")) { symlink $dest, "$tmp$f"; } + +if (my ($LANGUAGE) = map { if_(/LANGUAGE_(.*)/, $1) } keys %ENV) { + substInFile { + $_ = "export LANGUAGE=$LANGUAGE\n" . "export LC_ALL=$LANGUAGE\n" if /^#LANGUAGE/; + } "$tmp/etc/rc.sysinit"; +} + if ($ENV{PARTIMAGE_RPM}) { _ "rpm2cpio $ENV{PARTIMAGE_RPM} | (cd $tmp ; cpio -idu ./usr/sbin/partimage)"; diff --git a/rescue/tree/etc/rc.sysinit b/rescue/tree/etc/rc.sysinit index 9cd170e36..0944a36b4 100755 --- a/rescue/tree/etc/rc.sysinit +++ b/rescue/tree/etc/rc.sysinit @@ -55,6 +55,8 @@ load sr_mod /sbin/ifconfig lo 127.0.0.1 netmask 255.0.0.0 /sbin/route add 127.0.0.1 lo +#LANGUAGE (filled by make_rescue_img) + grep -q noauto /proc/cmdline || drvinst SERIAL_USB if grep ka /proc/cmdline; then |