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

Accepting request 501636 from home:fbui:systemd:Factory

Browse Source 
- Make sure dracut (if installed) will embed the new compat rule (bsc#982303)
  The new compat rule must be embedded in the initramfs so make sure
  that the installed dracut supports it.

- Upgrade to v233 (commit 330b55d5e28d17f361062dba66426e46fb7d7857)
  - package new systemd-umount binary
  - package new environment generator stuff
  - drop /dev/root symlink support
  - /etc/pam.d/systemd-user is not patched anymore but we ship a
    dedicated file for SUSE now.
  - manage compat symlink generation in a dedicated branch (bsc#1040153)

- Fix systemd-sysv-convert when a package starts shipping service units (bsc#982303)
  The database might be missing when upgrading a package which was
  shipping no sysv init scripts nor unit files (at the time --save was
  called) but the new version start shipping unit files.

- Fix indentation in systemd-sysv-convert
  While at it, strip trailing whitespaces.
  No functional changes.

- Disable group shadow support (bsc#1029516)
  The new configure option will be imported during the next tarball
  update.

OBS-URL: https://build.opensuse.org/request/show/501636
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=977
This commit is contained in:
Franck Bui 2017-06-07 10:48:51 +00:00 committed by Git OBS Bridge
parent 60191fa013
commit 283cee5cbe
8 changed files with 232 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
systemd-232.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:81d3fc89d42d3f3f27d898e94ef8e7d6b5b6bae6deccaffc0a778b30f4b7c570
size 3213256

3
systemd-233.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:68abe8a1ad8d19c64f4e10fdee7b8aceebc7d49fc2bb2711408171bdc841e67a
size 3255548

46
systemd-mini.changes
View File

@ -1,3 +1,49 @@
-------------------------------------------------------------------
Wed Jun 7 08:17:54 UTC 2017 - fbui@suse.com
- Make sure dracut (if installed) will embed the new compat rule (bsc#982303)
The new compat rule must be embedded in the initramfs so make sure
that the installed dracut supports it.
-------------------------------------------------------------------
Wed May 24 11:23:10 UTC 2017 - fbui@suse.com
- Upgrade to v233 (commit 330b55d5e28d17f361062dba66426e46fb7d7857)
- package new systemd-umount binary
- package new environment generator stuff
- drop /dev/root symlink support
- /etc/pam.d/systemd-user is not patched anymore but we ship a
dedicated file for SUSE now.
- manage compat symlink generation in a dedicated branch (bsc#1040153)
-------------------------------------------------------------------
Wed May 17 15:57:19 UTC 2017 - fbui@suse.com
- Fix systemd-sysv-convert when a package starts shipping service units (bsc#982303)
The database might be missing when upgrading a package which was
shipping no sysv init scripts nor unit files (at the time --save was
called) but the new version start shipping unit files.
-------------------------------------------------------------------
Wed May 17 13:14:40 UTC 2017 - fbui@suse.com
- Fix indentation in systemd-sysv-convert
While at it, strip trailing whitespaces.
No functional changes.
-------------------------------------------------------------------
Thu May 11 08:47:48 UTC 2017 - fbui@suse.com
- Disable group shadow support (bsc#1029516)
The new configure option will be imported during the next tarball
update.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 2 16:17:08 UTC 2017 - fbui@suse.com Tue May 2 16:17:08 UTC 2017 - fbui@suse.com

30
systemd-mini.spec
View File

@ -49,7 +49,7 @@
Name: systemd-mini Name: systemd-mini
Url: http://www.freedesktop.org/wiki/Software/systemd Url: http://www.freedesktop.org/wiki/Software/systemd
Version: 232 Version: 233
Release: 0 Release: 0
Summary: A System and Session Manager Summary: A System and Session Manager
License: LGPL-2.1+ License: LGPL-2.1+
@ -142,6 +142,7 @@ Obsoletes: pm-utils <= 1.4.1
Obsoletes: suspend <= 1.0 Obsoletes: suspend <= 1.0
Source0: systemd-%{version}.tar.xz Source0: systemd-%{version}.tar.xz
Source1: %{name}-rpmlintrc Source1: %{name}-rpmlintrc
Source2: systemd-user
Source3: systemd-sysv-convert Source3: systemd-sysv-convert
Source6: baselibs.conf Source6: baselibs.conf
Source7: libgcrypt.m4 Source7: libgcrypt.m4
@ -237,6 +238,7 @@ Conflicts: systemd < 39
Conflicts: aaa_base < 11.5 Conflicts: aaa_base < 11.5
Conflicts: filesystem < 11.5 Conflicts: filesystem < 11.5
Conflicts: mkinitrd < 2.7.0 Conflicts: mkinitrd < 2.7.0
Conflicts: dracut < 044.1
Conflicts: util-linux < 2.16 Conflicts: util-linux < 2.16
Conflicts: ConsoleKit < 0.4.1 Conflicts: ConsoleKit < 0.4.1
Requires: filesystem Requires: filesystem
@ -433,6 +435,7 @@ systemd_cryptsetup_LDFLAGS =\\\
--disable-lto \ --disable-lto \
--disable-tests \ --disable-tests \
--without-kill-user-processes \ --without-kill-user-processes \
--with-default-hierarchy=hybrid \
--with-rc-local-script-path-start=/etc/init.d/boot.local \ --with-rc-local-script-path-start=/etc/init.d/boot.local \
--with-rc-local-script-path-stop=/etc/init.d/halt.local \ --with-rc-local-script-path-stop=/etc/init.d/halt.local \
--with-debug-shell=/bin/bash \ --with-debug-shell=/bin/bash \
@ -441,6 +444,7 @@ systemd_cryptsetup_LDFLAGS =\\\
--disable-adm-group \ --disable-adm-group \
--disable-wheel-group \ --disable-wheel-group \
--disable-ldconfig \ --disable-ldconfig \
--disable-gshadow \
%if %{without networkd} %if %{without networkd}
--disable-networkd \ --disable-networkd \
%endif %endif
@ -497,6 +501,10 @@ ln -s ../usr/bin/systemctl %{buildroot}/sbin/runlevel
rm -rf %{buildroot}/etc/systemd/system/*.target.wants rm -rf %{buildroot}/etc/systemd/system/*.target.wants
rm -f %{buildroot}/etc/systemd/system/default.target rm -f %{buildroot}/etc/systemd/system/default.target
# Overwrite /etc/pam.d/systemd-user shipped by upstream with one
# customized for openSUSE distros.
install -m0644 %{S:2} %{buildroot}%{_sysconfdir}/pam.d/
# We keep a copy of tmp.mount because it may be removed if not used # We keep a copy of tmp.mount because it may be removed if not used
# (see %post): we want to be sure tmpfs won't be used for /tmp by # (see %post): we want to be sure tmpfs won't be used for /tmp by
# default on Suse distros. # default on Suse distros.
@ -756,6 +764,14 @@ elif [ ! -e /lib/udev ]; then
ln -s /usr/lib/udev /lib/udev ln -s /usr/lib/udev /lib/udev
fi fi
# New installations uses the last compat symlink generation number
# (currently at 2), which basically disables all compat symlinks. On
# old systems, the file doesn't exist. This is equivalent to
# generation #1, which enables the creation of all compat symlinks.
if [ $1 -eq 1 ]; then
echo "COMPAT_SYMLINK_GENERATION=2">/usr/lib/udev/compat-symlink-generation
fi
# Create "tape"/"input" group which is referenced by some udev rules # Create "tape"/"input" group which is referenced by some udev rules
# that we're shipping. FIXME: maybe we should consider using # that we're shipping. FIXME: maybe we should consider using
# "sysusers_create basic.conf" instead ? # "sysusers_create basic.conf" instead ?
@ -869,6 +885,7 @@ fi
%{_bindir}/systemd-path %{_bindir}/systemd-path
%{_bindir}/systemd-sysusers %{_bindir}/systemd-sysusers
%{_bindir}/systemd-mount %{_bindir}/systemd-mount
%{_bindir}/systemd-umount
%{_bindir}/systemd-notify %{_bindir}/systemd-notify
%{_bindir}/systemd-run %{_bindir}/systemd-run
%{_bindir}/journalctl %{_bindir}/journalctl
@ -921,7 +938,7 @@ fi
%{_prefix}/lib/systemd/user/*.service %{_prefix}/lib/systemd/user/*.service
%{_prefix}/lib/systemd/systemd-* %{_prefix}/lib/systemd/systemd-*
%{_prefix}/lib/systemd/systemd %{_prefix}/lib/systemd/systemd
%{_prefix}/lib/systemd/libsystemd-shared-%{version}.so %{_prefix}/lib/systemd/libsystemd-shared-*.so
%{_prefix}/lib/systemd/resolv.conf %{_prefix}/lib/systemd/resolv.conf
%{_prefix}/lib/systemd/fix-machines-subvol-for-rollbacks.sh %{_prefix}/lib/systemd/fix-machines-subvol-for-rollbacks.sh
%dir %{_prefix}/lib/systemd/catalog %dir %{_prefix}/lib/systemd/catalog
@ -931,6 +948,7 @@ fi
%{_prefix}/lib/systemd/user-preset %{_prefix}/lib/systemd/user-preset
%{_prefix}/lib/systemd/system-generators %{_prefix}/lib/systemd/system-generators
%{_prefix}/lib/systemd/user-generators %{_prefix}/lib/systemd/user-generators
%{_prefix}/lib/systemd/user-environment-generators
%dir %{_prefix}/lib/systemd/ntp-units.d/ %dir %{_prefix}/lib/systemd/ntp-units.d/
%dir %{_prefix}/lib/systemd/system-shutdown/ %dir %{_prefix}/lib/systemd/system-shutdown/
%dir %{_prefix}/lib/systemd/system-sleep/ %dir %{_prefix}/lib/systemd/system-sleep/
@ -961,6 +979,8 @@ fi
%{_libexecdir}/tmpfiles.d/ %{_libexecdir}/tmpfiles.d/
%exclude %{_libexecdir}/tmpfiles.d/systemd-remote.conf %exclude %{_libexecdir}/tmpfiles.d/systemd-remote.conf
%{_libexecdir}/environment.d/
%dir %{_libexecdir}/binfmt.d %dir %{_libexecdir}/binfmt.d
%dir %{_sysconfdir}/binfmt.d %dir %{_sysconfdir}/binfmt.d
@ -1076,6 +1096,9 @@ fi
%if %{with importd} %if %{with importd}
%{_datadir}/polkit-1/actions/org.freedesktop.import1.policy %{_datadir}/polkit-1/actions/org.freedesktop.import1.policy
%endif %endif
%if %{with networkd}
%{_datadir}/polkit-1/rules.d/systemd-networkd.rules
%endif
%if ! 0%{?bootstrap} %if ! 0%{?bootstrap}
%{_mandir}/man1/[a-rt-z]*ctl.1* %{_mandir}/man1/[a-rt-z]*ctl.1*
@ -1090,6 +1113,7 @@ fi
%{_mandir}/man8/systemd-h[aioy]* %{_mandir}/man8/systemd-h[aioy]*
%{_mandir}/man8/systemd-journald* %{_mandir}/man8/systemd-journald*
%{_mandir}/man8/systemd-u[ps]* %{_mandir}/man8/systemd-u[ps]*
%{_mandir}/man8/30-systemd-environment-d-generator.*
%endif %endif
%{_docdir}/systemd %{_docdir}/systemd
@ -1157,7 +1181,7 @@ fi
%{_prefix}/lib/udev/scsi_id %{_prefix}/lib/udev/scsi_id
%{_prefix}/lib/udev/v4l_id %{_prefix}/lib/udev/v4l_id
%{_prefix}/lib/udev/remount-tmpfs %{_prefix}/lib/udev/remount-tmpfs
%{_prefix}/lib/udev/rootsymlink-generator %ghost %{_prefix}/lib/udev/compat-symlink-generation
%dir %{_prefix}/lib/udev/rules.d/ %dir %{_prefix}/lib/udev/rules.d/
%exclude %{_prefix}/lib/udev/rules.d/70-uaccess.rules %exclude %{_prefix}/lib/udev/rules.d/70-uaccess.rules
%exclude %{_prefix}/lib/udev/rules.d/71-seat.rules %exclude %{_prefix}/lib/udev/rules.d/71-seat.rules

32
systemd-sysv-convert
View File

@ -36,9 +36,11 @@ find_service() {
local service local service
local runlevel local runlevel
declare -i priority declare -i priority
service=$1 service=$1
runlevel=$2 runlevel=$2
priority=-1 priority=-1
for l in $(ls /etc/rc.d/rc$runlevel.d/) ; do for l in $(ls /etc/rc.d/rc$runlevel.d/) ; do
initscript=$(basename $l) initscript=$(basename $l)
if [ ${initscript:0:1} != "S" -o ${initscript:3} != "$service" ]; then if [ ${initscript:0:1} != "S" -o ${initscript:3} != "$service" ]; then
@ -54,9 +56,8 @@ for l in $(ls /etc/rc.d/rc$runlevel.d/) ; do
done done
if [ $priority -ge 0 ]; then if [ $priority -ge 0 ]; then
return $priority return $priority
else
return 255
fi fi
return 255
} }
lookup_database() { lookup_database() {
@ -67,10 +68,12 @@ local runlevel
local priority local priority
local -i k local -i k
declare -a parsed declare -a parsed
services=$@ services=$@
k=0 k=0
results_runlevel=() results_runlevel=()
results_priority=() results_priority=()
while read line ; do while read line ; do
k+=1 k+=1
parsed=($line) parsed=($line)
@ -112,17 +115,16 @@ case "$1" in
shift shift
for service in $@ ; do for service in $@ ; do
if [ ! -r "/etc/init.d/$service" ]; then if [ ! -r "/etc/init.d/$service" ]; then
echo "SysV service $service does not exist" >/dev/stderr echo "SysV service $service does not exist, skipping"
let fail++
continue continue
fi fi
for runlevel in 2 3 4 5; do for runlevel in 2 3 4 5; do
find_service $service $runlevel find_service $service $runlevel
priority=$? priority=$?
if [ $priority -lt 255 ]; then if [ $priority -lt 255 ]; then
echo "$service $runlevel $priority" echo "$service $runlevel $priority" >>/var/lib/systemd/sysv-convert/database
fi fi
done >>/var/lib/systemd/sysv-convert/database done
done done
;; ;;
--show) --show)
@ -153,6 +155,19 @@ case "$1" in
exit 1 exit 1
fi fi
done done
#
# The database might no have been created by a previous --save
# call. This can happen when:
#
# - we're upgrading a package which initially didn't
# have any unit file nor sysv init script and now
# start shipping one or more unit files (bsc#982303).
#
# - the sysv init service wasn't enabled at all before
# being migrated to a native unit file (bsc#982211).
#
if [ -e /var/lib/systemd/sysv-convert/database ]; then
lookup_database $services lookup_database $services
for service in $services; do for service in $services; do
[ -f "/lib/systemd/system/$service.service" ] && service_file="/lib/systemd/system/$service.service" [ -f "/lib/systemd/system/$service.service" ] && service_file="/lib/systemd/system/$service.service"
@ -166,10 +181,11 @@ case "$1" in
mkdir -p "/etc/systemd/system/runlevel$runlevel.target.wants" mkdir -p "/etc/systemd/system/runlevel$runlevel.target.wants"
/bin/ln -sf $service_file /etc/systemd/system/runlevel$runlevel.target.wants/$service.service /bin/ln -sf $service_file /etc/systemd/system/runlevel$runlevel.target.wants/$service.service
done done
done done
fi
;; ;;
*) usage *)
usage
let fail=2 let fail=2
;; ;;
esac esac

9
systemd-user Normal file
View File

@ -0,0 +1,9 @@
# This file is part of systemd.
#
# Used by systemd --user instances.
account include common-account
session required pam_selinux.so close
session required pam_selinux.so nottys open
session include common-session

46
systemd.changes
View File

@ -1,3 +1,49 @@
-------------------------------------------------------------------
Wed Jun 7 08:17:54 UTC 2017 - fbui@suse.com
- Make sure dracut (if installed) will embed the new compat rule (bsc#982303)
The new compat rule must be embedded in the initramfs so make sure
that the installed dracut supports it.
-------------------------------------------------------------------
Wed May 24 11:23:10 UTC 2017 - fbui@suse.com
- Upgrade to v233 (commit 330b55d5e28d17f361062dba66426e46fb7d7857)
- package new systemd-umount binary
- package new environment generator stuff
- drop /dev/root symlink support
- /etc/pam.d/systemd-user is not patched anymore but we ship a
dedicated file for SUSE now.
- manage compat symlink generation in a dedicated branch (bsc#1040153)
-------------------------------------------------------------------
Wed May 17 15:57:19 UTC 2017 - fbui@suse.com
- Fix systemd-sysv-convert when a package starts shipping service units (bsc#982303)
The database might be missing when upgrading a package which was
shipping no sysv init scripts nor unit files (at the time --save was
called) but the new version start shipping unit files.
-------------------------------------------------------------------
Wed May 17 13:14:40 UTC 2017 - fbui@suse.com
- Fix indentation in systemd-sysv-convert
While at it, strip trailing whitespaces.
No functional changes.
-------------------------------------------------------------------
Thu May 11 08:47:48 UTC 2017 - fbui@suse.com
- Disable group shadow support (bsc#1029516)
The new configure option will be imported during the next tarball
update.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 2 16:17:08 UTC 2017 - fbui@suse.com Tue May 2 16:17:08 UTC 2017 - fbui@suse.com

30
systemd.spec
View File

@ -47,7 +47,7 @@
Name: systemd Name: systemd
Url: http://www.freedesktop.org/wiki/Software/systemd Url: http://www.freedesktop.org/wiki/Software/systemd
Version: 232 Version: 233
Release: 0 Release: 0
Summary: A System and Session Manager Summary: A System and Session Manager
License: LGPL-2.1+ License: LGPL-2.1+
@ -140,6 +140,7 @@ Obsoletes: pm-utils <= 1.4.1
Obsoletes: suspend <= 1.0 Obsoletes: suspend <= 1.0
Source0: systemd-%{version}.tar.xz Source0: systemd-%{version}.tar.xz
Source1: %{name}-rpmlintrc Source1: %{name}-rpmlintrc
Source2: systemd-user
Source3: systemd-sysv-convert Source3: systemd-sysv-convert
Source6: baselibs.conf Source6: baselibs.conf
Source7: libgcrypt.m4 Source7: libgcrypt.m4
@ -235,6 +236,7 @@ Conflicts: systemd < 39
Conflicts: aaa_base < 11.5 Conflicts: aaa_base < 11.5
Conflicts: filesystem < 11.5 Conflicts: filesystem < 11.5
Conflicts: mkinitrd < 2.7.0 Conflicts: mkinitrd < 2.7.0
Conflicts: dracut < 044.1
Conflicts: util-linux < 2.16 Conflicts: util-linux < 2.16
Conflicts: ConsoleKit < 0.4.1 Conflicts: ConsoleKit < 0.4.1
Requires: filesystem Requires: filesystem
@ -431,6 +433,7 @@ systemd_cryptsetup_LDFLAGS =\\\
--disable-lto \ --disable-lto \
--disable-tests \ --disable-tests \
--without-kill-user-processes \ --without-kill-user-processes \
--with-default-hierarchy=hybrid \
--with-rc-local-script-path-start=/etc/init.d/boot.local \ --with-rc-local-script-path-start=/etc/init.d/boot.local \
--with-rc-local-script-path-stop=/etc/init.d/halt.local \ --with-rc-local-script-path-stop=/etc/init.d/halt.local \
--with-debug-shell=/bin/bash \ --with-debug-shell=/bin/bash \
@ -439,6 +442,7 @@ systemd_cryptsetup_LDFLAGS =\\\
--disable-adm-group \ --disable-adm-group \
--disable-wheel-group \ --disable-wheel-group \
--disable-ldconfig \ --disable-ldconfig \
--disable-gshadow \
%if %{without networkd} %if %{without networkd}
--disable-networkd \ --disable-networkd \
%endif %endif
@ -495,6 +499,10 @@ ln -s ../usr/bin/systemctl %{buildroot}/sbin/runlevel
rm -rf %{buildroot}/etc/systemd/system/*.target.wants rm -rf %{buildroot}/etc/systemd/system/*.target.wants
rm -f %{buildroot}/etc/systemd/system/default.target rm -f %{buildroot}/etc/systemd/system/default.target
# Overwrite /etc/pam.d/systemd-user shipped by upstream with one
# customized for openSUSE distros.
install -m0644 %{S:2} %{buildroot}%{_sysconfdir}/pam.d/
# We keep a copy of tmp.mount because it may be removed if not used # We keep a copy of tmp.mount because it may be removed if not used
# (see %post): we want to be sure tmpfs won't be used for /tmp by # (see %post): we want to be sure tmpfs won't be used for /tmp by
# default on Suse distros. # default on Suse distros.
@ -754,6 +762,14 @@ elif [ ! -e /lib/udev ]; then
ln -s /usr/lib/udev /lib/udev ln -s /usr/lib/udev /lib/udev
fi fi
# New installations uses the last compat symlink generation number
# (currently at 2), which basically disables all compat symlinks. On
# old systems, the file doesn't exist. This is equivalent to
# generation #1, which enables the creation of all compat symlinks.
if [ $1 -eq 1 ]; then
echo "COMPAT_SYMLINK_GENERATION=2">/usr/lib/udev/compat-symlink-generation
fi
# Create "tape"/"input" group which is referenced by some udev rules # Create "tape"/"input" group which is referenced by some udev rules
# that we're shipping. FIXME: maybe we should consider using # that we're shipping. FIXME: maybe we should consider using
# "sysusers_create basic.conf" instead ? # "sysusers_create basic.conf" instead ?
@ -867,6 +883,7 @@ fi
%{_bindir}/systemd-path %{_bindir}/systemd-path
%{_bindir}/systemd-sysusers %{_bindir}/systemd-sysusers
%{_bindir}/systemd-mount %{_bindir}/systemd-mount
%{_bindir}/systemd-umount
%{_bindir}/systemd-notify %{_bindir}/systemd-notify
%{_bindir}/systemd-run %{_bindir}/systemd-run
%{_bindir}/journalctl %{_bindir}/journalctl
@ -919,7 +936,7 @@ fi
%{_prefix}/lib/systemd/user/*.service %{_prefix}/lib/systemd/user/*.service
%{_prefix}/lib/systemd/systemd-* %{_prefix}/lib/systemd/systemd-*
%{_prefix}/lib/systemd/systemd %{_prefix}/lib/systemd/systemd
%{_prefix}/lib/systemd/libsystemd-shared-%{version}.so %{_prefix}/lib/systemd/libsystemd-shared-*.so
%{_prefix}/lib/systemd/resolv.conf %{_prefix}/lib/systemd/resolv.conf
%{_prefix}/lib/systemd/fix-machines-subvol-for-rollbacks.sh %{_prefix}/lib/systemd/fix-machines-subvol-for-rollbacks.sh
%dir %{_prefix}/lib/systemd/catalog %dir %{_prefix}/lib/systemd/catalog
@ -929,6 +946,7 @@ fi
%{_prefix}/lib/systemd/user-preset %{_prefix}/lib/systemd/user-preset
%{_prefix}/lib/systemd/system-generators %{_prefix}/lib/systemd/system-generators
%{_prefix}/lib/systemd/user-generators %{_prefix}/lib/systemd/user-generators
%{_prefix}/lib/systemd/user-environment-generators
%dir %{_prefix}/lib/systemd/ntp-units.d/ %dir %{_prefix}/lib/systemd/ntp-units.d/
%dir %{_prefix}/lib/systemd/system-shutdown/ %dir %{_prefix}/lib/systemd/system-shutdown/
%dir %{_prefix}/lib/systemd/system-sleep/ %dir %{_prefix}/lib/systemd/system-sleep/
@ -959,6 +977,8 @@ fi
%{_libexecdir}/tmpfiles.d/ %{_libexecdir}/tmpfiles.d/
%exclude %{_libexecdir}/tmpfiles.d/systemd-remote.conf %exclude %{_libexecdir}/tmpfiles.d/systemd-remote.conf
%{_libexecdir}/environment.d/
%dir %{_libexecdir}/binfmt.d %dir %{_libexecdir}/binfmt.d
%dir %{_sysconfdir}/binfmt.d %dir %{_sysconfdir}/binfmt.d
@ -1074,6 +1094,9 @@ fi
%if %{with importd} %if %{with importd}
%{_datadir}/polkit-1/actions/org.freedesktop.import1.policy %{_datadir}/polkit-1/actions/org.freedesktop.import1.policy
%endif %endif
%if %{with networkd}
%{_datadir}/polkit-1/rules.d/systemd-networkd.rules
%endif
%if ! 0%{?bootstrap} %if ! 0%{?bootstrap}
%{_mandir}/man1/[a-rt-z]*ctl.1* %{_mandir}/man1/[a-rt-z]*ctl.1*
@ -1088,6 +1111,7 @@ fi
%{_mandir}/man8/systemd-h[aioy]* %{_mandir}/man8/systemd-h[aioy]*
%{_mandir}/man8/systemd-journald* %{_mandir}/man8/systemd-journald*
%{_mandir}/man8/systemd-u[ps]* %{_mandir}/man8/systemd-u[ps]*
%{_mandir}/man8/30-systemd-environment-d-generator.*
%endif %endif
%{_docdir}/systemd %{_docdir}/systemd
@ -1155,7 +1179,7 @@ fi
%{_prefix}/lib/udev/scsi_id %{_prefix}/lib/udev/scsi_id
%{_prefix}/lib/udev/v4l_id %{_prefix}/lib/udev/v4l_id
%{_prefix}/lib/udev/remount-tmpfs %{_prefix}/lib/udev/remount-tmpfs
%{_prefix}/lib/udev/rootsymlink-generator %ghost %{_prefix}/lib/udev/compat-symlink-generation
%dir %{_prefix}/lib/udev/rules.d/ %dir %{_prefix}/lib/udev/rules.d/
%exclude %{_prefix}/lib/udev/rules.d/70-uaccess.rules %exclude %{_prefix}/lib/udev/rules.d/70-uaccess.rules
%exclude %{_prefix}/lib/udev/rules.d/71-seat.rules %exclude %{_prefix}/lib/udev/rules.d/71-seat.rules