From e2b94ded3cce571629728ee2dd28732abfbb74241ec5e6a38e06a1a4e554846b Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 22 Dec 2015 13:43:00 +0000 Subject: [PATCH] Accepting request 350196 from home:jengelh:d5 - Avoid enabling readahead services; they have been removed. [fixes getty-tty1 not appearing in openqa] - In %install, only process kbd-model-map.xkb-generated if it exists. Resolves a build failure in 13.2/42.1. OBS-URL: https://build.opensuse.org/request/show/350196 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=923 --- systemd-mini.changes | 7 +++++++ systemd-mini.spec | 19 +++++++++++-------- systemd.changes | 7 +++++++ systemd.spec | 19 +++++++++++-------- 4 files changed, 36 insertions(+), 16 deletions(-) diff --git a/systemd-mini.changes b/systemd-mini.changes index c8c21bf6..a7adef16 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -3,6 +3,13 @@ Mon Dec 21 16:25:44 UTC 2015 - fbui@suse.com - Make sure we don't use tmpfs on /tmp by default (bsc#940522) +------------------------------------------------------------------- +Mon Dec 21 10:07:38 UTC 2015 - jengelh@inai.de + +- Avoid enabling readahead services; they have been removed. +- In %install, only process kbd-model-map.xkb-generated if it + exists. Resolves a build failure in 13.2/42.1. + ------------------------------------------------------------------- Mon Nov 30 13:59:52 UTC 2015 - thomas.blume@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index 723c88fe..28262652 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -891,8 +891,10 @@ done # add entries for xkeyboard-config converted keymaps; mappings, # which already exist in original systemd mapping table are being # ignored though, i.e. not overwritten -cat /usr/share/systemd/kbd-model-map.xkb-generated \ - >> %{buildroot}//usr/share/systemd/kbd-model-map +if [ -f /usr/share/systemd/kbd-model-map.xkb-generated ]; then + cat /usr/share/systemd/kbd-model-map.xkb-generated \ + >>"%buildroot/usr/share/systemd/kbd-model-map" +fi %find_lang systemd @@ -948,12 +950,13 @@ fi # Create default config in /etc at first install. # Later package updates should not overwrite these settings. if [ "$1" -eq 1 ]; then - # Enable these services by default. - /usr/bin/systemctl enable \ - getty@tty1.service \ - systemd-readahead-collect.service \ - systemd-readahead-replay.service \ - remote-fs.target || : + # Enable these services by default. + # Specifying multiple units can cause the entire operation to not + # execute if one of them is missing, so run systemctl with one unit + # at a time only. + for i in getty@tty1.service remote-fs.target; do + /usr/bin/systemctl enable "$i" || : + done fi # since v207 /etc/sysctl.conf is no longer parsed, however diff --git a/systemd.changes b/systemd.changes index c8c21bf6..a7adef16 100644 --- a/systemd.changes +++ b/systemd.changes @@ -3,6 +3,13 @@ Mon Dec 21 16:25:44 UTC 2015 - fbui@suse.com - Make sure we don't use tmpfs on /tmp by default (bsc#940522) +------------------------------------------------------------------- +Mon Dec 21 10:07:38 UTC 2015 - jengelh@inai.de + +- Avoid enabling readahead services; they have been removed. +- In %install, only process kbd-model-map.xkb-generated if it + exists. Resolves a build failure in 13.2/42.1. + ------------------------------------------------------------------- Mon Nov 30 13:59:52 UTC 2015 - thomas.blume@suse.com diff --git a/systemd.spec b/systemd.spec index 45a74271..e3224592 100644 --- a/systemd.spec +++ b/systemd.spec @@ -886,8 +886,10 @@ done # add entries for xkeyboard-config converted keymaps; mappings, # which already exist in original systemd mapping table are being # ignored though, i.e. not overwritten -cat /usr/share/systemd/kbd-model-map.xkb-generated \ - >> %{buildroot}//usr/share/systemd/kbd-model-map +if [ -f /usr/share/systemd/kbd-model-map.xkb-generated ]; then + cat /usr/share/systemd/kbd-model-map.xkb-generated \ + >>"%buildroot/usr/share/systemd/kbd-model-map" +fi %find_lang systemd @@ -943,12 +945,13 @@ fi # Create default config in /etc at first install. # Later package updates should not overwrite these settings. if [ "$1" -eq 1 ]; then - # Enable these services by default. - /usr/bin/systemctl enable \ - getty@tty1.service \ - systemd-readahead-collect.service \ - systemd-readahead-replay.service \ - remote-fs.target || : + # Enable these services by default. + # Specifying multiple units can cause the entire operation to not + # execute if one of them is missing, so run systemctl with one unit + # at a time only. + for i in getty@tty1.service remote-fs.target; do + /usr/bin/systemctl enable "$i" || : + done fi # since v207 /etc/sysctl.conf is no longer parsed, however