Skip to content

Commit f43ab1a

Browse files
committed
service: fix rpmlink suse-missing-rclink warnings
1 parent 06be8b2 commit f43ab1a

File tree

2 files changed

+17
-13
lines changed

2 files changed

+17
-13
lines changed

etc/Makefile.am

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -110,19 +110,6 @@ systemv/network: systemv/network.in $(top_builddir)/config.status
110110
@rm -f $@ $@.tmp
111111
@$(substitute_vars) < $< > $@.tmp && mv $@.tmp $@
112112

113-
install-data-hook:
114-
if systemv_service
115-
$(MKDIR_P) "$(DESTDIR)$(wicked_sbindir)"
116-
$(LN_S) -f "$(systemv_initdir)/wickedd" "$(DESTDIR)$(wicked_sbindir)/rcwickedd"
117-
$(LN_S) -f "$(systemv_initdir)/network" "$(DESTDIR)$(wicked_sbindir)/rcnetwork"
118-
endif
119-
120-
uninstall-hook:
121-
if systemv_service
122-
rm -f "$(DESTDIR)$(wicked_sbindir)/rcwickedd"
123-
rm -f "$(DESTDIR)$(wicked_sbindir)/rcnetwork"
124-
endif
125-
126113
check-local:
127114
@for i in $(systemv_init_SCRIPTS) ; \
128115
do \

wicked.spec.in

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,17 @@ make install DESTDIR=${RPM_BUILD_ROOT}
171171
%__rm -f ${RPM_BUILD_ROOT}%_libdir/libwicked*.*a
172172
# create ghost directory
173173
%__mkdir_p -m 0750 ${RPM_BUILD_ROOT}%_localstatedir/run/wicked
174+
%if %{with systemd}
175+
ln -sf %_sbindir/service ${RPM_BUILD_ROOT}%_sbindir/rcwicked
176+
ln -sf %_sbindir/service ${RPM_BUILD_ROOT}%_sbindir/rcwickedd
177+
ln -sf %_sbindir/service ${RPM_BUILD_ROOT}%_sbindir/rcwickedd-nanny
178+
ln -sf %_sbindir/service ${RPM_BUILD_ROOT}%_sbindir/rcwickedd-dhcp6
179+
ln -sf %_sbindir/service ${RPM_BUILD_ROOT}%_sbindir/rcwickedd-dhcp4
180+
ln -sf %_sbindir/service ${RPM_BUILD_ROOT}%_sbindir/rcwickedd-auto4
181+
%else
182+
ln -sf %_sysconfdir/init.d/wickedd ${RPM_BUILD_ROOT}%_sbindir/rcwickedd
183+
ln -sf %_sysconfdir/init.d/network ${RPM_BUILD_ROOT}%_sbindir/rcnetwork
184+
%endif
174185

175186
%if %{with systemd}
176187

@@ -296,6 +307,12 @@ fi
296307
/sbin/ifdown
297308
/sbin/ifstatus
298309
/sbin/ifprobe
310+
%_sbindir/rcwickedd-nanny
311+
%_sbindir/rcwickedd-dhcp6
312+
%_sbindir/rcwickedd-dhcp4
313+
%_sbindir/rcwickedd-auto4
314+
%_sbindir/rcwickedd
315+
%_sbindir/rcwicked
299316

300317
%else
301318

0 commit comments

Comments
 (0)