From b8aa6ef04068eceb1477444007ee4a22a64fcf68117df0d6eba45327ddef5918 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 14 Apr 2023 07:58:47 +0000 Subject: [PATCH 1/7] Accepting request 1078596 from home:kukuk:branches:Base:System - tmpfiles-suse.conf (jsc#PED-3144): - Remove lastlog entry, replaced by lastlog2 - Remove btmp entry, not Y2038 safe OBS-URL: https://build.opensuse.org/request/show/1078596 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1371 --- systemd.changes | 7 +++++++ tmpfiles-suse.conf | 2 -- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/systemd.changes b/systemd.changes index 7fd9db14..533ec0c9 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Apr 12 08:45:10 UTC 2023 - Thorsten Kukuk + +- tmpfiles-suse.conf (jsc#PED-3144): + - Remove lastlog entry, replaced by lastlog2 + - Remove btmp entry, not Y2038 safe + ------------------------------------------------------------------- Wed Apr 5 08:20:53 UTC 2023 - Franck Bui diff --git a/tmpfiles-suse.conf b/tmpfiles-suse.conf index 885e852c..90da5b70 100644 --- a/tmpfiles-suse.conf +++ b/tmpfiles-suse.conf @@ -11,5 +11,3 @@ d /run/lock 0775 root lock - # FIXME: Should these one be moved to shadow ? f /var/log/wtmp 0664 root utmp - -f /var/log/btmp 0660 root utmp - -f /var/log/lastlog 0664 root utmp - From 7a2de10757181a823e531c71a1c999549046ff7c708f980b2ca1420cea1c2255 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Tue, 18 Apr 2023 10:20:50 +0000 Subject: [PATCH 2/7] Accepting request 1080107 from home:mvidner:branches:Base:System - kbd-model-map.legacy: drop some entries no longer needed by YaST (related to bsc#1194609) OBS-URL: https://build.opensuse.org/request/show/1080107 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1372 --- kbd-model-map.legacy | 14 +++++++------- systemd.changes | 6 ++++++ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/kbd-model-map.legacy b/kbd-model-map.legacy index 5ddbd8d6..003ca5e4 100644 --- a/kbd-model-map.legacy +++ b/kbd-model-map.legacy @@ -1,11 +1,11 @@ # Additional layouts offered by YaST -Pl02 pl pc105 - terminate:ctrl_alt_bksp +# arabic and ir (Iran) have never had a console layout, +# they are symlinks to 'us', but they are needed as YaST +# uses the console layout as a primary key for picking +# the X11 layout arabic ara,us pc105 - terminate:ctrl_alt_bksp,grp:shift_toggle -cn-latin1 ca pc105 multix terminate:ctrl_alt_bksp -cz-lat2-us cz,us pc105 qwerty,basic terminate:ctrl_alt_bksp,grp:shift_toggle -es-cp850 es pc105 - terminate:ctrl_alt_bksp ir ir pc105 - terminate:ctrl_alt_bksp -korean kr pc105 - terminate:ctrl_alt_bksp -lt.std lt pc105 std terminate:ctrl_alt_bksp -no-latin1 no pc105 - terminate:ctrl_alt_bksp +# ruwin_alt-UTF-8 is needed because the X11 russian layouts +# contain no Latin letters and therefore +# the X->console conversion omits Russian entirely ruwin_alt-UTF-8 us,ru pc105 ,winkeys terminate:ctrl_alt_bksp,grp:ctrl_shift_toggle,grp_led:scroll diff --git a/systemd.changes b/systemd.changes index 533ec0c9..785d7638 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Apr 18 09:09:26 UTC 2023 - Martin Vidner + +- kbd-model-map.legacy: drop some entries no longer needed + by YaST (related to bsc#1194609) + ------------------------------------------------------------------- Wed Apr 12 08:45:10 UTC 2023 - Thorsten Kukuk From a15f299e4ec4cf57a7b12d49e32dac7a21f33a721644ebf166628b65eef70b64 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Thu, 20 Apr 2023 06:18:00 +0000 Subject: [PATCH 3/7] Accepting request 1080373 from home:lnussel:branches:Base:System - add some green to systemd-boot menu OBS-URL: https://build.opensuse.org/request/show/1080373 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1373 --- systemd.changes | 5 +++++ systemd.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/systemd.changes b/systemd.changes index 785d7638..5dffa0f7 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 19 15:14:13 UTC 2023 - Ludwig Nussel + +- add some green to systemd-boot menu + ------------------------------------------------------------------- Tue Apr 18 09:09:26 UTC 2023 - Martin Vidner diff --git a/systemd.spec b/systemd.spec index e74fb0a3..ef65a499 100644 --- a/systemd.spec +++ b/systemd.spec @@ -716,6 +716,7 @@ export CFLAGS="%{optflags} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2" -Dremote=%{when journal_remote} \ \ -Dgnu-efi=%{when sd_boot} \ + -Defi-color-highlight="black,green" \ -Dkernel-install=%{when sd_boot} \ \ -Dsbat-distro="%{?sbat_distro}" \ From fa67ecf8d6a36ad8a664eb4ed1fa3b16150fe1bdc8583c5fdb2e2fe8195c28f1 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Thu, 20 Apr 2023 12:59:09 +0000 Subject: [PATCH 4/7] update comments in kbd-model-map.legacy OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1374 --- kbd-model-map.legacy | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/kbd-model-map.legacy b/kbd-model-map.legacy index 003ca5e4..ce83e301 100644 --- a/kbd-model-map.legacy +++ b/kbd-model-map.legacy @@ -1,11 +1,12 @@ -# Additional layouts offered by YaST -# arabic and ir (Iran) have never had a console layout, -# they are symlinks to 'us', but they are needed as YaST -# uses the console layout as a primary key for picking -# the X11 layout +# Additional layouts offered by YaST arabic and ir (Iran) have never had a +# console layout, they are symlinks to 'us', but they are needed as YaST uses +# the console layout as a primary key for picking the X11 layout + arabic ara,us pc105 - terminate:ctrl_alt_bksp,grp:shift_toggle ir ir pc105 - terminate:ctrl_alt_bksp -# ruwin_alt-UTF-8 is needed because the X11 russian layouts -# contain no Latin letters and therefore -# the X->console conversion omits Russian entirely + +# FIXME: ruwin_alt-UTF-8 is not needed as the legacy "ru" keymap +# (/usr/share/kbd/keymaps/i386/qwerty/ru.map.gz) is a dual layout and contains +# the Latin letters. Keep it until YaST is updated. + ruwin_alt-UTF-8 us,ru pc105 ,winkeys terminate:ctrl_alt_bksp,grp:ctrl_shift_toggle,grp_led:scroll From 77c0aa7ebcd780e45e3bddc0ddb11e6d847f6f7036726b56249aa31f564a10ae Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Thu, 27 Apr 2023 09:05:16 +0000 Subject: [PATCH 5/7] - kbd-model-map.legacy: 'arabic' vc keymap has been renamed 'ara' (bsc#1210702) OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1375 --- kbd-model-map.legacy | 2 +- systemd.changes | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/kbd-model-map.legacy b/kbd-model-map.legacy index ce83e301..5c27c48c 100644 --- a/kbd-model-map.legacy +++ b/kbd-model-map.legacy @@ -2,7 +2,7 @@ # console layout, they are symlinks to 'us', but they are needed as YaST uses # the console layout as a primary key for picking the X11 layout -arabic ara,us pc105 - terminate:ctrl_alt_bksp,grp:shift_toggle +ara ara,us pc105 - terminate:ctrl_alt_bksp,grp:shift_toggle ir ir pc105 - terminate:ctrl_alt_bksp # FIXME: ruwin_alt-UTF-8 is not needed as the legacy "ru" keymap diff --git a/systemd.changes b/systemd.changes index 5dffa0f7..7f3a9fae 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 27 07:58:58 UTC 2023 - Franck Bui + +- kbd-model-map.legacy: 'arabic' vc keymap has been renamed 'ara' (bsc#1210702) + ------------------------------------------------------------------- Wed Apr 19 15:14:13 UTC 2023 - Ludwig Nussel From 958f5e240cff19611641aa767fd6250ec24dd600effed56f9840b10f4a40b50d Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Thu, 27 Apr 2023 16:27:42 +0000 Subject: [PATCH 6/7] - systemd.spec: don't call %systemd_{pre,post} on units shipped by the main package since they don't have any effect during installation (systemctl is not yet installed when %pre script is executed). This is actually the reason why it's handled by the %%posttrans scripts of systemd-presets-common-SUSE. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1376 --- systemd.changes | 8 ++++++++ systemd.spec | 19 ++++++------------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/systemd.changes b/systemd.changes index 7f3a9fae..5490e70d 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Apr 27 16:15:57 UTC 2023 - Franck Bui + +- systemd.spec: don't call %systemd_{pre,post} on units shipped by the main + package since they don't have any effect during installation (systemctl is not + yet installed when %pre script is executed). This is actually the reason why + it's handled by the %%posttrans scripts of systemd-presets-common-SUSE. + ------------------------------------------------------------------- Thu Apr 27 07:58:58 UTC 2023 - Franck Bui diff --git a/systemd.spec b/systemd.spec index ef65a499..29e9f363 100644 --- a/systemd.spec +++ b/systemd.spec @@ -964,13 +964,13 @@ tar -cO \ # Don't drop %%pre section even if it becomes empty: the build process of # installation images uses a hardcoded list of packages with a %%pre that needs # to be run during the build and complains if it can't find one. +# +# Note: presets for units shipped by the main package are applied by %%posttrans +# scripts of systemd-presets-common-SUSE. Hence we don't need to bother running +# %%systemd_{pre,post} on them, which is fortunate since the helper script the +# systemd rpm macros rely on is not yet installed. %pre -# Units listed below can be enabled at installation according to their preset -# setting. -%systemd_pre remote-fs.target -%systemd_pre getty@.service -%systemd_pre systemd-timesyncd.service -%systemd_pre systemd-journald-audit.socket +: %post # Make /etc/machine-id an empty file during package installation. On the first @@ -1025,13 +1025,6 @@ fi %journal_catalog_update %tmpfiles_create -# Units listed below can be enabled at installation accoding to their preset -# setting. -%systemd_post remote-fs.target -%systemd_post getty@.service -%systemd_post systemd-timesyncd.service -%systemd_post systemd-journald-audit.socket - # v228 wrongly set world writable suid root permissions on timestamp files used # by permanent timers. Fix the timestamps that might have been created by the # affected versions of systemd (bsc#1020601). From 5df529a77e243de1becdc142f372b1857ab2ef2ffb57d8c896d4dca038c1c6e1 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 28 Apr 2023 10:44:50 +0000 Subject: [PATCH 7/7] - Re-add back 'arabic' keymap mapping as YaST needs more time than expected to cope with this change. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1377 --- kbd-model-map.legacy | 1 + systemd.changes | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/kbd-model-map.legacy b/kbd-model-map.legacy index 5c27c48c..a3b6d9d7 100644 --- a/kbd-model-map.legacy +++ b/kbd-model-map.legacy @@ -2,6 +2,7 @@ # console layout, they are symlinks to 'us', but they are needed as YaST uses # the console layout as a primary key for picking the X11 layout +arabic ara,us pc105 - terminate:ctrl_alt_bksp,grp:shift_toggle ara ara,us pc105 - terminate:ctrl_alt_bksp,grp:shift_toggle ir ir pc105 - terminate:ctrl_alt_bksp diff --git a/systemd.changes b/systemd.changes index 5490e70d..6fd273e3 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Apr 28 10:43:02 UTC 2023 - Franck Bui + +- Re-add back 'arabic' keymap mapping as YaST needs more time than expected to + cope with this change. + ------------------------------------------------------------------- Thu Apr 27 16:15:57 UTC 2023 - Franck Bui