Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package linuxrc for openSUSE:Factory checked
in at 2024-01-11 21:04:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/linuxrc (Old)
and /work/SRC/openSUSE:Factory/.linuxrc.new.21961 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "linuxrc"
Thu Jan 11 21:04:40 2024 rev:317 rq:1137972 version:9.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/linuxrc/linuxrc.changes 2023-08-16
14:16:51.194875427 +0200
+++ /work/SRC/openSUSE:Factory/.linuxrc.new.21961/linuxrc.changes
2024-01-11 21:04:47.817733938 +0100
@@ -1,0 +2,8 @@
+Wed Jan 10 16:54:52 UTC 2024 - wfe...@opensuse.org
+
+- merge gh#openSUSE/linuxrc#329
+- write /etc/locale.conf and /etc/vconsole.conf (bsc#1218621)
+- a new year
+- 9.2
+
+--------------------------------------------------------------------
Old:
----
linuxrc-9.1.tar.xz
New:
----
linuxrc-9.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ linuxrc.spec ++++++
--- /var/tmp/diff_new_pack.oGj28o/_old 2024-01-11 21:04:48.745767740 +0100
+++ /var/tmp/diff_new_pack.oGj28o/_new 2024-01-11 21:04:48.745767740 +0100
@@ -17,7 +17,7 @@
Name: linuxrc
-Version: 9.1
+Version: 9.2
Release: 0
Summary: SUSE Installation Program
License: GPL-3.0+
++++++ linuxrc-9.1.tar.xz -> linuxrc-9.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-9.1/VERSION new/linuxrc-9.2/VERSION
--- old/linuxrc-9.1/VERSION 2023-08-14 19:11:28.000000000 +0200
+++ new/linuxrc-9.2/VERSION 2024-01-10 17:54:52.000000000 +0100
@@ -1 +1 @@
-9.1
+9.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-9.1/changelog new/linuxrc-9.2/changelog
--- old/linuxrc-9.1/changelog 2023-08-14 19:11:28.000000000 +0200
+++ new/linuxrc-9.2/changelog 2024-01-10 17:54:52.000000000 +0100
@@ -1,3 +1,8 @@
+2024-01-10: 9.2
+ - merge gh#openSUSE/linuxrc#329
+ - write /etc/locale.conf and /etc/vconsole.conf (bsc#1218621)
+ - a new year
+
2023-08-14: 9.1
- merge gh#openSUSE/linuxrc#229
- Fix syntax inconsistency filename::key
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-9.1/file.c new/linuxrc-9.2/file.c
--- old/linuxrc-9.1/file.c 2023-08-14 19:11:28.000000000 +0200
+++ new/linuxrc-9.2/file.c 2024-01-10 17:54:52.000000000 +0100
@@ -2028,10 +2028,6 @@
set_write_info(f);
- if(config.keymap_set || config.manual) {
- file_write_str(f, key_keytable, config.keymap);
- }
-
file_write_str(f, key_console, config.serial);
// don't leave anything mounted unless we're low in memory and run yast
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-9.1/global.h new/linuxrc-9.2/global.h
--- old/linuxrc-9.1/global.h 2023-08-14 19:11:28.000000000 +0200
+++ new/linuxrc-9.2/global.h 2024-01-10 17:54:52.000000000 +0100
@@ -491,6 +491,7 @@
enum langid_t language; /**< currently selected language */
char *keymap; /**< current keymap */
unsigned keymap_set:1; /**< explicitly set via 'keytable' option */
+ unsigned keymap_applied:1; /**< config.keymap has been applied via
loadkeys command */
unsigned sourcetype:1; /**< 0: directory, 1: file */
char *new_root; /**< root device to boot */
char *rootimage; /**< "boot/<arch>/root" */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-9.1/linuxrc.c new/linuxrc-9.2/linuxrc.c
--- old/linuxrc-9.1/linuxrc.c 2023-08-14 19:11:28.000000000 +0200
+++ new/linuxrc-9.2/linuxrc.c 2024-01-10 17:54:52.000000000 +0100
@@ -413,6 +413,8 @@
/* change hostname from 'install' to 'rescue' unless we've had something
better */
if(!config.net.realhostname) util_set_hostname("rescue");
+ file_write_install_inf("");
+
lxrc_run_console("/mounts/initrd/scripts/prepare_rescue");
LXRC_WAIT
@@ -953,7 +955,7 @@
if (config.linemode)
putchar('\n');
printf(
- "\n>>> %s installation program v" LXRC_FULL_VERSION " (c) 1996-2023 SUSE
LLC %s <<<\n",
+ "\n>>> %s installation program v" LXRC_FULL_VERSION " (c) 1996-2024 SUSE
LLC %s <<<\n",
config.product,
config.platform_name
);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-9.1/settings.c new/linuxrc-9.2/settings.c
--- old/linuxrc-9.1/settings.c 2023-08-14 19:11:28.000000000 +0200
+++ new/linuxrc-9.2/settings.c 2024-01-10 17:54:52.000000000 +0100
@@ -419,6 +419,7 @@
if((config.keymap = keymap)) {
kbd_unimode();
sprintf(cmd, "loadkeys -q %s", keymap);
+ config.keymap_applied = 1;
if(!config.test) {
lxrc_run_console(cmd);
}
@@ -525,13 +526,36 @@
}
-void set_write_info(FILE *f)
+/*
+ * Write language (locale) and keymap settings to
+ * - /etc/locale.conf
+ * - /etc/vconsole.conf
+ * - /etc/install.inf (via passed file handle)
+ */
+void set_write_info(FILE *install_inf)
{
language_t *lang;
+ FILE *f;
lang = set_languages_arm + set_get_current_language(lang_undef) - 1;
- file_write_str(f, key_locale, lang->locale);
+ file_write_str(install_inf, key_locale, lang->locale);
+
+ if((f = fopen("/etc/locale.conf", "w"))) {
+ fprintf(f, "LANG=%s.UTF-8\n", lang->locale);
+ fclose(f);
+ }
+
+ if(config.keymap_set || config.manual) {
+ file_write_str(install_inf, key_keytable, config.keymap);
+ }
+
+ if(config.keymap_applied) {
+ if((f = fopen("/etc/vconsole.conf", "w"))) {
+ fprintf(f, "KEYMAP=%s\n", config.keymap);
+ fclose(f);
+ }
+ }
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-9.1/settings.h new/linuxrc-9.2/settings.h
--- old/linuxrc-9.1/settings.h 2023-08-14 19:11:28.000000000 +0200
+++ new/linuxrc-9.2/settings.h 2024-01-10 17:54:52.000000000 +0100
@@ -30,7 +30,7 @@
extern void set_activate_language(enum langid_t lang_id);
extern void set_activate_keymap (char *keymap);
extern void set_choose_language (void);
-extern void set_write_info (FILE *f);
+extern void set_write_info (FILE *install_inf);
language_t *current_language (void);
extern void set_expert_menu (void);
