.
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=597
This commit is contained in:
parent
df3fcba6f7
commit
a2c74248b4
@ -45,6 +45,7 @@ BuildRequires: audit-devel
|
|||||||
BuildRequires: binutils-gold
|
BuildRequires: binutils-gold
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
BuildRequires: config(suse-module-tools)
|
||||||
%if ! 0%{?bootstrap}
|
%if ! 0%{?bootstrap}
|
||||||
BuildRequires: docbook-xsl-stylesheets
|
BuildRequires: docbook-xsl-stylesheets
|
||||||
%endif
|
%endif
|
||||||
@ -472,6 +473,11 @@ Group: System/Kernel
|
|||||||
Url: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
|
Url: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
|
||||||
PreReq: /bin/rm /usr/bin/stat %insserv_prereq %fillup_prereq /usr/sbin/groupadd /usr/bin/getent /sbin/mkinitrd /usr/bin/sg_inq
|
PreReq: /bin/rm /usr/bin/stat %insserv_prereq %fillup_prereq /usr/sbin/groupadd /usr/bin/getent /sbin/mkinitrd /usr/bin/sg_inq
|
||||||
Requires(post): lib%{udevpkgname}%{udev_major}
|
Requires(post): lib%{udevpkgname}%{udev_major}
|
||||||
|
%if %{defined regenerate_initrd_post}
|
||||||
|
Requires(post): config(suse-module-tools)
|
||||||
|
Requires(postun): config(suse-module-tools)
|
||||||
|
Requires(posttrans): config(suse-module-tools)
|
||||||
|
%endif
|
||||||
Conflicts: systemd < 39
|
Conflicts: systemd < 39
|
||||||
Conflicts: aaa_base < 11.5
|
Conflicts: aaa_base < 11.5
|
||||||
Conflicts: filesystem < 11.5
|
Conflicts: filesystem < 11.5
|
||||||
@ -1133,9 +1139,14 @@ if [ "${YAST_IS_RUNNING}" != "instsys" ]; then
|
|||||||
if [ -e %{_localstatedir}/lib/no_initrd_recreation_by_suspend ]; then
|
if [ -e %{_localstatedir}/lib/no_initrd_recreation_by_suspend ]; then
|
||||||
echo "Skipping recreation of existing initial ramdisks, due"
|
echo "Skipping recreation of existing initial ramdisks, due"
|
||||||
echo "to presence of %{_localstatedir}/lib/no_initrd_recreation_by_suspend"
|
echo "to presence of %{_localstatedir}/lib/no_initrd_recreation_by_suspend"
|
||||||
|
%if %{defined regenerate_initrd_post}
|
||||||
|
else
|
||||||
|
%regenerate_initrd_post
|
||||||
|
%else
|
||||||
elif [ -x /sbin/mkinitrd ]; then
|
elif [ -x /sbin/mkinitrd ]; then
|
||||||
[ -x /sbin/mkinitrd_setup ] && /sbin/mkinitrd_setup
|
[ -x /sbin/mkinitrd_setup ] && /sbin/mkinitrd_setup
|
||||||
/sbin/mkinitrd || :
|
/sbin/mkinitrd || :
|
||||||
|
%endif
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -1147,12 +1158,22 @@ if [ "${YAST_IS_RUNNING}" != "instsys" ]; then
|
|||||||
if [ -e %{_localstatedir}/lib/no_initrd_recreation_by_suspend ]; then
|
if [ -e %{_localstatedir}/lib/no_initrd_recreation_by_suspend ]; then
|
||||||
echo "Skipping recreation of existing initial ramdisks, due"
|
echo "Skipping recreation of existing initial ramdisks, due"
|
||||||
echo "to presence of %{_localstatedir}/lib/no_initrd_recreation_by_suspend"
|
echo "to presence of %{_localstatedir}/lib/no_initrd_recreation_by_suspend"
|
||||||
|
%if %{defined regenerate_initrd_post}
|
||||||
|
else
|
||||||
|
%regenerate_initrd_post
|
||||||
|
%else
|
||||||
elif [ -x /sbin/mkinitrd ]; then
|
elif [ -x /sbin/mkinitrd ]; then
|
||||||
[ -x /sbin/mkinitrd_setup ] && /sbin/mkinitrd_setup
|
[ -x /sbin/mkinitrd_setup ] && /sbin/mkinitrd_setup
|
||||||
/sbin/mkinitrd || :
|
/sbin/mkinitrd || :
|
||||||
|
%endif
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
%if %{defined regenerate_initrd_post}
|
||||||
|
%posttrans -n %{udevpkgname}
|
||||||
|
%regenerate_initrd_posttrans
|
||||||
|
%endif
|
||||||
|
|
||||||
%post -n lib%{udevpkgname}%{udev_major} -p /sbin/ldconfig
|
%post -n lib%{udevpkgname}%{udev_major} -p /sbin/ldconfig
|
||||||
|
|
||||||
%postun -n lib%{udevpkgname}%{udev_major} -p /sbin/ldconfig
|
%postun -n lib%{udevpkgname}%{udev_major} -p /sbin/ldconfig
|
||||||
|
21
systemd.spec
21
systemd.spec
@ -40,6 +40,7 @@ BuildRequires: audit-devel
|
|||||||
BuildRequires: binutils-gold
|
BuildRequires: binutils-gold
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
BuildRequires: config(suse-module-tools)
|
||||||
%if ! 0%{?bootstrap}
|
%if ! 0%{?bootstrap}
|
||||||
BuildRequires: docbook-xsl-stylesheets
|
BuildRequires: docbook-xsl-stylesheets
|
||||||
%endif
|
%endif
|
||||||
@ -467,6 +468,11 @@ Group: System/Kernel
|
|||||||
Url: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
|
Url: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
|
||||||
PreReq: /bin/rm /usr/bin/stat %insserv_prereq %fillup_prereq /usr/sbin/groupadd /usr/bin/getent /sbin/mkinitrd /usr/bin/sg_inq
|
PreReq: /bin/rm /usr/bin/stat %insserv_prereq %fillup_prereq /usr/sbin/groupadd /usr/bin/getent /sbin/mkinitrd /usr/bin/sg_inq
|
||||||
Requires(post): lib%{udevpkgname}%{udev_major}
|
Requires(post): lib%{udevpkgname}%{udev_major}
|
||||||
|
%if %{defined regenerate_initrd_post}
|
||||||
|
Requires(post): config(suse-module-tools)
|
||||||
|
Requires(postun): config(suse-module-tools)
|
||||||
|
Requires(posttrans): config(suse-module-tools)
|
||||||
|
%endif
|
||||||
Conflicts: systemd < 39
|
Conflicts: systemd < 39
|
||||||
Conflicts: aaa_base < 11.5
|
Conflicts: aaa_base < 11.5
|
||||||
Conflicts: filesystem < 11.5
|
Conflicts: filesystem < 11.5
|
||||||
@ -1128,9 +1134,14 @@ if [ "${YAST_IS_RUNNING}" != "instsys" ]; then
|
|||||||
if [ -e %{_localstatedir}/lib/no_initrd_recreation_by_suspend ]; then
|
if [ -e %{_localstatedir}/lib/no_initrd_recreation_by_suspend ]; then
|
||||||
echo "Skipping recreation of existing initial ramdisks, due"
|
echo "Skipping recreation of existing initial ramdisks, due"
|
||||||
echo "to presence of %{_localstatedir}/lib/no_initrd_recreation_by_suspend"
|
echo "to presence of %{_localstatedir}/lib/no_initrd_recreation_by_suspend"
|
||||||
|
%if %{defined regenerate_initrd_post}
|
||||||
|
else
|
||||||
|
%regenerate_initrd_post
|
||||||
|
%else
|
||||||
elif [ -x /sbin/mkinitrd ]; then
|
elif [ -x /sbin/mkinitrd ]; then
|
||||||
[ -x /sbin/mkinitrd_setup ] && /sbin/mkinitrd_setup
|
[ -x /sbin/mkinitrd_setup ] && /sbin/mkinitrd_setup
|
||||||
/sbin/mkinitrd || :
|
/sbin/mkinitrd || :
|
||||||
|
%endif
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -1142,12 +1153,22 @@ if [ "${YAST_IS_RUNNING}" != "instsys" ]; then
|
|||||||
if [ -e %{_localstatedir}/lib/no_initrd_recreation_by_suspend ]; then
|
if [ -e %{_localstatedir}/lib/no_initrd_recreation_by_suspend ]; then
|
||||||
echo "Skipping recreation of existing initial ramdisks, due"
|
echo "Skipping recreation of existing initial ramdisks, due"
|
||||||
echo "to presence of %{_localstatedir}/lib/no_initrd_recreation_by_suspend"
|
echo "to presence of %{_localstatedir}/lib/no_initrd_recreation_by_suspend"
|
||||||
|
%if %{defined regenerate_initrd_post}
|
||||||
|
else
|
||||||
|
%regenerate_initrd_post
|
||||||
|
%else
|
||||||
elif [ -x /sbin/mkinitrd ]; then
|
elif [ -x /sbin/mkinitrd ]; then
|
||||||
[ -x /sbin/mkinitrd_setup ] && /sbin/mkinitrd_setup
|
[ -x /sbin/mkinitrd_setup ] && /sbin/mkinitrd_setup
|
||||||
/sbin/mkinitrd || :
|
/sbin/mkinitrd || :
|
||||||
|
%endif
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
%if %{defined regenerate_initrd_post}
|
||||||
|
%posttrans -n %{udevpkgname}
|
||||||
|
%regenerate_initrd_posttrans
|
||||||
|
%endif
|
||||||
|
|
||||||
%post -n lib%{udevpkgname}%{udev_major} -p /sbin/ldconfig
|
%post -n lib%{udevpkgname}%{udev_major} -p /sbin/ldconfig
|
||||||
|
|
||||||
%postun -n lib%{udevpkgname}%{udev_major} -p /sbin/ldconfig
|
%postun -n lib%{udevpkgname}%{udev_major} -p /sbin/ldconfig
|
||||||
|
Loading…
Reference in New Issue
Block a user