From 4207e46622f584eb5f0cc10bbfd36f92f001a2e2 Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Wed, 22 Feb 2017 12:26:09 -0600 Subject: [PATCH] move init.d examples under support and install them --- README.md | 4 ---- support/Makefile | 2 +- {init.d.misc => support/init.d.examples}/.gitignore | 0 {init.d.misc => support/init.d.examples}/Makefile | 6 ++++-- support/init.d.examples/README.md | 3 +++ {init.d.misc => support/init.d.examples}/avahi-dnsconfd.in | 0 {init.d.misc => support/init.d.examples}/avahid.in | 0 {init.d.misc => support/init.d.examples}/dbus.in | 0 {init.d.misc => support/init.d.examples}/dhcpcd.in | 0 {init.d.misc => support/init.d.examples}/dnsmasq.in | 0 {init.d.misc => support/init.d.examples}/hald.in | 0 {init.d.misc => support/init.d.examples}/named.in | 0 {init.d.misc => support/init.d.examples}/ntpd.in | 0 {init.d.misc => support/init.d.examples}/openvpn.in | 0 {init.d.misc => support/init.d.examples}/polkitd.in | 0 {init.d.misc => support/init.d.examples}/sshd.in | 0 {init.d.misc => support/init.d.examples}/wpa_supplicant.in | 0 17 files changed, 8 insertions(+), 7 deletions(-) rename {init.d.misc => support/init.d.examples}/.gitignore (100%) rename {init.d.misc => support/init.d.examples}/Makefile (72%) create mode 100644 support/init.d.examples/README.md rename {init.d.misc => support/init.d.examples}/avahi-dnsconfd.in (100%) rename {init.d.misc => support/init.d.examples}/avahid.in (100%) rename {init.d.misc => support/init.d.examples}/dbus.in (100%) rename {init.d.misc => support/init.d.examples}/dhcpcd.in (100%) rename {init.d.misc => support/init.d.examples}/dnsmasq.in (100%) rename {init.d.misc => support/init.d.examples}/hald.in (100%) rename {init.d.misc => support/init.d.examples}/named.in (100%) rename {init.d.misc => support/init.d.examples}/ntpd.in (100%) rename {init.d.misc => support/init.d.examples}/openvpn.in (100%) rename {init.d.misc => support/init.d.examples}/polkitd.in (100%) rename {init.d.misc => support/init.d.examples}/sshd.in (100%) rename {init.d.misc => support/init.d.examples}/wpa_supplicant.in (100%) diff --git a/README.md b/README.md index 9e61d193..80b28a9b 100644 --- a/README.md +++ b/README.md @@ -72,10 +72,6 @@ Obviously, if you're installing this onto a system that does not use OpenRC by default then you may wish to backup the above listed files, remove them and then install so that the OS hooks into OpenRC. -`init.d.misc` is not installed by default as the scripts will need -tweaking on a per distro basis. They are also non essential to the -operation of the system. - ## Reporting Bugs If you are using Gentoo Linux, bugs can be filed on their bugzilla under diff --git a/support/Makefile b/support/Makefile index a183e9f7..c8d6ffd2 100644 --- a/support/Makefile +++ b/support/Makefile @@ -11,7 +11,7 @@ MK= ../mk include ${MK}/os.mk -SUBDIR= deptree2dot openvpn +SUBDIR= deptree2dot init.d.examples openvpn ifeq (${OS},Linux) SUBDIR+= sysvinit diff --git a/init.d.misc/.gitignore b/support/init.d.examples/.gitignore similarity index 100% rename from init.d.misc/.gitignore rename to support/init.d.examples/.gitignore diff --git a/init.d.misc/Makefile b/support/init.d.examples/Makefile similarity index 72% rename from init.d.misc/Makefile rename to support/init.d.examples/Makefile index ce973c1b..b65c1fd4 100644 --- a/init.d.misc/Makefile +++ b/support/init.d.examples/Makefile @@ -1,9 +1,11 @@ -DIR= ${INITDIR} +DIR= ${DATADIR}/support/init.d.examples +INC= README.md SRCS= avahi-dnsconfd.in avahid.in dhcpcd.in dbus.in \ hald.in named.in ntpd.in \ openvpn.in polkitd.in sshd.in wpa_supplicant.in +BIN= ${OBJS} -MK= ../mk +MK= ../../mk SED_EXTRA+= -e 's:@VARBASE@:/var:g' diff --git a/support/init.d.examples/README.md b/support/init.d.examples/README.md new file mode 100644 index 00000000..2c32fd6f --- /dev/null +++ b/support/init.d.examples/README.md @@ -0,0 +1,3 @@ +The service scripts in this directory are meant as examples only. +They are not installed by default as the scripts will need tweaking on a +per distro basis. They are also non essential to the operation of the system. diff --git a/init.d.misc/avahi-dnsconfd.in b/support/init.d.examples/avahi-dnsconfd.in similarity index 100% rename from init.d.misc/avahi-dnsconfd.in rename to support/init.d.examples/avahi-dnsconfd.in diff --git a/init.d.misc/avahid.in b/support/init.d.examples/avahid.in similarity index 100% rename from init.d.misc/avahid.in rename to support/init.d.examples/avahid.in diff --git a/init.d.misc/dbus.in b/support/init.d.examples/dbus.in similarity index 100% rename from init.d.misc/dbus.in rename to support/init.d.examples/dbus.in diff --git a/init.d.misc/dhcpcd.in b/support/init.d.examples/dhcpcd.in similarity index 100% rename from init.d.misc/dhcpcd.in rename to support/init.d.examples/dhcpcd.in diff --git a/init.d.misc/dnsmasq.in b/support/init.d.examples/dnsmasq.in similarity index 100% rename from init.d.misc/dnsmasq.in rename to support/init.d.examples/dnsmasq.in diff --git a/init.d.misc/hald.in b/support/init.d.examples/hald.in similarity index 100% rename from init.d.misc/hald.in rename to support/init.d.examples/hald.in diff --git a/init.d.misc/named.in b/support/init.d.examples/named.in similarity index 100% rename from init.d.misc/named.in rename to support/init.d.examples/named.in diff --git a/init.d.misc/ntpd.in b/support/init.d.examples/ntpd.in similarity index 100% rename from init.d.misc/ntpd.in rename to support/init.d.examples/ntpd.in diff --git a/init.d.misc/openvpn.in b/support/init.d.examples/openvpn.in similarity index 100% rename from init.d.misc/openvpn.in rename to support/init.d.examples/openvpn.in diff --git a/init.d.misc/polkitd.in b/support/init.d.examples/polkitd.in similarity index 100% rename from init.d.misc/polkitd.in rename to support/init.d.examples/polkitd.in diff --git a/init.d.misc/sshd.in b/support/init.d.examples/sshd.in similarity index 100% rename from init.d.misc/sshd.in rename to support/init.d.examples/sshd.in diff --git a/init.d.misc/wpa_supplicant.in b/support/init.d.examples/wpa_supplicant.in similarity index 100% rename from init.d.misc/wpa_supplicant.in rename to support/init.d.examples/wpa_supplicant.in