Skip to content

Commit 95ce078

Browse files
committed
rename_device: Remove rename_device functionality (1/2)
Functionality of rename_device is moved to a better suited place - ifcfg-devname.
1 parent c28529c commit 95ce078

File tree

4 files changed

+1
-427
lines changed

4 files changed

+1
-427
lines changed

initscripts.spec

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ Requires: systemd
3636
Requires: util-linux
3737
Requires: chkconfig
3838
Requires: initscripts-service
39-
Requires: initscripts-rename-device
4039

4140
Requires(pre): shadow-utils
4241
Requires(post): coreutils
@@ -90,16 +89,6 @@ other legacy tools & utilities.
9089

9190
# === SUBPACKAGES =============================================================
9291

93-
%package -n initscripts-rename-device
94-
Summary: Udev helper utility that provides network interface naming
95-
96-
%shared_requirements
97-
98-
%description -n initscripts-rename-device
99-
Udev helper utility that provides network interface naming
100-
101-
# ---------------
102-
10392
%package -n initscripts-service
10493
Summary: Support for service command
10594
BuildArch: noarch
@@ -336,14 +325,6 @@ fi
336325

337326
# =============================================================================
338327

339-
%files -n initscripts-rename-device
340-
341-
%{_prefix}/lib/udev/rename_device
342-
343-
%{_udevrulesdir}/*
344-
345-
# ---------------
346-
347328
%files -n initscripts-service
348329

349330
%dir %{_libexecdir}/%{name}

src/Makefile

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,17 @@ CC = gcc
2121
CFLAGS += $(RPM_OPT_FLAGS) -Wall -D_GNU_SOURCE -fPIE
2222
LDFLAGS += $(RPM_LD_FLAGS) -pie -z relro -z now
2323

24-
PROGS = consoletype genhostid rename_device usernetctl usleep
24+
PROGS = consoletype genhostid usernetctl usleep
2525

2626
all: $(PROGS)
2727

2828
install: all
2929
install -m 0755 -d $(DESTDIR)$(bindir)
3030
install -m 0755 -d $(DESTDIR)$(sbindir)
31-
install -m 0755 -d $(DESTDIR)$(libdir)/udev
3231
install -m 0755 build/usleep $(DESTDIR)$(bindir)
3332
install -m 0755 build/consoletype $(DESTDIR)$(sbindir)
3433
install -m 0755 build/genhostid $(DESTDIR)$(sbindir)
3534
install -m 0755 build/usernetctl $(DESTDIR)$(sbindir)
36-
install -m 0755 build/rename_device $(DESTDIR)$(libdir)/udev
3735

3836
clean:
3937
rm -f build/*
@@ -52,13 +50,6 @@ build/genhostid.o: genhostid.c
5250
$(CC) $(CFLAGS) -c -o $@ $^
5351

5452

55-
rename_device: build/rename_device.o
56-
$(CC) $(LDFLAGS) -o build/$@ $^ `pkg-config glib-2.0 --libs`
57-
58-
build/rename_device.o: rename_device.c
59-
$(CC) $(CFLAGS) -c -o $@ $^ `pkg-config glib-2.0 --cflags`
60-
61-
6253
usernetctl: build/usernetctl.o
6354
$(CC) $(LDFLAGS) -o build/$@ $^
6455

0 commit comments

Comments
 (0)