Compare commits
No commits in common. "f78d34ff7bc87c09660e63b1dd478cbdf28fd6e4" and "cf398639d2b6935ee48ed7e4d1d29aa42c5731c6" have entirely different histories.
f78d34ff7b
...
cf398639d2
@ -1,32 +0,0 @@
|
|||||||
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);
|
|
||||||
BIN
initscripts-10.12.tar.gz
Normal file
BIN
initscripts-10.12.tar.gz
Normal file
Binary file not shown.
Binary file not shown.
@ -19,8 +19,8 @@ Requires: gawk \
|
|||||||
|
|
||||||
Name: initscripts
|
Name: initscripts
|
||||||
Summary: Basic support for legacy System V init scripts
|
Summary: Basic support for legacy System V init scripts
|
||||||
Version: 10.17
|
Version: 10.12
|
||||||
Release: 3
|
Release: 1
|
||||||
|
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
|
|
||||||
@ -52,8 +52,9 @@ BuildRequires: setup
|
|||||||
%{?systemd_requires}
|
%{?systemd_requires}
|
||||||
BuildRequires: systemd
|
BuildRequires: systemd
|
||||||
|
|
||||||
|
Provides: /sbin/service
|
||||||
|
|
||||||
Obsoletes: %{name} < 9.82-2
|
Obsoletes: %{name} < 10.10-1
|
||||||
|
|
||||||
# === PATCHES =================================================================
|
# === PATCHES =================================================================
|
||||||
|
|
||||||
@ -82,7 +83,6 @@ Obsoletes: %{name} < 9.82-2
|
|||||||
# Patches to be removed -- deprecated functionality which shall be removed at
|
# Patches to be removed -- deprecated functionality which shall be removed at
|
||||||
# --------------------- some point in the future:
|
# --------------------- some point in the future:
|
||||||
Patch0: backport-run-ifdown-on-all-interfaces.patch
|
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
|
Patch9000: bugfix-initscripts-add-udev-wait-dependency-for-network.patch
|
||||||
@ -110,6 +110,7 @@ Requires: systemd
|
|||||||
|
|
||||||
Provides: /sbin/service
|
Provides: /sbin/service
|
||||||
|
|
||||||
|
Obsoletes: %{name} < 10.10-1
|
||||||
|
|
||||||
%description -n initscripts-service
|
%description -n initscripts-service
|
||||||
This package provides service command.
|
This package provides service command.
|
||||||
@ -309,6 +310,8 @@ fi
|
|||||||
|
|
||||||
# ---------------
|
# ---------------
|
||||||
|
|
||||||
|
%ghost %config(noreplace, missingok) %verify(not md5 size mtime) %{_sysconfdir}/rc.d/rc.local
|
||||||
|
|
||||||
%{_sysconfdir}/rc.d/init.d/functions
|
%{_sysconfdir}/rc.d/init.d/functions
|
||||||
|
|
||||||
# RC symlinks:
|
# RC symlinks:
|
||||||
@ -388,36 +391,6 @@ fi
|
|||||||
# =============================================================================
|
# =============================================================================
|
||||||
|
|
||||||
%changelog
|
%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
|
* Mon Dec 20 2021 xinghe <xinghe2@huawei.com> - 10.12-1
|
||||||
- Type:requirements
|
- Type:requirements
|
||||||
- ID:NA
|
- ID:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user