Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
f713bc9c30
!46 [sync] PR-38: delete Requires:dbus-tools
From: @openeuler-sync-bot 
Reviewed-by: @zengwefeng 
Signed-off-by: @zengwefeng
2023-06-19 12:19:00 +00:00
eaglegai
0329913526 delete Requires:dbus-tools
(cherry picked from commit b2987ab62e2d311f9dc4cc39d5588ac2aa867807)
2023-06-19 19:42:41 +08:00
openeuler-ci-bot
88c7ae17ba
!45 [sync] PR-35: update initscripts to 10.17-1
From: @openeuler-sync-bot 
Reviewed-by: @zengwefeng 
Signed-off-by: @zengwefeng
2023-06-19 09:27:59 +00:00
eaglegai
b67489ed43 update initscripts to 10.17-1
(cherry picked from commit bc46ac4729162d4168b967ed5361afbe3a2727c7)
2023-06-19 10:06:48 +08:00
openeuler-ci-bot
5acc9d99e9
!33 [sync] PR-31: remove redundant provide for service cmd and delete unnecessary obseletes to fix upgrade problem
From: @openeuler-sync-bot 
Reviewed-by: @zengwefeng 
Signed-off-by: @zengwefeng
2022-10-08 08:10:00 +00:00
gaoxingwang
3923398d39 remove redundant provide for service cmd and delete unnecessary obseletes to fix upgrade problem
(cherry picked from commit 7e92238248176f5792af7c446991420245b03b46)
2022-10-08 14:59:56 +08:00
openeuler-ci-bot
72f14001c1
!28 [sync] PR-23: Initscripts no looger care about rc.local
From: @openeuler-sync-bot 
Reviewed-by: @zengwefeng 
Signed-off-by: @zengwefeng
2022-06-30 11:55:17 +00:00
XWwalker
e38bf1fd4f Initscripts no looger care about rc.local
(cherry picked from commit 85587c1ce3edbc19943ea206e1ab1a04b33f32f8)
2022-06-30 16:14:08 +08:00
openeuler-ci-bot
cf398639d2 !16 update initscripts to 10.12
Merge pull request !16 from xinghe/openEuler-22.03-LTS-Next
2021-12-23 07:06:58 +00:00
19909236985
6f23481a78 update initscripts to 10.12 2021-12-20 10:35:04 +08:00
5 changed files with 67 additions and 8 deletions

Binary file not shown.

BIN
initscripts-10.17.tar.gz Normal file

Binary file not shown.

View File

@ -19,7 +19,7 @@ Requires: gawk \
Name: initscripts
Summary: Basic support for legacy System V init scripts
Version: 10.06
Version: 10.17
Release: 2
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
@ -50,7 +52,6 @@ BuildRequires: setup
%{?systemd_requires}
BuildRequires: systemd
Provides: /sbin/service
Obsoletes: %{name} < 9.82-2
@ -80,7 +81,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 +99,22 @@ other legacy tools & utilities.
# === SUBPACKAGES =============================================================
%package -n initscripts-service
Summary: Support for service command
BuildArch: noarch
%shared_requirements
Requires: systemd
Provides: /sbin/service
%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 +141,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 +204,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
@ -286,8 +308,6 @@ fi
# ---------------
%ghost %config(noreplace, missingok) %verify(not md5 size mtime) %{_sysconfdir}/rc.d/rc.local
%{_sysconfdir}/rc.d/init.d/functions
# RC symlinks:
@ -299,7 +319,6 @@ fi
%{_bindir}/*
%{_sbindir}/consoletype
%{_sbindir}/genhostid
%{_sbindir}/service
%{_libexecdir}/import-state
%{_libexecdir}/loadmodules
@ -311,10 +330,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 +387,36 @@ fi
# =============================================================================
%changelog
* Mon Feb 20 2023 gaihuiying <eaglegai@163.com> - 10.17-2
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:delete Requires:dbus-tools
* Fri Oct 14 2022 gaihuiying <eaglegai@163.com> - 10.17-1
- Type:requirement
- ID:NA
- SUG:NA
- DESC:update initscripts to 10.17-1
* Thu Sep 29 2022 gaoxingwang <gaoxingwang1@huawei.com> - 10.12-3
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:remove redundant provide for service cmd and delete unnecessary obseletes to fix upgrade problem
* Thu Jun 30 2022 xingwei <xingwei14@h-partners.com> - 10.12-2
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:Initscripts no looger care about rc.local
* Mon Dec 20 2021 xinghe <xinghe2@huawei.com> - 10.12-1
- Type:requirements
- ID:NA
- SUG:NA
- DESC: update initscripts to 10.12
* Mon Aug 02 2021 chenyanpanHW <chenyanpan@huawei.com> - 10.06-2
- DESC: delete -S git from %autosetup, and delete BuildRequires git

View File

@ -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)