-# TODO: - move %_libexecdir/tmpfiles.d/* to /etc/tmpfiles.d?
-# - shouldn't ../bin/systemctl symlinks be absolute? -no they shouldn't (think browsing mounted as chroot and seeing all blink due invalid link targets when doing ls)
-# - separate init subpackage (with symlink), one can switch to
-# systemd using init=/bin/systemd with other one installed
-# - verify %_sysconfdir usage vs literal '/etc'
+# TODO:
+# - remove compat-pld-var-run.tmpfiles and maybe tmpfiles-not-fatal.patch
+# after enough packages provide their own tmpfiles.d configs for
+# /var/run directories
+# - pldize vconsole setup:
+# - http://cgit.freedesktop.org/systemd/systemd/tree/src/vconsole/vconsole-setup.c
+# - for systemd-45+
+# - restore var-{run,lock}: http://cgit.freedesktop.org/systemd/systemd/commit/?id=55d029addf7d97b15faacea597a4ff65542aaf0e
+# - WARNING: http://cgit.freedesktop.org/systemd/systemd/commit/?id=623ac9d2fce3170125ead9be20f56bfe68ea125e
#
# Conditional build:
%bcond_without audit # without audit support
%bcond_without cryptsetup # without cryptsetup support
-%bcond_without gtk # build gtk tools
%bcond_without pam # PAM authentication support
+%bcond_without plymouth # do not install plymouth units
%bcond_without selinux # without SELinux support
%bcond_without tcpd # libwrap (tcp_wrappers) support
Summary: A System and Service Manager
Summary(pl.UTF-8): systemd - zarządca systemu i usług dla Linuksa
Name: systemd
-Version: 37
-Release: 2
+Version: 44
+Release: 14
License: GPL v2+
Group: Base
-Source0: http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.bz2
-# Source0-md5: 1435f23be79c8c38d1121c6b150510f3
+Source0: http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.xz
+# Source0-md5: 11f44ff74c87850064e4351518bcff17
Source1: %{name}-sysv-convert
-Source2: systemd_booted.c
+Source2: %{name}_booted.c
+Source3: network.service
+Source5: compat-pld-var-run.tmpfiles
+Source10: pld-storage-init-late.service
+Source11: pld-storage-init.service
+Source12: pld-wait-storage.service
+Source13: pld-storage-init.sh
+Source14: pld-clean-tmp.service
+Source15: pld-clean-tmp.sh
Patch0: target-pld.patch
Patch1: config-pld.patch
+Patch2: shut-sysv-up.patch
+Patch3: pld-sysv-network.patch
+Patch4: tmpfiles-not-fatal.patch
+Patch5: CVE-2012-1174.patch
+Patch6: ReleaseSession.patch
+Patch7: control-subcgroup.patch
+Patch8: kmsg-to-syslog.patch
URL: http://www.freedesktop.org/wiki/Software/systemd
+BuildRequires: acl-devel
%{?with_audit:BuildRequires: audit-libs-devel}
BuildRequires: autoconf >= 2.63
BuildRequires: automake >= 1:1.11
+BuildRequires: binutils >= 3:2.22.52.0.1-2
%{?with_cryptsetup:BuildRequires: cryptsetup-luks-devel}
BuildRequires: dbus-devel >= 1.3.2
BuildRequires: docbook-style-xsl
-%if %{with gtk}
-BuildRequires: glib2-devel >= 1:2.26.1
-BuildRequires: gtk+2-devel >= 2:2.24.0
-BuildRequires: libnotify-devel >= 0.7.0
-%endif
BuildRequires: gperf
+BuildRequires: intltool >= 0.40.0
+BuildRequires: kmod-devel >= 5
BuildRequires: libcap-devel
-%{?with_selinux:BuildRequires: libselinux-devel}
+%{?with_selinux:BuildRequires: libselinux-devel >= 2.1.0}
BuildRequires: libtool >= 2:2.2
%{?with_tcpd:BuildRequires: libwrap-devel}
BuildRequires: libxslt-progs
BuildRequires: m4
%{?with_pam:BuildRequires: pam-devel}
BuildRequires: pkgconfig >= 0.9.0
-BuildRequires: rpmbuild(macros) >= 1.527
-BuildRequires: udev-devel >= 172
-BuildRequires: vala >= 0.10.0
+BuildRequires: rpmbuild(macros) >= 1.627
+BuildRequires: udev-devel >= 1:172
+BuildRequires: xz-devel
Requires: %{name}-libs = %{version}-%{release}
Requires: %{name}-units = %{version}-%{release}
+Requires: /etc/os-release
Requires: SysVinit-tools
Requires: agetty
-Requires: dbus >= 1.3.2
-Requires: dbus-systemd
-Requires: filesystem >= 4.0
-# python modules required by systemd-analyze
-Requires: python-dbus
-Requires: python-modules
-Requires: rc-scripts
+Requires: dbus >= 1.4.16-6
+Requires: filesystem >= 4.0-2
+Requires: libutempter
+Requires: rc-scripts >= 0.4.5.3-7
Requires: setup >= 2.8.0-2
-Requires: udev-core >= 1:172
-Requires: udev-systemd >= 1:172
+Requires: udev-core >= 1:175-5
Requires: udev-libs >= 1:172
-Suggests: ConsoleKit-systemd
-Suggests: rsyslog-systemd
-Provides: readahead = 1:1.5.7-3
-Provides: virtual(init-daemon)
+Requires: virtual(module-tools)
+Suggests: %{name}-no-compat-tmpfiles
+Suggests: ConsoleKit
+Suggests: fsck >= 2.20
+Suggests: kmod >= 5
+Suggests: nss_myhostname
+Suggests: service(klogd)
+Suggests: service(syslog)
Provides: udev-acl
-Obsoletes: SysVinit
-Obsoletes: readahead < 1:1.5.7-3
-Obsoletes: virtual(init-daemon)
+# systemd takes care of that and causes problems
+Conflicts: binfmt-detector
+# sytemd wants pam with pam_systemd.so in system-auth...
+Conflicts: pam < 1:1.1.5-5
+# ...and sudo hates it
+Conflicts: sudo < 1:1.7.8p2-4
+# for prefdm script
+Conflicts: xinitrc-ng < 1.0
+# systemd scripts use options not present in older versions
+Conflicts: kpartx < 0.4.9-7
+Conflicts: multipath-tools < 0.4.9-7
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _libexecdir %{_prefix}/lib
zależnościach logikę kontroli usług. Może pracować jako zastępca dla
sysvinit.
+%package init
+Summary: systemd /sbin/init and LSB/SysV compatibility symlinks
+Summary(pl.UTF-8): /sbin/init z systemd i dowiązania dla kompatybilności z LSB/SysV
+Group: Base
+Requires: systemd
+Provides: readahead = 1:1.5.7-3
+Provides: virtual(init-daemon)
+Obsoletes: SysVinit
+Obsoletes: readahead < 1:1.5.7-3
+Obsoletes: virtual(init-daemon)
+Conflicts: upstart
+
+%description init
+Install this package when you are ready to final switch to systemd.
+
+%description init -l pl.UTF-8
+Ten pakiet należy zainstalować po przygotowaniu się do ostatecznego
+przejścia na systemd.
+
%package units
Summary: Configuration files, directories and installation tool for systemd
+Summary(pl.UTF-8): Pliki konfiguracyjne, katalogi i narzędzie instalacyjne dla systemd
Group: Base
Requires(post): coreutils
-Requires(post): gawk
-Requires: pkgconfig
+Requires(post): /bin/awk
%description units
Basic configuration files, directories and installation tool for the
systemd system and service manager.
-This is distro specific config, to override
-use /etc/systemd/system
+This is common config, use %{_sysconfdir}/systemd/system to override.
+
+%description units -l pl.UTF-8
+Podstawowe pliki konfiguracyjne, katalogi i narzędzie instalacyjne dla
+zarządcy systemu i usług systemd.
-%package gtk
-Summary: Graphical frontend for systemd
+Ten pakiet zawiera ogólną konfigurację, ustawienia można nadpisać
+poprzez katalog %{_sysconfdir}/systemd/system.
+
+%package plymouth
+Summary: Plymouth support units for systemd
+Summary(pl.UTF-8): Jednostki wspierające Plymouth dla systemd
Group: Base
-Requires: %{name} = %{version}-%{release}
-Requires: polkit
+Requires: %{name}-units = %{version}-%{release}
+Requires: plymouth
-%description gtk
-Graphical front-end for systemd.
+%description plymouth
+Plymouth (graphical boot) support units for systemd.
-%package -n bash-completion-systemd
-Summary: bash-completion for systemd
-Group: Applications/Shells
-Requires: %{name}
-Requires: bash-completion
+%description plymouth -l pl.UTF-8
+Jednostki wspierające Plymouth (graficzny start systemu) dla systemd.
-%description -n bash-completion-systemd
-bash-completion for systemd.
+%package analyze
+Summary: Tool for processing systemd profiling information
+Group: Base
+Requires: %{name} = %{version}-%{release}
+Requires: python-dbus
+Requires: python-modules
+Requires: python-pycairo
+Conflicts: %{name} < 44-3
+
+%description analyze
+'systemd-analyze blame' lists which systemd unit needed how much time
+to finish initialization at boot. 'systemd-analyze plot' renders an
+SVG visualizing the parallel start of units at boot.
%package libs
-Summary: Shared systemd library
+Summary: Shared systemd libraries
+Summary(pl.UTF-8): Biblioteki współdzielone systemd
Group: Libraries
%description libs
-Shared systemd library.
+Shared systemd libraries.
+
+%description libs -l pl.UTF-8
+Biblioteki współdzielone systemd.
%package devel
Summary: Header files for systemd libraries
%description devel -l pl.UTF-8
Pliki nagłówkowe bibliotek systemd.
+%package -n bash-completion-systemd
+Summary: bash-completion for systemd
+Summary(pl.UTF-8): Bashowe dopełnianie składni dla systemd
+Group: Applications/Shells
+Requires: %{name} = %{version}
+Requires: bash-completion
+
+%description -n bash-completion-systemd
+bash-completion for systemd.
+
+%description -n bash-completion-systemd -l pl.UTF-8
+Bashowe dopełnianie składni dla systemd
+
+%package no-compat-tmpfiles
+Summary: Force update of packages that provide tmpfiles.d configuration
+Group: Base
+Requires: %{name} = %{version}-%{release}
+Requires(post): sed > 4.0
+Conflicts: ConsoleKit-dirs < 0.4.5-7
+Conflicts: NetworkManager < 2:0.9.2.0-3
+Conflicts: Zope < 2.11.8-2
+Conflicts: amavisd-new < 1:2.7.0-1
+Conflicts: apache-base < 2.2.21-4
+Conflicts: apache-mod_bw < 0.92-3
+Conflicts: apache-mod_fastcgi < 2.4.6-6
+Conflicts: apache1-base < 1.3.42-5
+Conflicts: apache1-mod_fastcgi < 2.4.6-2
+Conflicts: asterisk < 10.0.1-2
+Conflicts: autossh-init < 1.4b-3
+Conflicts: balance < 3.54-2
+Conflicts: bind < 7:9.8.1.P1-4
+Conflicts: bopm < 3.1.3-4
+Conflicts: callweaver < 1.2.1-9
+Conflicts: cassandra-bin < 0.8.9-2
+Conflicts: clamav < 0.97.3-3
+Conflicts: cups < 1:1.5.0-10
+Conflicts: dbus < 1.4.16-4
+Conflicts: dovecot < 1:2.0.16-3
+Conflicts: dspam < 3.9.0-6
+Conflicts: fail2ban < 0.8.4-4
+Conflicts: filesystem < 4.0-3
+Conflicts: gammu-smsd < 1:1.31.0-3
+# Break gdm2.20 installs
+#Conflicts: gdm < 2:3.2.1.1-9
+Conflicts: greylistd < 0.8.8-2
+Conflicts: inn < 2.4.6-7
+Conflicts: ipsec-tools < 0.8.0-3
+Conflicts: jabber-common < 0-9
+Conflicts: laptop-mode-tools < 1.58-2
+Conflicts: libgpod < 0.8.0-6
+Conflicts: libvirt-utils < 0.9.9-4
+Conflicts: lighttpd < 1.4.30-5
+Conflicts: lirc < 0.9.0-20
+Conflicts: mailman < 5:2.1.14-4
+Conflicts: memcached < 1.4.11-2
+Conflicts: mpd < 0.16.5-4
+Conflicts: mrtg < 2.17.0-3
+Conflicts: munin-common < 1.4.5-5
+Conflicts: nagios-nrpe < 2.13-2
+Conflicts: ndisc6-rdnssd < 1.0.1-3
+Conflicts: nscd < 6:2.14.1-5
+Conflicts: nss_ldapd-nslcd < 0.8.4-2
+Conflicts: openct < 0.6.20-3
+Conflicts: openl2tp < 1.8-3
+Conflicts: openldap-overlay-nssov < 2.4.28-4
+Conflicts: openldap-servers < 2.4.28-4
+Conflicts: openvpn < 2.2.2-2
+Conflicts: pam-pam_mount < 2.12-3
+Conflicts: pam-pam_ssh < 1.97-2
+Conflicts: pcsc-lite < 1.8.1-2
+Conflicts: php-dirs < 1.2-3
+Conflicts: policyd < 2.0.10-3
+Conflicts: pound < 2.6-2
+Conflicts: pptp < 1.7.2-3
+Conflicts: proftpd-common < 2:1.3.4a-2
+Conflicts: pulseaudio-server < 1.1-2
+Conflicts: quagga < 0.99.20-3
+Conflicts: radvd < 1.8.5-2
+Conflicts: rc-scripts < 0.4.5.2-3
+Conflicts: red5 < 0.9.0-2
+Conflicts: redis-server < 2.4.2-4
+Conflicts: smokeping < 2.4.2-10
+Conflicts: smtp-gated < 1.4.17-2
+Conflicts: socat < 1.7.2.0-2
+Conflicts: speech-dispatcher < 0.7.1-2
+Conflicts: sphinx < 2.0.3-4
+Conflicts: splashutils < 1.5.4.3-3
+Conflicts: stunnel < 4.50-2
+Conflicts: tenshi < 0.12-2
+Conflicts: tor < 0.2.2.35-2
+Conflicts: ucarp < 1.5.2-3
+Conflicts: udisks < 1.0.4-3
+Conflicts: util-vserver < 0.30.216-1.pre3002.3
+Conflicts: vpnc < 0.5.3-2
+Conflicts: web2ldap < 1.1.0rc1-2
+Conflicts: wesnoth-server < 1:1.10-2
+Conflicts: wpa_supplicant < 0.7.3-10
+Conflicts: xl2tpd < 1.3.0-2
+
+%description no-compat-tmpfiles
+Force update of packages that provide tmpfiles.d configuration
+
%prep
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
cp -p %{SOURCE2} src/systemd_booted.c
%build
%configure \
%{__enable_disable audit} \
%{__enable_disable cryptsetup libcryptsetup} \
- %{__enable_disable gtk} \
+ --disable-gtk \
%{__enable_disable pam} \
+ %{__enable_disable plymouth} \
%{__enable_disable selinux} \
%{__enable_disable tcpd tcpwrap} \
--disable-silent-rules \
--disable-static \
- --with-rootdir=
+ --with-distro=pld \
+ --with-rootprefix= \
+ --with-rootlibdir=/%{_lib} \
+ --enable-split-usr
%{__make}
./libtool --mode=link --tag=CC %{__cc} %{rpmcppflags} %{rpmcflags} -o systemd_booted %{rpmldflags} src/systemd_booted.c -L. -lsystemd-daemon
%install
rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT/var/lib/%{name}/coredump
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-./libtool --mode=install install -m755 systemd_booted $RPM_BUILD_ROOT/bin/systemd_booted
+./libtool --mode=install install -p -m755 systemd_booted $RPM_BUILD_ROOT/bin/systemd_booted
-for lib in libsystemd-daemon libsystemd-login; do
- %{__mv} $RPM_BUILD_ROOT{%{_libdir}/$lib.so.*,/%{_lib}}
- ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/$lib.so.*.*.*) $RPM_BUILD_ROOT%{_libdir}/$lib.so
-done
+# Main binary has been moved, but we don't want to break existing installs
+ln -s ../lib/systemd/systemd $RPM_BUILD_ROOT/bin/systemd
# Create SysV compatibility symlinks. systemctl/systemd are smart
-# enough to detect in which way they are called.
+# enough to detect the way they were called
install -d $RPM_BUILD_ROOT/sbin
-ln -s ../bin/systemd $RPM_BUILD_ROOT/sbin/init
+ln -s ../lib/systemd/systemd $RPM_BUILD_ROOT/sbin/init
ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/halt
ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/poweroff
ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/reboot
ln -s ../modules $RPM_BUILD_ROOT%{_sysconfdir}/modules-load.d/modules.conf
-# We create all wants links manually at installation time to make sure
-# they are not owned and hence overriden by rpm after the used deleted
-# them.
-%{__rm} -r $RPM_BUILD_ROOT%{_sysconfdir}/systemd/system/*.target.wants
-
-# do not cover /media (system-specific removable mountpoints) for now
-# needs %post code to convert existing /media structure to tmpfiles
-%{__rm} -f $RPM_BUILD_ROOT/lib/systemd/local-fs.target.wants/media.mount
-# do not cover /var/run until packages need rpm-provided-only subdirectories
-%{__rm} -f $RPM_BUILD_ROOT/lib/systemd/local-fs.target.wants/var-run.mount
-
-# Make sure these directories are properly owned
-install -d $RPM_BUILD_ROOT/lib/systemd/system/{basic,dbus,default,halt,kexec,poweroff,reboot,syslog}.target.wants
+# disable redundant SYSV services
+ln -s /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/allowlogin.service
+ln -s /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/console.service
+ln -s /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/cpusets.service
+ln -s /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/killall.service
+ln -s /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/netfs.service
+ln -s /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/random.service
+
+# add static (non-NetworkManager) networking
+cp -p %{SOURCE3} $RPM_BUILD_ROOT%{systemdunitdir}/network.service
+
+# install compatibility tmpfiles configs
+cp -p %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/compat-pld-var-run.conf
+
+# Install and enable storage subsystems support services (RAID, LVM, etc.)
+cp -p %{SOURCE10} $RPM_BUILD_ROOT%{systemdunitdir}/pld-storage-init-late.service
+cp -p %{SOURCE11} $RPM_BUILD_ROOT%{systemdunitdir}/pld-storage-init.service
+cp -p %{SOURCE12} $RPM_BUILD_ROOT%{systemdunitdir}/pld-wait-storage.service
+cp -p %{SOURCE14} $RPM_BUILD_ROOT%{systemdunitdir}/pld-clean-tmp.service
+install -p %{SOURCE13} $RPM_BUILD_ROOT/lib/systemd/pld-storage-init
+install -p %{SOURCE15} $RPM_BUILD_ROOT/lib/systemd/pld-clean-tmp
+
+ln -s ../pld-storage-init-late.service $RPM_BUILD_ROOT%{systemdunitdir}/local-fs.target.wants
+ln -s ../pld-storage-init.service $RPM_BUILD_ROOT%{systemdunitdir}/local-fs.target.wants
+ln -s ../pld-clean-tmp.service $RPM_BUILD_ROOT%{systemdunitdir}/local-fs.target.wants
+
+# handled by rc-local sysv service, no need for generator
+%{__rm} $RPM_BUILD_ROOT/lib/systemd/system-generators/systemd-rc-local-generator
+
+# Make sure these directories are properly owned:
+# - halt,kexec,poweroff,reboot: generic ones used by ConsoleKit-systemd,
+# - syslog _might_ be used by some syslog implementation (none for now),
+# - isn't dbus populated by dbus-systemd only (so to be moved there)?
+install -d $RPM_BUILD_ROOT%{systemdunitdir}/{dbus,halt,kexec,poweroff,reboot,syslog}.target.wants
# Create new-style configuration files so that we can ghost-own them
-touch $RPM_BUILD_ROOT%{_sysconfdir}/{hostname,locale.conf,machine-id,machine-info,os-release,timezone,vconsole.conf}
+touch $RPM_BUILD_ROOT%{_sysconfdir}/{hostname,locale.conf,machine-id,machine-info,timezone,vconsole.conf}
# Install SysV conversion tool for systemd
install -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}
install -d $RPM_BUILD_ROOT/var/log
-> $RPM_BUILD_ROOT/var/log/btmp
-> $RPM_BUILD_ROOT/var/log/wtmp
+:> $RPM_BUILD_ROOT/var/log/btmp
+:> $RPM_BUILD_ROOT/var/log/wtmp
-%if %{without gtk}
-# to shut up check-files
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/systemadm
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/systemd-gnome-ask-password-agent
%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/systemadm.1*
-%endif
%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
%{__rm} $RPM_BUILD_ROOT/%{_lib}/security/pam_systemd.la
# Try to read default runlevel from the old inittab if it exists
runlevel=$(/bin/awk -F ':' '$3 == "initdefault" && $1 !~ "^#" { print $2 }' /etc/inittab 2> /dev/null)
if [ -z "$runlevel" ] ; then
- target="/lib/systemd/system/graphical.target"
+ target="%{systemdunitdir}/graphical.target"
else
- target="/lib/systemd/system/runlevel$runlevel.target"
+ target="%{systemdunitdir}/runlevel$runlevel.target"
fi
# And symlink what we found to the new-style default.target
- ln -sf "$target" /etc/systemd/system/default.target >/dev/null 2>&1 || :
+ ln -s "$target" %{_sysconfdir}/systemd/system/default.target >/dev/null 2>&1 || :
+
+ # Setup hostname
+ [ -f /etc/sysconfig/network ] && . /etc/sysconfig/network
+ if [ -n "$HOSTNAME" -a "$HOSTNAME" != "pldmachine" ]; then
+ [ -f /etc/hostname ] && mv -f /etc/hostname /etc/hostname.rpmsave
+ echo $HOSTNAME > /etc/hostname
+ chmod 644 /etc/hostname
+ fi
# Enable the services we install by default.
/bin/systemctl enable \
getty@.service \
+ network.service \
remote-fs.target \
systemd-readahead-replay.service \
systemd-readahead-collect.service >/dev/null 2>&1 || :
if [ $1 -eq 0 ] ; then
/bin/systemctl disable \
getty@.service \
+ network.service \
remote-fs.target \
systemd-readahead-replay.service \
systemd-readahead-collect.service >/dev/null 2>&1 || :
- %{__rm} -f /etc/systemd/system/default.target >/dev/null 2>&1 || :
+ %{__rm} -f %{_sysconfdir}/systemd/system/default.target >/dev/null 2>&1 || :
fi
%postun units
/bin/systemctl daemon-reload > /dev/null 2>&1 || :
fi
+%triggerpostun units -- %{name}-units < 43-7
+# Remove design fialures
+rm -f %{_sysconfdir}/systemd/system/network.target.wants/ifcfg@*.service >/dev/null 2>&1 || :
+rm -f %{_sysconfdir}/systemd/system/network.target.wants/network-post.service >/dev/null 2>&1 || :
+rm -f %{_sysconfdir}/systemd/system/multi-user.target.wants/network-post.service >/dev/null 2>&1 || :
+/bin/systemctl reenable network.service >/dev/null 2>&1 || :
+
+%post no-compat-tmpfiles
+%{__sed} -i -e '/^#/!s/^/# /g' %{_sysconfdir}/tmpfiles.d/compat-pld-var-run.conf
+
+%post plymouth
+%systemd_reload
+
+%postun plymouth
+%systemd_reload
+
%files
%defattr(644,root,root,755)
%doc DISTRO_PORTING README TODO
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/hostname
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/locale.conf
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/machine-info
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/os-release
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/timezone
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vconsole.conf
-%dir %{_sysconfdir}/systemd
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/systemd/*.conf
+%dir %{_sysconfdir}/systemd/user
+%dir %{_sysconfdir}/systemd/system/*.target.wants
+%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/systemd/system/*.target.wants/*.service
+%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/systemd/system/*.target.wants/*.target
/etc/xdg/systemd
%attr(755,root,root) /bin/systemd
%attr(755,root,root) /bin/systemd-ask-password
+%attr(755,root,root) /bin/systemd-journalctl
%attr(755,root,root) /bin/systemd-loginctl
%attr(755,root,root) /bin/systemd-machine-id-setup
%attr(755,root,root) /bin/systemd-notify
%attr(755,root,root) /bin/systemd-tty-ask-password-agent
-%attr(755,root,root) %{_bindir}/systemd-analyze
+%attr(755,root,root) %{_bindir}/systemd-cat
+%attr(755,root,root) %{_bindir}/systemd-cgtop
%attr(755,root,root) %{_bindir}/systemd-cgls
%attr(755,root,root) %{_bindir}/systemd-nspawn
-%attr(755,root,root) %{_bindir}/systemd-sysv-convert
%attr(755,root,root) %{_bindir}/systemd-stdio-bridge
-%attr(755,root,root) /sbin/halt
-%attr(755,root,root) /sbin/init
-%attr(755,root,root) /sbin/poweroff
-%attr(755,root,root) /sbin/reboot
-%attr(755,root,root) /sbin/runlevel
-%attr(755,root,root) /sbin/shutdown
-%attr(755,root,root) /sbin/telinit
+%attr(755,root,root) %{_bindir}/systemd-sysv-convert
+%attr(755,root,root) /lib/systemd/pld-clean-tmp
+%attr(755,root,root) /lib/systemd/pld-storage-init
%attr(755,root,root) /lib/systemd/systemd-*
%dir /lib/systemd/system-generators
+%attr(755,root,root) /lib/systemd/systemd
%attr(755,root,root) /lib/systemd/system-generators/systemd-*-generator
%dir /lib/systemd/system-shutdown
/lib/udev/rules.d/99-systemd.rules
/lib/udev/rules.d/73-seat-late.rules
%dir %{_libexecdir}/systemd
%{_libexecdir}/systemd/user
+%dir %{_libexecdir}/systemd/user-generators
%config(noreplace,missingok) %{_libexecdir}/tmpfiles.d/*.conf
%{_datadir}/dbus-1/interfaces/org.freedesktop.hostname1.xml
%{_datadir}/dbus-1/interfaces/org.freedesktop.locale1.xml
%{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy
%dir %{_datadir}/systemd
%{_datadir}/systemd/kbd-model-map
-%{_mandir}/man1/init.1
%{_mandir}/man1/systemd.1*
-%{_mandir}/man1/systemd-ask-password.1*
-%{_mandir}/man1/systemd-cgls.1*
-%{_mandir}/man1/systemd-notify.1*
-%{_mandir}/man1/systemd-nspawn.1*
-%{_mandir}/man1/systemd-loginctl.1*
-%{_mandir}/man3/sd_booted.3*
-%{_mandir}/man3/sd_is_fifo.3*
-%{_mandir}/man3/sd_is_socket.3
-%{_mandir}/man3/sd_is_socket_inet.3
-%{_mandir}/man3/sd_is_socket_unix.3
-%{_mandir}/man3/sd_listen_fds.3*
-%{_mandir}/man3/sd_notify.3*
-%{_mandir}/man3/sd_notifyf.3
-%{_mandir}/man3/sd_readahead.3*
+%{_mandir}/man1/systemd-*.1*
%{_mandir}/man5/binfmt.d.5*
%{_mandir}/man5/hostname.5*
%{_mandir}/man5/locale.conf.5*
%{_mandir}/man5/os-release.5*
%{_mandir}/man5/sysctl.d.5*
%{_mandir}/man5/systemd.*.5*
+%{_mandir}/man5/systemd-journald.conf.5*
%{_mandir}/man5/systemd-logind.conf.5*
%{_mandir}/man5/timezone.5*
%{_mandir}/man5/vconsole.conf.5*
%{_mandir}/man7/daemon.7*
%{_mandir}/man7/sd-daemon.7*
+%{_mandir}/man7/sd-login.7*
%{_mandir}/man7/sd-readahead.7*
%{_mandir}/man7/systemd.special.7*
-%{_mandir}/man8/halt.8*
-%{_mandir}/man8/poweroff.8
-%{_mandir}/man8/reboot.8
-%{_mandir}/man8/runlevel.8*
-%{_mandir}/man8/shutdown.8*
-%{_mandir}/man8/telinit.8*
+%dir /var/lib/%{name}
+%dir /var/lib/%{name}/coredump
%attr(640,root,root) %ghost /var/log/btmp
%attr(664,root,utmp) %ghost /var/log/wtmp
%{_mandir}/man8/pam_systemd.8*
%endif
-%files libs
+%files init
%defattr(644,root,root,755)
-%attr(755,root,root) /%{_lib}/libsystemd-daemon.so.*.*.*
-%attr(755,root,root) %ghost /%{_lib}/libsystemd-daemon.so.0
-%attr(755,root,root) /%{_lib}/libsystemd-login.so.*.*.*
-%attr(755,root,root) %ghost /%{_lib}/libsystemd-login.so.0
+%attr(755,root,root) /sbin/halt
+%attr(755,root,root) /sbin/init
+%attr(755,root,root) /sbin/poweroff
+%attr(755,root,root) /sbin/reboot
+%attr(755,root,root) /sbin/runlevel
+%attr(755,root,root) /sbin/shutdown
+%attr(755,root,root) /sbin/telinit
+%{_mandir}/man1/init.1
+%{_mandir}/man8/halt.8*
+%{_mandir}/man8/poweroff.8
+%{_mandir}/man8/reboot.8
+%{_mandir}/man8/runlevel.8*
+%{_mandir}/man8/shutdown.8*
+%{_mandir}/man8/telinit.8*
%files units
%defattr(644,root,root,755)
%dir %{_sysconfdir}/systemd
%dir %{_sysconfdir}/systemd/system
%dir %{_sysconfdir}/tmpfiles.d
+%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/tmpfiles.d/*.conf
%dir %{_libexecdir}/binfmt.d
%dir %{_libexecdir}/modules-load.d
%dir %{_libexecdir}/sysctl.d
+# Don't package the kernel.core_pattern setting until systemd-coredump
+# is a part of an actual systemd release and it's made clear how to
+# get the core dumps out of the journal.
+#%{_libexecdir}/sysctl.d/coredump.conf
%attr(755,root,root) /bin/systemctl
%attr(755,root,root) /bin/systemd-tmpfiles
%attr(755,root,root) /bin/systemd_booted
%{_mandir}/man8/systemd-tmpfiles.8*
%{_npkgconfigdir}/systemd.pc
-/lib/systemd/system/*.automount
-/lib/systemd/system/*.mount
-/lib/systemd/system/*.path
-/lib/systemd/system/*.service
-/lib/systemd/system/*.socket
-/lib/systemd/system/*.target
-/lib/systemd/system/*.timer
-/lib/systemd/system/basic.target.wants
-/lib/systemd/system/dbus.target.wants
-/lib/systemd/system/default.target.wants
-/lib/systemd/system/final.target.wants
-/lib/systemd/system/graphical.target.wants
-/lib/systemd/system/halt.target.wants
-/lib/systemd/system/kexec.target.wants
-/lib/systemd/system/local-fs.target.wants
-/lib/systemd/system/multi-user.target.wants
-/lib/systemd/system/poweroff.target.wants
-/lib/systemd/system/reboot.target.wants
-/lib/systemd/system/runlevel?.target.wants
-/lib/systemd/system/shutdown.target.wants
-/lib/systemd/system/sockets.target.wants
-/lib/systemd/system/sysinit.target.wants
-/lib/systemd/system/syslog.target.wants
-
-%if %{with gtk}
-%files gtk
+%{systemdunitdir}/*.automount
+%{systemdunitdir}/*.mount
+%{systemdunitdir}/*.path
+%{systemdunitdir}/*.service
+%{systemdunitdir}/*.socket
+%{systemdunitdir}/*.target
+%{systemdunitdir}/*.timer
+%if %{with plymouth}
+%exclude %{systemdunitdir}/plymouth*.service
+%exclude %{systemdunitdir}/systemd-ask-password-plymouth.*
+%endif
+%dir %{systemdunitdir}/basic.target.wants
+%dir %{systemdunitdir}/dbus.target.wants
+%dir %{systemdunitdir}/final.target.wants
+%dir %{systemdunitdir}/graphical.target.wants
+%dir %{systemdunitdir}/halt.target.wants
+%dir %{systemdunitdir}/kexec.target.wants
+%dir %{systemdunitdir}/local-fs.target.wants
+%dir %{systemdunitdir}/multi-user.target.wants
+%dir %{systemdunitdir}/poweroff.target.wants
+%dir %{systemdunitdir}/reboot.target.wants
+%dir %{systemdunitdir}/runlevel[12345].target.wants
+%dir %{systemdunitdir}/shutdown.target.wants
+%dir %{systemdunitdir}/sockets.target.wants
+%dir %{systemdunitdir}/sysinit.target.wants
+%dir %{systemdunitdir}/syslog.target.wants
+%config(noreplace,missingok) %{systemdunitdir}/basic.target.wants/*
+%config(noreplace,missingok) %{systemdunitdir}/final.target.wants/*
+%config(noreplace,missingok) %{systemdunitdir}/graphical.target.wants/*
+%config(noreplace,missingok) %{systemdunitdir}/local-fs.target.wants/*
+%config(noreplace,missingok) %{systemdunitdir}/multi-user.target.wants/getty.target
+%config(noreplace,missingok) %{systemdunitdir}/multi-user.target.wants/rc-local.service
+%config(noreplace,missingok) %{systemdunitdir}/multi-user.target.wants/systemd-ask-password-wall.path
+%config(noreplace,missingok) %{systemdunitdir}/multi-user.target.wants/systemd-logind.service
+%config(noreplace,missingok) %{systemdunitdir}/multi-user.target.wants/systemd-user-sessions.service
+%config(noreplace,missingok) %{systemdunitdir}/runlevel[12345].target.wants/*
+%config(noreplace,missingok) %{systemdunitdir}/shutdown.target.wants/*
+%config(noreplace,missingok) %{systemdunitdir}/sockets.target.wants/*
+%{?with_cryptsetup:%config(noreplace,missingok) %{systemdunitdir}/sysinit.target.wants/cryptsetup.target}
+%config(noreplace,missingok) %{systemdunitdir}/sysinit.target.wants/dev-hugepages.mount
+%config(noreplace,missingok) %{systemdunitdir}/sysinit.target.wants/dev-mqueue.mount
+%config(noreplace,missingok) %{systemdunitdir}/sysinit.target.wants/proc-sys-fs-binfmt_misc.automount
+%config(noreplace,missingok) %{systemdunitdir}/sysinit.target.wants/sys-*.mount
+%config(noreplace,missingok) %{systemdunitdir}/sysinit.target.wants/systemd-*
+
+%if %{with plymouth}
+%files plymouth
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/systemadm
-%attr(755,root,root) %{_bindir}/systemd-gnome-ask-password-agent
-%{_mandir}/man1/systemadm.1*
+%{systemdunitdir}/plymouth-halt.service
+%{systemdunitdir}/plymouth-kexec.service
+%{systemdunitdir}/plymouth-poweroff.service
+%{systemdunitdir}/plymouth-quit-wait.service
+%{systemdunitdir}/plymouth-quit.service
+%{systemdunitdir}/plymouth-read-write.service
+%{systemdunitdir}/plymouth-reboot.service
+%{systemdunitdir}/plymouth-start.service
+%{systemdunitdir}/systemd-ask-password-plymouth.path
+%{systemdunitdir}/systemd-ask-password-plymouth.service
+%config(noreplace,missingok) %{systemdunitdir}/halt.target.wants/plymouth-halt.service
+%config(noreplace,missingok) %{systemdunitdir}/kexec.target.wants/plymouth-kexec.service
+%config(noreplace,missingok) %{systemdunitdir}/multi-user.target.wants/plymouth-quit.service
+%config(noreplace,missingok) %{systemdunitdir}/multi-user.target.wants/plymouth-quit-wait.service
+%config(noreplace,missingok) %{systemdunitdir}/poweroff.target.wants/plymouth-poweroff.service
+%config(noreplace,missingok) %{systemdunitdir}/reboot.target.wants/plymouth-reboot.service
+%config(noreplace,missingok) %{systemdunitdir}/sysinit.target.wants/plymouth-read-write.service
+%config(noreplace,missingok) %{systemdunitdir}/sysinit.target.wants/plymouth-start.service
%endif
-%files -n bash-completion-systemd
+%files analyze
%defattr(644,root,root,755)
-/etc/bash_completion.d/systemctl-bash-completion.sh
+%attr(755,root,root) %{_bindir}/systemd-analyze
+
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) /%{_lib}/libsystemd-daemon.so.*.*.*
+%attr(755,root,root) %ghost /%{_lib}/libsystemd-daemon.so.0
+%attr(755,root,root) /%{_lib}/libsystemd-id128.so.*.*.*
+%attr(755,root,root) %ghost /%{_lib}/libsystemd-id128.so.0
+%attr(755,root,root) /%{_lib}/libsystemd-journal.so.*.*.*
+%attr(755,root,root) %ghost /%{_lib}/libsystemd-journal.so.0
+%attr(755,root,root) /%{_lib}/libsystemd-login.so.*.*.*
+%attr(755,root,root) %ghost /%{_lib}/libsystemd-login.so.0
%files devel
%defattr(644,root,root,755)
-%{_includedir}/systemd
%attr(755,root,root) %{_libdir}/libsystemd-daemon.so
+%attr(755,root,root) %{_libdir}/libsystemd-id128.so
+%attr(755,root,root) %{_libdir}/libsystemd-journal.so
%attr(755,root,root) %{_libdir}/libsystemd-login.so
+%{_includedir}/%{name}
%{_pkgconfigdir}/libsystemd-daemon.pc
+%{_pkgconfigdir}/libsystemd-id128.pc
+%{_pkgconfigdir}/libsystemd-journal.pc
%{_pkgconfigdir}/libsystemd-login.pc
+%{_mandir}/man3/sd_booted.3*
+%{_mandir}/man3/sd_get_seats.3*
+%{_mandir}/man3/sd_get_sessions.3*
+%{_mandir}/man3/sd_get_uids.3*
+%{_mandir}/man3/sd_is_fifo.3*
+%{_mandir}/man3/sd_is_mq.3*
+%{_mandir}/man3/sd_is_socket.3
+%{_mandir}/man3/sd_is_socket_inet.3
+%{_mandir}/man3/sd_is_socket_unix.3
+%{_mandir}/man3/sd_listen_fds.3*
+%{_mandir}/man3/sd_login_monitor_flush.3*
+%{_mandir}/man3/sd_login_monitor_get_fd.3*
+%{_mandir}/man3/sd_login_monitor_new.3*
+%{_mandir}/man3/sd_login_monitor_unref.3*
+%{_mandir}/man3/sd_notify.3*
+%{_mandir}/man3/sd_notifyf.3
+%{_mandir}/man3/sd_pid_get_owner_uid.3*
+%{_mandir}/man3/sd_pid_get_session.3*
+%{_mandir}/man3/sd_pid_get_unit.3*
+%{_mandir}/man3/sd_readahead.3*
+%{_mandir}/man3/sd_seat_can_multi_session.3*
+%{_mandir}/man3/sd_seat_get_active.3*
+%{_mandir}/man3/sd_seat_get_sessions.3*
+%{_mandir}/man3/sd_session_get_class.3*
+%{_mandir}/man3/sd_session_get_display.3*
+%{_mandir}/man3/sd_session_get_seat.3*
+%{_mandir}/man3/sd_session_get_service.3*
+%{_mandir}/man3/sd_session_get_type.3*
+%{_mandir}/man3/sd_session_get_uid.3*
+%{_mandir}/man3/sd_session_is_active.3*
+%{_mandir}/man3/sd_uid_get_seats.3*
+%{_mandir}/man3/sd_uid_get_sessions.3*
+%{_mandir}/man3/sd_uid_get_state.3*
+%{_mandir}/man3/sd_uid_is_on_seat.3*
+
+%files -n bash-completion-systemd
+%defattr(644,root,root,755)
+/etc/bash_completion.d/systemd-bash-completion.sh
+
+%files no-compat-tmpfiles
+%defattr(644,root,root,755)
+# empty package