diff --git a/kbd-model-map.legacy b/kbd-model-map.legacy index 5ddbd8d6..a3b6d9d7 100644 --- a/kbd-model-map.legacy +++ b/kbd-model-map.legacy @@ -1,11 +1,13 @@ -# Additional layouts offered by YaST -Pl02 pl pc105 - terminate:ctrl_alt_bksp +# 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 -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 +ara ara,us pc105 - terminate:ctrl_alt_bksp,grp:shift_toggle 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 + +# 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 diff --git a/systemd.changes b/systemd.changes index 7fd9db14..6fd273e3 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,40 @@ +------------------------------------------------------------------- +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 + +- 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 + +- kbd-model-map.legacy: 'arabic' vc keymap has been renamed 'ara' (bsc#1210702) + +------------------------------------------------------------------- +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 + +- 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 + +- 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/systemd.spec b/systemd.spec index e74fb0a3..29e9f363 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}" \ @@ -963,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 @@ -1024,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). 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 -