diff --git a/run-ifdown-on-all-interfaces.patch b/backport-run-ifdown-on-all-interfaces.patch similarity index 100% rename from run-ifdown-on-all-interfaces.patch rename to backport-run-ifdown-on-all-interfaces.patch diff --git a/initscripts-10.06.tar.gz b/initscripts-10.06.tar.gz deleted file mode 100644 index c98da33332e03139b2dd77600fca79feec3ad9e9..0000000000000000000000000000000000000000 Binary files a/initscripts-10.06.tar.gz and /dev/null differ diff --git a/initscripts-10.12.tar.gz b/initscripts-10.12.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..473e2a382bda30b2b0c434db5b7ec8f366b7849b Binary files /dev/null and b/initscripts-10.12.tar.gz differ diff --git a/initscripts.spec b/initscripts.spec index d846fe2c8a0e2198ce8ca973ea53da8d4694de19..3c5c2baf2032e3d02c1f5144c6e9ba30be63c273 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -19,8 +19,8 @@ Requires: gawk \ Name: initscripts Summary: Basic support for legacy System V init scripts -Version: 10.06 -Release: 2 +Version: 10.12 +Release: 1 License: GPLv2 @@ -35,6 +35,8 @@ Requires: procps-ng Requires: setup Requires: systemd Requires: util-linux +Requires: chkconfig +Requires: initscripts-service Requires(pre): shadow-utils Requires(post): coreutils @@ -52,7 +54,7 @@ BuildRequires: systemd Provides: /sbin/service -Obsoletes: %{name} < 9.82-2 +Obsoletes: %{name} < 10.10-1 # === PATCHES ================================================================= @@ -80,7 +82,7 @@ Obsoletes: %{name} < 9.82-2 # Patches to be removed -- deprecated functionality which shall be removed at # --------------------- some point in the future: -Patch6000: run-ifdown-on-all-interfaces.patch +Patch0: backport-run-ifdown-on-all-interfaces.patch Patch9000: bugfix-initscripts-add-udev-wait-dependency-for-network.patch @@ -98,6 +100,23 @@ other legacy tools & utilities. # === SUBPACKAGES ============================================================= +%package -n initscripts-service +Summary: Support for service command +BuildArch: noarch + +%shared_requirements + +Requires: systemd + +Provides: /sbin/service + +Obsoletes: %{name} < 10.10-1 + +%description -n initscripts-service +This package provides service command. + +# --------------- + %package -n network-scripts Summary: Legacy scripts for manipulating of network devices Requires: %{name}%{?_isa} = %{version}-%{release} @@ -124,6 +143,8 @@ Requires(postun): %{_sbindir}/update-alternatives Obsoletes: %{name} < 9.82-2 +Provides: deprecated() + %description -n network-scripts This package contains the legacy scripts for activating & deactivating of most network interfaces. It also provides a legacy version of 'network' service. @@ -185,6 +206,9 @@ Obsoletes: %{name} < 9.82-2 This package provides script & configuration file for setting up read-only root support. Additional configuration is required after installation. +Please note that readonly-root package is considered deprecated with limited support. +Please use systemd-volatile-root functionality instead, if possible. + # === BUILD INSTRUCTIONS ====================================================== %prep @@ -299,7 +323,6 @@ fi %{_bindir}/* %{_sbindir}/consoletype %{_sbindir}/genhostid -%{_sbindir}/service %{_libexecdir}/import-state %{_libexecdir}/loadmodules @@ -311,10 +334,20 @@ fi %{_udevrulesdir}/* %{_mandir}/man1/* -%{_mandir}/man8/service.* # ============================================================================= +%files -n initscripts-service + +%dir %{_libexecdir}/%{name} +%dir %{_libexecdir}/%{name}/legacy-actions + +%{_sbindir}/service + +%{_mandir}/man8/service.* + +# --------------- + %files -n network-scripts %doc doc/examples/ %dir %{_sysconfdir}/sysconfig/network-scripts @@ -358,6 +391,12 @@ fi # ============================================================================= %changelog +* Mon Dec 20 2021 xinghe - 10.12-1 +- Type:requirements +- ID:NA +- SUG:NA +- DESC: update initscripts to 10.12 + * Mon Aug 02 2021 chenyanpanHW - 10.06-2 - DESC: delete -S git from %autosetup, and delete BuildRequires git diff --git a/remove-rename_device_lock-when-process-does-not-exis.patch b/remove-rename_device_lock-when-process-does-not-exis.patch index df70840e6a764273987a1d21ce8ac85c4dd51d83..301388306ea06d4e4b489f18a9bd2c0be9913ce3 100644 --- a/remove-rename_device_lock-when-process-does-not-exis.patch +++ b/remove-rename_device_lock-when-process-does-not-exis.patch @@ -12,7 +12,7 @@ index c39f447..5e49bbd 100644 --- a/src/rename_device.c +++ b/src/rename_device.c @@ -278,6 +278,13 @@ char *get_config_by_hwaddr(char *hwaddr, char *current) { - return first; + return name; } +int pid_exist(int pid)