Hello community, here is the log from the commit of package linuxrc for openSUSE:Factory checked in at 2014-05-10 08:32:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/linuxrc (Old) and /work/SRC/openSUSE:Factory/.linuxrc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "linuxrc" Changes: -------- --- /work/SRC/openSUSE:Factory/linuxrc/linuxrc.changes 2014-05-06 13:39:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.linuxrc.new/linuxrc.changes 2014-05-10 08:32:39.000000000 +0200 @@ -1,0 +2,13 @@ +Thu May 8 14:54:48 CEST 2014 - [email protected] + +- don't load any fonts anymore (bnc #875592) +- 4.2.23 + +------------------------------------------------------------------- +Thu May 8 09:42:41 CEST 2014 - [email protected] + +- move fcoe & iscsi detection to a place where all required modules + have been loaded (bnc #874522) +- 4.2.22 + +------------------------------------------------------------------- Old: ---- linuxrc-4.2.21.tar.xz New: ---- linuxrc-4.2.23.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.7ydvgB/_old 2014-05-10 08:32:40.000000000 +0200 +++ /var/tmp/diff_new_pack.7ydvgB/_new 2014-05-10 08:32:40.000000000 +0200 @@ -25,9 +25,9 @@ Summary: SUSE Installation Program License: GPL-3.0+ Group: System/Boot -Version: 4.2.21 +Version: 4.2.23 Release: 0 -Source: linuxrc-4.2.21.tar.xz +Source: linuxrc-4.2.23.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ++++++ linuxrc-4.2.21.tar.xz -> linuxrc-4.2.23.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.21/VERSION new/linuxrc-4.2.23/VERSION --- old/linuxrc-4.2.21/VERSION 2014-05-02 15:41:30.000000000 +0200 +++ new/linuxrc-4.2.23/VERSION 2014-05-08 14:54:40.000000000 +0200 @@ -1 +1 @@ -4.2.21 +4.2.23 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.21/changelog new/linuxrc-4.2.23/changelog --- old/linuxrc-4.2.21/changelog 2014-05-02 15:41:32.000000000 +0200 +++ new/linuxrc-4.2.23/changelog 2014-05-08 14:54:42.000000000 +0200 @@ -1,4 +1,10 @@ -2014-05-02: HEAD +2014-05-08: HEAD + - don't load any fonts anymore (bnc #875592) + +2014-05-08: 4.2.22 + - move fcoe & iscsi detection to a place where all required modules have been loaded (bnc #874522) + +2014-05-02: 4.2.21 - iscsi detection also looks for iscsi_boot* (bnc #876104) 2014-04-24: 4.2.20 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.21/linuxrc.c new/linuxrc-4.2.23/linuxrc.c --- old/linuxrc-4.2.21/linuxrc.c 2014-04-24 14:35:53.000000000 +0200 +++ new/linuxrc-4.2.23/linuxrc.c 2014-05-08 09:40:20.000000000 +0200 @@ -803,10 +803,6 @@ if(!config.had_segv) { lxrc_add_parts(); - // we need edd for udev - if(!config.udev_mods && util_check_exist("/modules/edd.ko")) { - system("/sbin/insmod /modules/edd.ko"); - } } LXRC_WAIT @@ -871,6 +867,11 @@ mount("devpts", "/dev/pts", "devpts", 0, 0); } + // we might need edd for udev + if(util_check_exist("/modules/edd.ko")) { + system("/sbin/insmod /modules/edd.ko"); + } + if(!config.test) { fprintf(stderr, "Starting udev... "); fflush(stderr); @@ -943,8 +944,7 @@ info_init(); - if(iscsi_check()) config.withiscsi = 1; - config.withfcoe = fcoe_check(); + LXRC_WAIT printf("Loading basic drivers..."); fflush(stdout); @@ -952,6 +952,8 @@ printf(" ok\n"); fflush(stdout); + LXRC_WAIT + /* look for driver updates in initrd */ util_chk_driver_update("/", "/"); @@ -972,6 +974,11 @@ config.efi_vars = 1; } + if(iscsi_check()) config.withiscsi = 1; + if(fcoe_check()) config.withfcoe = 1; + + LXRC_WAIT + /* get usb keyboard working */ if(config.manual == 1 && !config.had_segv) util_load_usb(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.21/settings.c new/linuxrc-4.2.23/settings.c --- old/linuxrc-4.2.21/settings.c 2014-02-27 13:58:51.000000000 +0100 +++ new/linuxrc-4.2.23/settings.c 2014-05-08 14:21:22.000000000 +0200 @@ -26,9 +26,6 @@ #include "url.h" -#define UNI_FONT "linuxrc2-16.psfu" -#define SMALL_FONT "linuxrc-16.psfu" - #define KM_L1 "iso-8859-15" #define KM_L2 "iso-8859-2" #define KM_L7 "iso-8859-7" @@ -62,36 +59,36 @@ #define LANG_DEFAULT lang_en static language_t set_languages_arm[] = { - { lang_af, "Afrikaans", "us", SMALL_FONT, UNI_FONT, 0, 0, "af_ZA", "af", 0 }, - { lang_bg, "Български", "us", SMALL_FONT, UNI_FONT, 0, 0, "bg_BG", "bg", 0 }, - { lang_ca, "Català", "us", SMALL_FONT, UNI_FONT, 0, 0, "ca_ES", "ca", 0 }, - { lang_cs, "Čeština", "cz-us-qwertz", SMALL_FONT, UNI_FONT, 1, 1, "cs_CZ", "cs", 0 }, - { lang_da, "Dansk", "dk", SMALL_FONT, UNI_FONT, 0, 0, "da_DK", "da", 0 }, - { lang_de, "Deutsch", "de-latin1-nodeadkeys", SMALL_FONT, UNI_FONT, 0, 0, "de_DE", "de", 0 }, - { lang_en, "English", "us", SMALL_FONT, UNI_FONT, 0, 0, "en_US", "en_US", 0 }, - { lang_es, "Español", "es", SMALL_FONT, UNI_FONT, 0, 1, "es_ES", "es", 0 }, - { lang_fr, "Français", "fr-latin1", SMALL_FONT, UNI_FONT, 0, 0, "fr_FR", "fr", 0 }, - { lang_el, "Ελληνικά", "gr", SMALL_FONT, UNI_FONT, 1, 1, "el_GR", "el", 0 }, - { lang_it, "Italiano", "it", SMALL_FONT, UNI_FONT, 0, 0, "it_IT", "it", 0 }, - { lang_ja, "Japanese", "jp106", SMALL_FONT, UNI_FONT, 0, 0, "ja_JP", "ja", 1 }, - { lang_hu, "Magyar", "hu", SMALL_FONT, UNI_FONT, 1, 1, "hu_HU", "hu", 0 }, - { lang_nl, "Nederlands", "us", SMALL_FONT, UNI_FONT, 0, 1, "nl_NL", "nl", 0 }, - { lang_nb, "Norsk", "no-latin1", SMALL_FONT, UNI_FONT, 0, 1, "nb_NO", "nb", 0 }, - { lang_pl, "Polski", "Pl02", SMALL_FONT, UNI_FONT, 1, 1, "pl_PL", "pl", 0 }, - { lang_pt, "Português", "pt-latin1", SMALL_FONT, UNI_FONT, 0, 1, "pt_PT", "pt", 0 }, - { lang_pt_BR, "Português Brasileiro", "br-abnt2", SMALL_FONT, UNI_FONT, 0, 1, "pt_BR", "pt_BR", 0 }, - { lang_ru, "Русский", "ru1", SMALL_FONT, UNI_FONT, 1, 1, "ru_RU", "ru", 0 }, - { lang_zh_CN, "Simplified Chinese", "us", SMALL_FONT, UNI_FONT, 0, 0, "zh_CN", "zh_CN", 1 }, - { lang_sk, "Slovenčina", "sk-qwerty", SMALL_FONT, UNI_FONT, 1, 1, "sk_SK", "sk", 0 }, - { lang_sl, "Slovenščina", "slovene", SMALL_FONT, UNI_FONT, 1, 1, "sl_SI", "sl", 0 }, - { lang_fi, "Suomi", "fi-latin1", SMALL_FONT, UNI_FONT, 0, 1, "fi_FI", "fi", 0 }, - { lang_sv, "Svenska", "sv-latin1", SMALL_FONT, UNI_FONT, 0, 1, "sv_SE", "sv", 0 }, - { lang_zh_TW, "Traditional Chinese", "us", SMALL_FONT, UNI_FONT, 0, 0, "zh_TW", "zh_TW", 1 }, - { lang_uk, "Українська", "us", SMALL_FONT, UNI_FONT, 0, 1, "uk_UA", "uk", 0 }, - { lang_xh, "isiXhosa", "us", SMALL_FONT, UNI_FONT, 0, 0, "xh_ZA", "xh", 0 }, - { lang_zu, "isiZulu", "us", SMALL_FONT, UNI_FONT, 0, 0, "zu_ZA", "zu", 0 }, + { lang_af, "Afrikaans", "us", "af_ZA", "af" }, + { lang_bg, "Български", "us", "bg_BG", "bg" }, + { lang_ca, "Català", "us", "ca_ES", "ca" }, + { lang_cs, "Čeština", "cz-us-qwertz", "cs_CZ", "cs" }, + { lang_da, "Dansk", "dk", "da_DK", "da" }, + { lang_de, "Deutsch", "de-latin1-nodeadkeys", "de_DE", "de" }, + { lang_en, "English", "us", "en_US", "en_US" }, + { lang_es, "Español", "es", "es_ES", "es" }, + { lang_fr, "Français", "fr-latin1", "fr_FR", "fr" }, + { lang_el, "Ελληνικά", "gr", "el_GR", "el" }, + { lang_it, "Italiano", "it", "it_IT", "it" }, + { lang_ja, "Japanese", "jp106", "ja_JP", "ja" }, + { lang_hu, "Magyar", "hu", "hu_HU", "hu" }, + { lang_nl, "Nederlands", "us", "nl_NL", "nl" }, + { lang_nb, "Norsk", "no-latin1", "nb_NO", "nb" }, + { lang_pl, "Polski", "Pl02", "pl_PL", "pl" }, + { lang_pt, "Português", "pt-latin1", "pt_PT", "pt" }, + { lang_pt_BR, "Português Brasileiro", "br-abnt2", "pt_BR", "pt_BR" }, + { lang_ru, "Русский", "ru1", "ru_RU", "ru" }, + { lang_zh_CN, "Simplified Chinese", "us", "zh_CN", "zh_CN" }, + { lang_sk, "Slovenčina", "sk-qwerty", "sk_SK", "sk" }, + { lang_sl, "Slovenščina", "slovene", "sl_SI", "sl" }, + { lang_fi, "Suomi", "fi-latin1", "fi_FI", "fi" }, + { lang_sv, "Svenska", "sv-latin1", "sv_SE", "sv" }, + { lang_zh_TW, "Traditional Chinese", "us", "zh_TW", "zh_TW" }, + { lang_uk, "Українська", "us", "uk_UA", "uk" }, + { lang_xh, "isiXhosa", "us", "xh_ZA", "xh" }, + { lang_zu, "isiZulu", "us", "zu_ZA", "zu" }, // entry for unknown language - { lang_dummy, "", "us", SMALL_FONT, UNI_FONT, 0, 0, NULL, NULL, 0 }, + { lang_dummy, "", "us", NULL, NULL }, }; #define KEYMAP_DEFAULT "us" @@ -194,7 +191,6 @@ static int set_settings_cb (dia_item_t di); static int set_expert_cb (dia_item_t di); static int set_get_current_language (enum langid_t lang); -static void set_font(language_t *lang); static char *keymap_encoding(char *map); /* @@ -451,17 +447,7 @@ */ void set_activate_language(enum langid_t lang_id) { - int i; - language_t *lang; - config.language = lang_id; - i = set_get_current_language(lang_undef); - - if(i > 0) { - lang = set_languages_arm + i - 1; - - if(!config.serial && !config.linemode) set_font(lang); - } } @@ -620,16 +606,9 @@ void set_write_info(FILE *f) { language_t *lang; - char magic[3] = "( "; lang = set_languages_arm + set_get_current_language(lang_undef) - 1; - if(lang->write_info) { - file_write_str(f, key_font, lang->font1); - magic[1] = lang->usermap ? 'K' : 'B'; - file_write_str(f, key_fontmagic, magic); - } - file_write_str(f, key_locale, lang->locale); } @@ -653,53 +632,6 @@ } -/* - * New setfont code. - * setfont apparently works with /dev/tty. This breaks things on frame buffer - * consoles for some reason. Moreover, fb consoles can have different settings - * for every console. - * Hence the workaround. - */ -void set_font(language_t *lang) -{ - char cmd[128], *font, dev[32]; - int i, err = 0, max_cons; - FILE *f; - - if(!config.fb) {; - if((f = fopen("/dev/fb", "r"))) { - config.fb = 1; - fclose(f); - } - } - - if(!lang) return; - - font = config.fb ? lang->font2 : lang->font1; - - sprintf(cmd, "setfont %s", font); - - fprintf(stderr, "setfont %s\n", font); - - max_cons = config.fb ? 6 : 1; - - if(!config.test) { - err |= rename("/dev/tty", "/dev/tty.bak"); - for(i = 0; i < max_cons; i++) { - sprintf(dev, "/dev/tty%d", i); - err |= rename(dev, "/dev/tty"); - system(cmd); - if(config.utf8) { - f = fopen("/dev/tty", "w"); - fprintf(f, "\033%%G"); fclose(f); - } - err |= rename("/dev/tty", dev); - } - err |= rename("/dev/tty.bak", "/dev/tty"); - } -} - - language_t *current_language() { return set_languages_arm + set_get_current_language(lang_undef) - 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.21/settings.h new/linuxrc-4.2.23/settings.h --- old/linuxrc-4.2.21/settings.h 2013-09-02 11:07:50.000000000 +0200 +++ new/linuxrc-4.2.23/settings.h 2014-05-08 14:20:32.000000000 +0200 @@ -13,13 +13,8 @@ enum langid_t id; char *descr; char *keymap; - char *font1; - char *font2; - int usermap; // redundant, will drop it later -- snwint - int write_info; char *locale; char *trans_id; /* instsys translation image suffix */ - int xfonts; /* needs extra xfonts */ } language_t; typedef struct { -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
