Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
f78d34ff7b
!55 [sync] PR-54: sync some patches from upstream
From: @openeuler-sync-bot 
Reviewed-by: @jiangheng12 
Signed-off-by: @jiangheng12
2025-02-14 01:02:52 +00:00
xh
e161b3c19d sync some patches from upstream
(cherry picked from commit e1d88949aae977feaff877b9b31a047caa16b1a6)
2025-02-13 16:07:44 +08:00
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
4 changed files with 66 additions and 7 deletions

View File

@ -0,0 +1,32 @@
From 2b185d6bb1eda7e5bdd885afc88bf404d2c1f861 Mon Sep 17 00:00:00 2001
From: Lukas Nykryn <lnykryn@redhat.com>
Date: Fri, 1 Mar 2024 14:36:45 +0100
Subject: [PATCH] rename_device: free path after it is used
Conflict: NA
Reference: https://github.com/fedora-sysv/initscripts/commit/2b185d6bb1eda7e5bdd885afc88bf404d2c1f861
---
src/rename_device.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/rename_device.c b/src/rename_device.c
index 0d29f64d..e6b09f45 100644
--- a/src/rename_device.c
+++ b/src/rename_device.c
@@ -180,7 +180,7 @@ struct netdev *get_configs() {
return ret;
}
for (x = 0; x < ncfgs; x++ ) {
- char *path;
+ char *path = NULL;
char *devname, *hwaddr;
int vlan;
gchar *contents, **lines;
@@ -193,6 +193,7 @@ struct netdev *get_configs() {
cfgs[x]->d_name) == -1)
continue;
g_file_get_contents(path, &contents, NULL, NULL);
+ free(path);
if (!contents)
continue;
lines = g_strsplit(contents,"\n", 0);

Binary file not shown.

BIN
initscripts-10.17.tar.gz Normal file

Binary file not shown.

View File

@ -19,8 +19,8 @@ Requires: gawk \
Name: initscripts
Summary: Basic support for legacy System V init scripts
Version: 10.12
Release: 1
Version: 10.17
Release: 3
License: GPLv2
@ -52,9 +52,8 @@ BuildRequires: setup
%{?systemd_requires}
BuildRequires: systemd
Provides: /sbin/service
Obsoletes: %{name} < 10.10-1
Obsoletes: %{name} < 9.82-2
# === PATCHES =================================================================
@ -83,6 +82,7 @@ Obsoletes: %{name} < 10.10-1
# Patches to be removed -- deprecated functionality which shall be removed at
# --------------------- some point in the future:
Patch0: backport-run-ifdown-on-all-interfaces.patch
Patch1: backport-rename_device-free-path-after-it-is-used.patch
Patch9000: bugfix-initscripts-add-udev-wait-dependency-for-network.patch
@ -110,7 +110,6 @@ Requires: systemd
Provides: /sbin/service
Obsoletes: %{name} < 10.10-1
%description -n initscripts-service
This package provides service command.
@ -310,8 +309,6 @@ fi
# ---------------
%ghost %config(noreplace, missingok) %verify(not md5 size mtime) %{_sysconfdir}/rc.d/rc.local
%{_sysconfdir}/rc.d/init.d/functions
# RC symlinks:
@ -391,6 +388,36 @@ fi
# =============================================================================
%changelog
* Thu Feb 13 2024 xinghe <xinghe2@h-partners.com> - 10.17-3
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:rename_device: free path after it is used
* 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