rpm/systemd
SHA256
1
0
Fork 0
forked from pool/systemd
Code Pull Requests Activity

Accepting request 350196 from home:jengelh:d5

Browse Source 
- 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
This commit is contained in:
Dominique Leuenberger 2015-12-22 13:43:00 +00:00 committed by Git OBS Bridge
parent 3cb8f4cfc8
commit e2b94ded3c
4 changed files with 36 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
systemd-mini.changes
View File

@ -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) - 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 Mon Nov 30 13:59:52 UTC 2015 - thomas.blume@suse.com

19
systemd-mini.spec
View File

@ -891,8 +891,10 @@ done
# add entries for xkeyboard-config converted keymaps; mappings, # add entries for xkeyboard-config converted keymaps; mappings,
# which already exist in original systemd mapping table are being # which already exist in original systemd mapping table are being
# ignored though, i.e. not overwritten # ignored though, i.e. not overwritten
cat /usr/share/systemd/kbd-model-map.xkb-generated \ if [ -f /usr/share/systemd/kbd-model-map.xkb-generated ]; then
>> %{buildroot}//usr/share/systemd/kbd-model-map cat /usr/share/systemd/kbd-model-map.xkb-generated \
>>"%buildroot/usr/share/systemd/kbd-model-map"
fi
%find_lang systemd %find_lang systemd
@ -948,12 +950,13 @@ fi
# Create default config in /etc at first install. # Create default config in /etc at first install.
# Later package updates should not overwrite these settings. # Later package updates should not overwrite these settings.
if [ "$1" -eq 1 ]; then if [ "$1" -eq 1 ]; then
# Enable these services by default. # Enable these services by default.
/usr/bin/systemctl enable \ # Specifying multiple units can cause the entire operation to not
getty@tty1.service \ # execute if one of them is missing, so run systemctl with one unit
systemd-readahead-collect.service \ # at a time only.
systemd-readahead-replay.service \ for i in getty@tty1.service remote-fs.target; do
remote-fs.target || : /usr/bin/systemctl enable "$i" || :
done
fi fi
# since v207 /etc/sysctl.conf is no longer parsed, however # since v207 /etc/sysctl.conf is no longer parsed, however

7
systemd.changes
View File

@ -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) - 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 Mon Nov 30 13:59:52 UTC 2015 - thomas.blume@suse.com

19
systemd.spec
View File

@ -886,8 +886,10 @@ done
# add entries for xkeyboard-config converted keymaps; mappings, # add entries for xkeyboard-config converted keymaps; mappings,
# which already exist in original systemd mapping table are being # which already exist in original systemd mapping table are being
# ignored though, i.e. not overwritten # ignored though, i.e. not overwritten
cat /usr/share/systemd/kbd-model-map.xkb-generated \ if [ -f /usr/share/systemd/kbd-model-map.xkb-generated ]; then
>> %{buildroot}//usr/share/systemd/kbd-model-map cat /usr/share/systemd/kbd-model-map.xkb-generated \
>>"%buildroot/usr/share/systemd/kbd-model-map"
fi
%find_lang systemd %find_lang systemd
@ -943,12 +945,13 @@ fi
# Create default config in /etc at first install. # Create default config in /etc at first install.
# Later package updates should not overwrite these settings. # Later package updates should not overwrite these settings.
if [ "$1" -eq 1 ]; then if [ "$1" -eq 1 ]; then
# Enable these services by default. # Enable these services by default.
/usr/bin/systemctl enable \ # Specifying multiple units can cause the entire operation to not
getty@tty1.service \ # execute if one of them is missing, so run systemctl with one unit
systemd-readahead-collect.service \ # at a time only.
systemd-readahead-replay.service \ for i in getty@tty1.service remote-fs.target; do
remote-fs.target || : /usr/bin/systemctl enable "$i" || :
done
fi fi
# since v207 /etc/sysctl.conf is no longer parsed, however # since v207 /etc/sysctl.conf is no longer parsed, however