From d13bfbbb0aa4228d2a7a6aa4ea8d51a546fc78ae Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Thu, 5 Dec 2024 22:30:24 +0100 Subject: [PATCH] udev: add requires(pre) for systemd and added other pre and post requirements for bootstrap installation own /run/utmp, /var/log/{lastlog,wtmp,btmp} formerly from initscripts [release 256.9-2mamba;Thu Dec 05 2024] --- systemd.spec | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/systemd.spec b/systemd.spec index d8692a8..859aed5 100644 --- a/systemd.spec +++ b/systemd.spec @@ -27,7 +27,7 @@ Name: systemd Epoch: 2 Version: 256.9 -Release: 1mamba +Release: 2mamba Summary: A system and service manager compatible with SysV and LSB init scripts Group: System/Configuration Vendor: openmamba @@ -94,6 +94,8 @@ Provides: /sbin/reboot Provides: /sbin/shutdown Provides: /usr/sbin/shutdown Requires(pre): filesystem >= 2.3-10mamba +Requires(post): findutils +Requires(post): grep Requires(post): pwdutils Provides: laptop-mode-tools Obsoletes: laptop-mode-tools < 248 @@ -144,9 +146,10 @@ Obsoletes: devfsd < 2:248 Obsoletes: hotplug < 2:248 Provides: udev-static Obsoletes: udev-static < 2:248 -Requires(post):/usr/sbin/groupadd -Requires(post):setup -Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} +Requires(pre): grep +Requires(post): /usr/sbin/groupadd +Requires(post): setup +Requires(post): systemd = %{?epoch:%epoch:}%{version}-%{release} Requires: libudev = %{?epoch:%epoch:}%{version}-%{release} %description -n udev @@ -282,6 +285,14 @@ install -D -m0755 %{SOURCE17} %{buildroot}%{_prefix}/lib/systemd/systemd-sysv-in install -d -m0755 %{buildroot}%{_sysconfdir}/repart.d install -d -m0755 %{buildroot}%{_prefix}/lib/repart.d +# own system log files previously owned by initscripts package +mkdir -p %{buildroot}%{_localstatedir}/log +touch %{buildroot}%{_localstatedir}/log/lastlog +chmod 0664 %{buildroot}%{_localstatedir}/log/lastlog +touch %{buildroot}%{_localstatedir}/log/{w,b}tmp +mkdir -p %{buildroot}/run +touch %{buildroot}/run/utmp + %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -489,11 +500,6 @@ if [ $1 -ge 1 ]; then udevadm trigger -a change fi -[ "`grep " vc/" /etc/inittab 2>/dev/null`" ] && { - sed -i "s| vc/| tty|" /etc/inittab - telinit q -} - groupadd audio -g %{group_audio} 2>/dev/null groupadd cdrecording -g %{group_cdrecording} 2>/dev/null groupadd cdrom -g %{group_cdrom} 2>/dev/null @@ -511,7 +517,6 @@ groupadd render -g %{group_render} 2>/dev/null [ -e /lib/udev ] || ln -s ../usr/lib/udev /lib/udev : - %posttrans -n udev [ ! -L /lib -a ! -L /lib/udev ] && { # Migrate /lib/udev -> /usr/lib/udev migration @@ -697,6 +702,10 @@ systemctl daemon-reload &>/dev/null || : %dir %{_localstatedir}/log/journal %dir %{_localstatedir}/log/journal/remote %dir %{_localstatedir}/lib/systemd +%ghost %attr(0664,root,root) %verify(not group) /run/utmp +%ghost %attr(0664,root,root) %verify(not group) /var/log/wtmp +%ghost %attr(0660,root,root) %verify(not group) /var/log/btmp +%ghost %attr(0664,root,root) %verify(not md5 size mtime group) /var/log/lastlog %{_mandir}/man1/bootctl.1* %{_mandir}/man1/busctl.1* %{_mandir}/man1/coredumpctl.1* @@ -813,6 +822,10 @@ systemctl daemon-reload &>/dev/null || : %{_libdir}/pkgconfig/libudev.pc %changelog +* Thu Dec 05 2024 Silvan Calarco 256.9-2mamba +- udev: add requires(pre) for systemd and added other pre and post requirements for bootstrap installation +- own /run/utmp, /var/log/{lastlog,wtmp,btmp} formerly from initscripts + * Sat Nov 30 2024 Automatic Build System 256.9-1mamba - automatic version update by autodist