From 1a436be4b16b6eed3f29b192ace8435daaf041f6 Mon Sep 17 00:00:00 2001
From: "David Kaspar [Dee'Kej]" <dkaspar@redhat.com>
Date: Thu, 31 May 2018 12:08:05 +0200
Subject: nis-domainname.service removed

  It has been moved into the hostname package:
  https://src.fedoraproject.org/rpms/hostname/pull-request/1
---
 initscripts.spec                              |  7 +++----
 po/Makefile                                   |  1 -
 usr/lib/systemd/nis-domainname                |  9 ---------
 usr/lib/systemd/system/nis-domainname.service | 13 -------------
 4 files changed, 3 insertions(+), 27 deletions(-)
 delete mode 100755 usr/lib/systemd/nis-domainname
 delete mode 100644 usr/lib/systemd/system/nis-domainname.service

diff --git a/initscripts.spec b/initscripts.spec
index 0a3209b4..c2e1087d 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -131,7 +131,7 @@ touch %{buildroot}%{_sbindir}/ifdown
 # ---------------
 
 %post
-%systemd_post nis-domainname.service import-state.service loadmodules.service readonly-root.service
+%systemd_post import-state.service loadmodules.service readonly-root.service
 
 chkconfig --add network > /dev/null 2>&1 || :
 chkconfig --add netconsole > /dev/null 2>&1 || :
@@ -146,7 +146,7 @@ chkconfig --add netconsole > /dev/null 2>&1 || :
 # ---------------
 
 %preun
-%systemd_preun nis-domainname.service import-state.service loadmodules.service readonly-root.service
+%systemd_preun import-state.service loadmodules.service readonly-root.service
 
 if [ $1 -eq 0 ]; then
   chkconfig --del network > /dev/null 2>&1 || :
@@ -157,7 +157,7 @@ fi
 # ---------------
 
 %postun
-%systemd_postun nis-domainname.service import-state.service loadmodules.service readonly-root.service
+%systemd_postun import-state.service loadmodules.service readonly-root.service
 
 # === PACKAGING INSTRUCTIONS ==================================================
 
@@ -213,7 +213,6 @@ fi
 
 %{_prefix}/lib/systemd/import-state
 %{_prefix}/lib/systemd/loadmodules
-%{_prefix}/lib/systemd/nis-domainname
 %{_prefix}/lib/systemd/readonly-root
 %{_prefix}/lib/systemd/system/*
 %{_prefix}/lib/udev/rename_device
diff --git a/po/Makefile b/po/Makefile
index 0855db87..49a403f5 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -31,7 +31,6 @@ POTFILES    = $(shell ls ../network-scripts/* | grep -v ifcfg-) \
 	..$(sbindir)/service \
 	..$(libdir)/systemd/import-state \
 	..$(libdir)/systemd/loadmodules \
-	..$(libdir)/systemd/nis-domainname \
 	..$(libdir)/systemd/readonly-root \
 	..$(sysconfdir)/rc.d/init.d/*\
 
diff --git a/usr/lib/systemd/nis-domainname b/usr/lib/systemd/nis-domainname
deleted file mode 100755
index 5c934584..00000000
--- a/usr/lib/systemd/nis-domainname
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/bash
-. /etc/sysconfig/network
-
-if [ -n "${NISDOMAIN}" ] && [ -x /usr/bin/domainname ]; then
-        domainname ${NISDOMAIN}
-        exit $?
-fi
-
-exit 0
diff --git a/usr/lib/systemd/system/nis-domainname.service b/usr/lib/systemd/system/nis-domainname.service
deleted file mode 100644
index 3f8412ae..00000000
--- a/usr/lib/systemd/system/nis-domainname.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Read and set NIS domainname from /etc/sysconfig/network
-Before=ypbind.service yppasswdd.service ypserv.service ypxfrd.service sysinit.target
-DefaultDependencies=no
-Conflicts=shutdown.target
-
-[Service]
-ExecStart=/usr/lib/systemd/nis-domainname
-Type=oneshot
-RemainAfterExit=yes
-
-[Install]
-WantedBy=sysinit.target
-- 
cgit v1.2.1