SHA256
1
0
forked from pool/systemd

Accepting request 846415 from home:fbui:systemd:openSUSE-Factory

- Import commit fdce77ce2067f9dd90d816bad28b51efed0b6dc1
  05fff5bd02 generator: use kmsg in system-level generators, journal otherwise
  ecc07954de log: normalize log target condition check
  d32ceea42b log: update comment
  2ebad02b60 basic/virt: Detect PowerVM hypervisor (bsc#1176800)

- Simplify systemd-sysv-convert
  - the previous code incorrectly assumed that the sysv init scripts
    were uninstalled before %post get executed. It therefore save the
    enablement state in %pre and restore it in %post. Now all is done
    in %post (making --save option useless) and there's no more need
    to remember the enablement state.
  - "--save" option is a NOP but is still kept for backward
    compatibility.
  - the previous simplifcation made /var/lib/systemd/migrated no more
    used.
  - we do not search for units in /lib/systemd anymore, this shouldn't
    be needed anymore these days especially since this path was only
    used when systemd was introduced in openSUSE and it was never used
    in SLE (checked SLE12-GA).
  - the option --show has been dropped. It's never been used even
    internally.
  - the DB is populated only once even if the script was enabled at
    multiple runlevels. The runlevel info was never used. A dummy
    value is still added to keep the same format just in case.

- No more need to clean the journal-upload stuff with --without=journal_remote
  Since -Dremote build option has been introduced with meson, this
  workaround is no more needed.

OBS-URL: https://build.opensuse.org/request/show/846415
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1124
This commit is contained in:
Franck Bui 2020-11-06 09:15:20 +00:00 committed by Git OBS Bridge
parent bfd5f42ae9
commit 2d11a6b026
6 changed files with 268 additions and 173 deletions

View File

@ -1,3 +1,68 @@
-------------------------------------------------------------------
Fri Nov 6 08:34:18 UTC 2020 - Franck Bui <fbui@suse.com>
- Import commit fdce77ce2067f9dd90d816bad28b51efed0b6dc1
05fff5bd02 generator: use kmsg in system-level generators, journal otherwise
ecc07954de log: normalize log target condition check
d32ceea42b log: update comment
2ebad02b60 basic/virt: Detect PowerVM hypervisor (bsc#1176800)
-------------------------------------------------------------------
Mon Nov 2 15:17:20 UTC 2020 - Franck Bui <fbui@suse.com>
- Simplify systemd-sysv-convert
- the previous code incorrectly assumed that the sysv init scripts
were uninstalled before %post get executed. It therefore save the
enablement state in %pre and restore it in %post. Now all is done
in %post (making --save option useless) and there's no more need
to remember the enablement state.
- "--save" option is a NOP but is still kept for backward
compatibility.
- the previous simplifcation made /var/lib/systemd/migrated no more
used.
- we do not search for units in /lib/systemd anymore, this shouldn't
be needed anymore these days especially since this path was only
used when systemd was introduced in openSUSE and it was never used
in SLE (checked SLE12-GA).
- the option --show has been dropped. It's never been used even
internally.
- the DB is populated only once even if the script was enabled at
multiple runlevels. The runlevel info was never used. A dummy
value is still added to keep the same format just in case.
-------------------------------------------------------------------
Wed Oct 21 09:52:38 UTC 2020 - Franck Bui <fbui@suse.com>
- No more need to clean the journal-upload stuff with --without=journal_remote
Since -Dremote build option has been introduced with meson, this
workaround is no more needed.
-------------------------------------------------------------------
Mon Oct 19 19:53:48 UTC 2020 - Franck Bui <fbui@suse.com>
- Move journal-{remote,upload}.conf.5.gz man pages into systemd-journal_remote sub package
-------------------------------------------------------------------
Mon Oct 19 18:50:38 UTC 2020 - Franck Bui <fbui@suse.com>
- Explicitly list files in /usr/lib/sysusers.d shipped by the main package
Currently only one config file is shipped in this directory and we
want to check any new files that may be added in the future.
-------------------------------------------------------------------
Mon Oct 19 17:29:38 UTC 2020 - Franck Bui <fbui@suse.com>
- Use %{_modulesloaddir}, %{_environmentdir} and %{_modprobedir} wherever appropriate
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Oct 13 09:29:40 UTC 2020 - Franck Bui <fbui@suse.com> Tue Oct 13 09:29:40 UTC 2020 - Franck Bui <fbui@suse.com>
@ -8,7 +73,7 @@ Tue Oct 13 09:29:40 UTC 2020 - Franck Bui <fbui@suse.com>
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Oct 13 08:50:13 UTC 2020 - Franck Bui <fbui@suse.com> Tue Oct 13 08:50:13 UTC 2020 - Franck Bui <fbui@suse.com>
- Rely on systemd-default-settings for overriding system default settings - Rely on systemd-default-settings for overriding system default settings (bsc#1172517)
The new branding packages now ships the drop-ins to customize The new branding packages now ships the drop-ins to customize
systemd either for an openSUSE or a SLE ditro. systemd either for an openSUSE or a SLE ditro.
@ -496,6 +561,7 @@ Thu Dec 5 14:00:03 UTC 2019 - Franck Bui <fbui@suse.com>
- upstream commit 27c3112dcbd1b5f171c36c32550d9c6331375b0b (bsc#1155574) - upstream commit 27c3112dcbd1b5f171c36c32550d9c6331375b0b (bsc#1155574)
- upstream commit 21b40f16622f171a9969dc334d74fb5eb2f575c2 (bsc#1159814) - upstream commit 21b40f16622f171a9969dc334d74fb5eb2f575c2 (bsc#1159814)
- upstream commit 9b88bb5023dfa3cea406c14fdaa3d8e3e320907a (jsc#SLE-7689) - upstream commit 9b88bb5023dfa3cea406c14fdaa3d8e3e320907a (jsc#SLE-7689)
- upstream commit bc9ecd484f1ebfe0de8b567c90f6cd867fbd5894 (bsc#1141597)
Legacy and obsolete symlinks have been finally dropped. Legacy and obsolete symlinks have been finally dropped.
@ -744,6 +810,7 @@ Tue Sep 3 15:10:10 UTC 2019 - Franck Bui <fbui@suse.com>
- upstream commit 83cb24ac20baf19f7834931dcf6e03486b4c9c30 (bsc#1156213) - upstream commit 83cb24ac20baf19f7834931dcf6e03486b4c9c30 (bsc#1156213)
- upstream commit a2dcb1d78737d3daa301ee63fbdd02837acb71a8 (bsc#1158485) - upstream commit a2dcb1d78737d3daa301ee63fbdd02837acb71a8 (bsc#1158485)
- upstream commit 08185cff19efcb1d7d9fb7b546e7f516ab6dae91 (bsc#1165011) - upstream commit 08185cff19efcb1d7d9fb7b546e7f516ab6dae91 (bsc#1165011)
- upstream commit 59c55e73eaee345e1ee67c23eace8895ed499693 (bsc#1177510)
Drop 0001-Revert-insserv.conf-generator.patch as it's been dropped Drop 0001-Revert-insserv.conf-generator.patch as it's been dropped
from branch SUSE/v243 while we were rebasing. from branch SUSE/v243 while we were rebasing.

View File

@ -26,7 +26,7 @@
##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! #####
%define mini -mini %define mini -mini
%define min_kernel_version 4.5 %define min_kernel_version 4.5
%define suse_version +suse.27.gd7b5ac76dc %define suse_version +suse.32.gfdce77ce20
%bcond_with gnuefi %bcond_with gnuefi
%if 0%{?bootstrap} %if 0%{?bootstrap}
@ -657,14 +657,6 @@ rm -f %{buildroot}%{_sysusersdir}/basic.conf
# in this directory... oh well. # in this directory... oh well.
rm -f %{buildroot}/etc/init.d/README rm -f %{buildroot}/etc/init.d/README
# journal-upload is built if libcurl is installed which can happen
# when importd is enabled (whereas journal_remote is not).
%if ! %{with journal_remote}
rm -f %{buildroot}%{_sysconfdir}/systemd/journal-upload.conf
rm -f %{buildroot}%{_prefix}/lib/systemd/systemd-journal-upload
rm -f %{buildroot}%{_unitdir}/systemd-journal-upload.*
%endif
# Create the /var/log/journal directory to change the volatile journal # Create the /var/log/journal directory to change the volatile journal
# to a persistent one # to a persistent one
mkdir -p %{buildroot}%{_localstatedir}/log/journal/ mkdir -p %{buildroot}%{_localstatedir}/log/journal/
@ -1187,18 +1179,16 @@ fi
%endif %endif
%dir %{_sysconfdir}/modules-load.d %dir %{_sysconfdir}/modules-load.d
%{_prefix}/lib/modules-load.d %{_modulesloaddir}
%dir %{_sysusersdir}
%{_sysusersdir}/systemd.conf
%{_sysusersdir}/
%dir %{_sysconfdir}/tmpfiles.d %dir %{_sysconfdir}/tmpfiles.d
%{_tmpfilesdir}/ %{_tmpfilesdir}/
%exclude %{_tmpfilesdir}/systemd-nspawn.conf %exclude %{_tmpfilesdir}/systemd-nspawn.conf
%if %{with journal_remote} %{_environmentdir}/
%exclude %{_sysusersdir}/systemd-remote.conf
%endif
%{_prefix}/lib/environment.d/
%dir %{_binfmtdir} %dir %{_binfmtdir}
%dir %{_sysconfdir}/binfmt.d %dir %{_sysconfdir}/binfmt.d
@ -1241,8 +1231,8 @@ fi
%{_datadir}/dbus-1/system.d/org.freedesktop.timesync1.conf %{_datadir}/dbus-1/system.d/org.freedesktop.timesync1.conf
# FIXME: why do we have to own this dir ? # FIXME: why do we have to own this dir ?
%dir %{_prefix}/lib/modprobe.d %dir %{_modprobedir}
%{_prefix}/lib/modprobe.d/systemd.conf %{_modprobedir}/systemd.conf
# Some files created at runtime. # Some files created at runtime.
%ghost %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf %ghost %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf
@ -1300,6 +1290,10 @@ fi
%if %{with importd} %if %{with importd}
%exclude %{_mandir}/man*/systemd-importd* %exclude %{_mandir}/man*/systemd-importd*
%endif %endif
%if %{with journal_remote}
%exclude %{_mandir}/man5/journal-remote.conf*
%exclude %{_mandir}/man5/journal-upload.conf*
%endif
%if %{with portabled} %if %{with portabled}
%exclude %{_mandir}/man*/portablectl* %exclude %{_mandir}/man*/portablectl*
%exclude %{_mandir}/man*/systemd-portabled* %exclude %{_mandir}/man*/systemd-portabled*
@ -1551,6 +1545,8 @@ fi
%{_prefix}/lib/systemd/systemd-journal-remote %{_prefix}/lib/systemd/systemd-journal-remote
%{_prefix}/lib/systemd/systemd-journal-upload %{_prefix}/lib/systemd/systemd-journal-upload
%{_sysusersdir}/systemd-remote.conf %{_sysusersdir}/systemd-remote.conf
%{_mandir}/man5/journal-remote.conf*
%{_mandir}/man5/journal-upload.conf*
%{_mandir}/man8/systemd-journal-gatewayd.* %{_mandir}/man8/systemd-journal-gatewayd.*
%{_mandir}/man8/systemd-journal-remote.* %{_mandir}/man8/systemd-journal-remote.*
%{_mandir}/man8/systemd-journal-upload.* %{_mandir}/man8/systemd-journal-upload.*

View File

@ -1,146 +1,112 @@
#!/bin/bash #!/bin/bash
info() {
echo "$(basename $0): $*"
}
warn() {
echo >&2 "$(basename $0): warning, $*"
}
usage() {
echo >&2 "usage: $(basename $0) --apply <service> [<service> ...]"
}
if [ "$UID" != "0" ]; then if [ "$UID" != "0" ]; then
echo Need to be root. warn "need to be root, aborting"
exit 1 exit 1
fi fi
declare -A results_target if [ $# -lt 2 ]; then
usage() {
cat << EOF
usage: systemd-sysv-convert [-h] [--save] [--show] [--apply]
SERVICE [SERVICE ...]
EOF
}
help() {
usage usage
cat << EOF exit 1
Save and Restore SysV Service Runlevel Information fi
positional arguments: database_lookup() {
SERVICE Service names local service unused
optional arguments: # 'priority' field is not used but is kept for backward compat reason.
-h, --help show this help message and exit while read service unused; do
--save Save SysV runlevel information for one or more services if [ $service == $1 ]; then
--show Show saved SysV runlevel information for one or more services return 0
--apply Apply saved SysV runlevel information for one or more services
to systemd counterparts
EOF
}
find_service() {
local service=$1
local rcnd=$2
case $rcnd in
boot.d) [ -L /etc/rc.d/$rcnd/S??boot.$service ] ;;
*) [ -L /etc/rc.d/$rcnd/S??$service ]
esac
}
lookup_database() {
local services=$@
local service
local runlevel
local priority
# 'priority' field is not used but is kept for backward compat
# reason.
while read service runlevel priority; do
for s in $services ; do
if [ $s == $service ]; then
results_target[$service]+=" runlevel$runlevel.target"
break
fi fi
done
done </var/lib/systemd/sysv-convert/database done </var/lib/systemd/sysv-convert/database
return 1
} }
declare -i fail=0 database_add() {
case "$1" in
-h|--help)
help
exit 0
;;
--save)
shift
for service in $@ ; do
if [ ! -r /etc/init.d/$service ] && [ ! -r /etc/init.d/boot.$service ]; then
echo "SysV service $service does not exist, skipping"
continue
fi
for rcnd in rc2.d rc3.d rc4.d rc5.d boot.d; do
case $rcnd in
rc*.d) runlevel=${rcnd:2:1} ;;
boot.d) runlevel=3 ;;
esac
# Write a dumb priority as it is not used. # Write a dumb priority as it is not used.
find_service $service $rcnd && echo "$1 $2 50" >>/var/lib/systemd/sysv-convert/database
echo "$service $runlevel 50" >>/var/lib/systemd/sysv-convert/database }
done
done # Initialize the database.
;; if [ ! -e /var/lib/systemd/sysv-convert/database ]; then
--show) touch /var/lib/systemd/sysv-convert/database
shift
services=$@
lookup_database $services
for service in $services; do
if [ -z "${results_target[$service]}" ]; then
echo "No information about service $service found." >/dev/stderr
let fail++
continue
fi fi
for target in ${results_target[$service]}; do
echo "SysV service '$service' is pulled by $target" case "$1" in
done --save)
done # --save is kept for backward compatibility.
;; ;;
--apply) --apply)
shift shift
services=$@ for service in $@; do
for service in $services; do # For backward compat we accept the name of the
if [ ! -f "/lib/systemd/system/$service.service" -a ! -f "/usr/lib/systemd/system/$service.service" ]; then # service with or without the unit type suffix. If the
echo systemd service $service.service does not exist. >/dev/stderr # suffix is not there, assume .service type.
exit 1 case "$service" in
*.*) initscript="${service%.*}" ;;
*) initscript="$service"
service="$service.service"
esac
# Did we already migrate this service during a previous update ?
database_lookup $initscript &&
continue
# Sanity check.
unit="/usr/lib/systemd/system/$service"
if [ ! -f "$unit" ]; then
warn "$unit not found, skipping"
continue
fi fi
done
# # Mark the service as processed to make sure we will do the migration only
# The database might no have been created by a previous --save # once. This is important especially for packages that keep their init
# call. This can happen when: # scripts around even if they're no more used. Since the saved info won't
# # be reused again we simply use an invalid runlevel and add the service
# - we're upgrading a package which initially didn't # in the db only once.
# have any unit file nor sysv init script and now database_add $initscript -1
# start shipping one or more unit files (bsc#982303).
# # The package is introducing new services and never has any sysv init
# - the sysv init service wasn't enabled at all before # scripts (bsc#982303).
# being migrated to a native unit file (bsc#982211). if [ ! -r /etc/init.d/$initscript ] &&
# [ ! -r /etc/init.d/boot.$initscript ]; then
if [ -e /var/lib/systemd/sysv-convert/database ]; then continue
lookup_database $services fi
for service in $services; do
[ -f "/lib/systemd/system/$service.service" ] && unit="/lib/systemd/system/$service.service" for rcnd in rc2.d rc3.d rc4.d rc5.d boot.d; do
[ -f "/usr/lib/systemd/system/$service.service" ] && unit="/usr/lib/systemd/system/$service.service" # Was the sysvinit script enabled ? (bsc#982211)
case $rcnd in
boot.d) [ -L /etc/rc.d/boot.d/S??boot.$initscript ] || continue ;;
*) [ -L /etc/rc.d/$rcnd/S??$initscript ] || continue
esac
case $rcnd in
boot.d) runlevel=3 ;;
*) runlevel=${rcnd:2:1}
esac
target=runlevel$runlevel.target
info "enabling $unit (wanted by $target)..."
# If $service is not present in the database,
# then it simply means that the sysv init
# service was not enabled at all.
for target in ${results_target[$service]}; do
echo ln -sf $unit /etc/systemd/system/$target.wants/$service.service >/dev/stderr
mkdir -p "/etc/systemd/system/$target.wants" mkdir -p "/etc/systemd/system/$target.wants"
/bin/ln -sf $unit /etc/systemd/system/$target.wants/$service.service ln -sf $unit /etc/systemd/system/$target.wants/$service
done done
done done
fi
;; ;;
*) *)
usage usage
let fail=2 exit 1
;;
esac esac
exit $fail

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:004c6f73d42c28b4706a44c3da99e8c8054ed324b4e77422abdcde0a93caa757
size 6552480

View File

@ -1,3 +1,68 @@
-------------------------------------------------------------------
Fri Nov 6 08:34:18 UTC 2020 - Franck Bui <fbui@suse.com>
- Import commit fdce77ce2067f9dd90d816bad28b51efed0b6dc1
05fff5bd02 generator: use kmsg in system-level generators, journal otherwise
ecc07954de log: normalize log target condition check
d32ceea42b log: update comment
2ebad02b60 basic/virt: Detect PowerVM hypervisor (bsc#1176800)
-------------------------------------------------------------------
Mon Nov 2 15:17:20 UTC 2020 - Franck Bui <fbui@suse.com>
- Simplify systemd-sysv-convert
- the previous code incorrectly assumed that the sysv init scripts
were uninstalled before %post get executed. It therefore save the
enablement state in %pre and restore it in %post. Now all is done
in %post (making --save option useless) and there's no more need
to remember the enablement state.
- "--save" option is a NOP but is still kept for backward
compatibility.
- the previous simplifcation made /var/lib/systemd/migrated no more
used.
- we do not search for units in /lib/systemd anymore, this shouldn't
be needed anymore these days especially since this path was only
used when systemd was introduced in openSUSE and it was never used
in SLE (checked SLE12-GA).
- the option --show has been dropped. It's never been used even
internally.
- the DB is populated only once even if the script was enabled at
multiple runlevels. The runlevel info was never used. A dummy
value is still added to keep the same format just in case.
-------------------------------------------------------------------
Wed Oct 21 09:52:38 UTC 2020 - Franck Bui <fbui@suse.com>
- No more need to clean the journal-upload stuff with --without=journal_remote
Since -Dremote build option has been introduced with meson, this
workaround is no more needed.
-------------------------------------------------------------------
Mon Oct 19 19:53:48 UTC 2020 - Franck Bui <fbui@suse.com>
- Move journal-{remote,upload}.conf.5.gz man pages into systemd-journal_remote sub package
-------------------------------------------------------------------
Mon Oct 19 18:50:38 UTC 2020 - Franck Bui <fbui@suse.com>
- Explicitly list files in /usr/lib/sysusers.d shipped by the main package
Currently only one config file is shipped in this directory and we
want to check any new files that may be added in the future.
-------------------------------------------------------------------
Mon Oct 19 17:29:38 UTC 2020 - Franck Bui <fbui@suse.com>
- Use %{_modulesloaddir}, %{_environmentdir} and %{_modprobedir} wherever appropriate
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Oct 13 09:29:40 UTC 2020 - Franck Bui <fbui@suse.com> Tue Oct 13 09:29:40 UTC 2020 - Franck Bui <fbui@suse.com>
@ -8,7 +73,7 @@ Tue Oct 13 09:29:40 UTC 2020 - Franck Bui <fbui@suse.com>
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Oct 13 08:50:13 UTC 2020 - Franck Bui <fbui@suse.com> Tue Oct 13 08:50:13 UTC 2020 - Franck Bui <fbui@suse.com>
- Rely on systemd-default-settings for overriding system default settings - Rely on systemd-default-settings for overriding system default settings (bsc#1172517)
The new branding packages now ships the drop-ins to customize The new branding packages now ships the drop-ins to customize
systemd either for an openSUSE or a SLE ditro. systemd either for an openSUSE or a SLE ditro.
@ -496,6 +561,7 @@ Thu Dec 5 14:00:03 UTC 2019 - Franck Bui <fbui@suse.com>
- upstream commit 27c3112dcbd1b5f171c36c32550d9c6331375b0b (bsc#1155574) - upstream commit 27c3112dcbd1b5f171c36c32550d9c6331375b0b (bsc#1155574)
- upstream commit 21b40f16622f171a9969dc334d74fb5eb2f575c2 (bsc#1159814) - upstream commit 21b40f16622f171a9969dc334d74fb5eb2f575c2 (bsc#1159814)
- upstream commit 9b88bb5023dfa3cea406c14fdaa3d8e3e320907a (jsc#SLE-7689) - upstream commit 9b88bb5023dfa3cea406c14fdaa3d8e3e320907a (jsc#SLE-7689)
- upstream commit bc9ecd484f1ebfe0de8b567c90f6cd867fbd5894 (bsc#1141597)
Legacy and obsolete symlinks have been finally dropped. Legacy and obsolete symlinks have been finally dropped.
@ -744,6 +810,7 @@ Tue Sep 3 15:10:10 UTC 2019 - Franck Bui <fbui@suse.com>
- upstream commit 83cb24ac20baf19f7834931dcf6e03486b4c9c30 (bsc#1156213) - upstream commit 83cb24ac20baf19f7834931dcf6e03486b4c9c30 (bsc#1156213)
- upstream commit a2dcb1d78737d3daa301ee63fbdd02837acb71a8 (bsc#1158485) - upstream commit a2dcb1d78737d3daa301ee63fbdd02837acb71a8 (bsc#1158485)
- upstream commit 08185cff19efcb1d7d9fb7b546e7f516ab6dae91 (bsc#1165011) - upstream commit 08185cff19efcb1d7d9fb7b546e7f516ab6dae91 (bsc#1165011)
- upstream commit 59c55e73eaee345e1ee67c23eace8895ed499693 (bsc#1177510)
Drop 0001-Revert-insserv.conf-generator.patch as it's been dropped Drop 0001-Revert-insserv.conf-generator.patch as it's been dropped
from branch SUSE/v243 while we were rebasing. from branch SUSE/v243 while we were rebasing.

View File

@ -24,7 +24,7 @@
%define bootstrap 0 %define bootstrap 0
%define mini %nil %define mini %nil
%define min_kernel_version 4.5 %define min_kernel_version 4.5
%define suse_version +suse.27.gd7b5ac76dc %define suse_version +suse.32.gfdce77ce20
%bcond_with gnuefi %bcond_with gnuefi
%if 0%{?bootstrap} %if 0%{?bootstrap}
@ -655,14 +655,6 @@ rm -f %{buildroot}%{_sysusersdir}/basic.conf
# in this directory... oh well. # in this directory... oh well.
rm -f %{buildroot}/etc/init.d/README rm -f %{buildroot}/etc/init.d/README
# journal-upload is built if libcurl is installed which can happen
# when importd is enabled (whereas journal_remote is not).
%if ! %{with journal_remote}
rm -f %{buildroot}%{_sysconfdir}/systemd/journal-upload.conf
rm -f %{buildroot}%{_prefix}/lib/systemd/systemd-journal-upload
rm -f %{buildroot}%{_unitdir}/systemd-journal-upload.*
%endif
# Create the /var/log/journal directory to change the volatile journal # Create the /var/log/journal directory to change the volatile journal
# to a persistent one # to a persistent one
mkdir -p %{buildroot}%{_localstatedir}/log/journal/ mkdir -p %{buildroot}%{_localstatedir}/log/journal/
@ -1185,18 +1177,16 @@ fi
%endif %endif
%dir %{_sysconfdir}/modules-load.d %dir %{_sysconfdir}/modules-load.d
%{_prefix}/lib/modules-load.d %{_modulesloaddir}
%dir %{_sysusersdir}
%{_sysusersdir}/systemd.conf
%{_sysusersdir}/
%dir %{_sysconfdir}/tmpfiles.d %dir %{_sysconfdir}/tmpfiles.d
%{_tmpfilesdir}/ %{_tmpfilesdir}/
%exclude %{_tmpfilesdir}/systemd-nspawn.conf %exclude %{_tmpfilesdir}/systemd-nspawn.conf
%if %{with journal_remote} %{_environmentdir}/
%exclude %{_sysusersdir}/systemd-remote.conf
%endif
%{_prefix}/lib/environment.d/
%dir %{_binfmtdir} %dir %{_binfmtdir}
%dir %{_sysconfdir}/binfmt.d %dir %{_sysconfdir}/binfmt.d
@ -1239,8 +1229,8 @@ fi
%{_datadir}/dbus-1/system.d/org.freedesktop.timesync1.conf %{_datadir}/dbus-1/system.d/org.freedesktop.timesync1.conf
# FIXME: why do we have to own this dir ? # FIXME: why do we have to own this dir ?
%dir %{_prefix}/lib/modprobe.d %dir %{_modprobedir}
%{_prefix}/lib/modprobe.d/systemd.conf %{_modprobedir}/systemd.conf
# Some files created at runtime. # Some files created at runtime.
%ghost %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf %ghost %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf
@ -1298,6 +1288,10 @@ fi
%if %{with importd} %if %{with importd}
%exclude %{_mandir}/man*/systemd-importd* %exclude %{_mandir}/man*/systemd-importd*
%endif %endif
%if %{with journal_remote}
%exclude %{_mandir}/man5/journal-remote.conf*
%exclude %{_mandir}/man5/journal-upload.conf*
%endif
%if %{with portabled} %if %{with portabled}
%exclude %{_mandir}/man*/portablectl* %exclude %{_mandir}/man*/portablectl*
%exclude %{_mandir}/man*/systemd-portabled* %exclude %{_mandir}/man*/systemd-portabled*
@ -1549,6 +1543,8 @@ fi
%{_prefix}/lib/systemd/systemd-journal-remote %{_prefix}/lib/systemd/systemd-journal-remote
%{_prefix}/lib/systemd/systemd-journal-upload %{_prefix}/lib/systemd/systemd-journal-upload
%{_sysusersdir}/systemd-remote.conf %{_sysusersdir}/systemd-remote.conf
%{_mandir}/man5/journal-remote.conf*
%{_mandir}/man5/journal-upload.conf*
%{_mandir}/man8/systemd-journal-gatewayd.* %{_mandir}/man8/systemd-journal-gatewayd.*
%{_mandir}/man8/systemd-journal-remote.* %{_mandir}/man8/systemd-journal-remote.*
%{_mandir}/man8/systemd-journal-upload.* %{_mandir}/man8/systemd-journal-upload.*