From b746c9319f1c5c323ca2c700229fd72ec591624b Mon Sep 17 00:00:00 2001 From: Evangelos Foutras Date: Sat, 15 Nov 2014 14:40:22 +0200 Subject: [PATCH] Rename SYSTEMDDIR to SERVICEDIR in shorewallrc.* This was omitted from commit e3b1034 (Change SYSTEMDDIR to SERVICEDIR). Signed-off-by: Evangelos Foutras Signed-off-by: Tom Eastep --- Shorewall-core/shorewallrc.apple | 2 +- Shorewall-core/shorewallrc.archlinux | 2 +- Shorewall-core/shorewallrc.cygwin | 2 +- Shorewall-core/shorewallrc.debian | 2 +- Shorewall-core/shorewallrc.default | 2 +- Shorewall-core/shorewallrc.redhat | 2 +- Shorewall-core/shorewallrc.slackware | 2 +- Shorewall-core/shorewallrc.suse | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Shorewall-core/shorewallrc.apple b/Shorewall-core/shorewallrc.apple index eb422a4ff..a6df47df2 100644 --- a/Shorewall-core/shorewallrc.apple +++ b/Shorewall-core/shorewallrc.apple @@ -14,7 +14,7 @@ INITDIR= #Unused on OS X INITFILE= #Unused on OS X INITSOURCE= #Unused on OS X ANNOTATED= #Unused on OS X -SYSTEMDDIR= #Unused on OS X +SERVICEDIR= #Unused on OS X SERVICEFILE= #Unused on OS X SYSCONFDIR= #Unused on OS X SPARSE=Yes #Only install $PRODUCT/$PRODUCT.conf in $CONFDIR. diff --git a/Shorewall-core/shorewallrc.archlinux b/Shorewall-core/shorewallrc.archlinux index dd1375d80..947d3ef69 100644 --- a/Shorewall-core/shorewallrc.archlinux +++ b/Shorewall-core/shorewallrc.archlinux @@ -15,7 +15,7 @@ INITFILE= #Name of the product's installed SysV ini INITSOURCE= #Name of the distributed file to be installed as the SysV init script ANNOTATED= #If non-zero, annotated configuration files are installed SYSCONFDIR= #Directory where SysV init parameter files are installed -SYSTEMDDIR=/usr/lib/systemd/system #Directory where .service files are installed (systems running systemd only) +SERVICEDIR=/usr/lib/systemd/system #Directory where .service files are installed (systems running systemd only) SERVICEFILE= #Name of the file to install in $SYSTEMD. Default is $PRODUCT.service SPARSE= #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR VARLIB=/var/lib #Directory where product variable data is stored. diff --git a/Shorewall-core/shorewallrc.cygwin b/Shorewall-core/shorewallrc.cygwin index 72994d46e..3af69794a 100644 --- a/Shorewall-core/shorewallrc.cygwin +++ b/Shorewall-core/shorewallrc.cygwin @@ -14,7 +14,7 @@ INITDIR=/etc/init.d #Unused on Cygwin INITFILE= #Unused on Cygwin INITSOURCE= #Unused on Cygwin ANNOTATED= #Unused on Cygwin -SYSTEMDDIR= #Unused on Cygwin +SERVICEDIR= #Unused on Cygwin SERVICEFILE= #Unused on Cygwin SYSCONFDIR= #Unused on Cygwin SPARSE=Yes #Only install $PRODUCT/$PRODUCT.conf in $CONFDIR. diff --git a/Shorewall-core/shorewallrc.debian b/Shorewall-core/shorewallrc.debian index 345aff337..209096891 100644 --- a/Shorewall-core/shorewallrc.debian +++ b/Shorewall-core/shorewallrc.debian @@ -17,7 +17,7 @@ ANNOTATED= #If non-zero, annotated configuration fi SYSCONFFILE=default.debian #Name of the distributed file to be installed in $SYSCONFDIR SERVICEFILE= #Name of the file to install in $SYSTEMD. Default is $PRODUCT.service SYSCONFDIR=/etc/default #Directory where SysV init parameter files are installed -SYSTEMDDIR= #Directory where .service files are installed (systems running systemd only) +SERVICEDIR= #Directory where .service files are installed (systems running systemd only) SPARSE=Yes #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR VARLIB=/var/lib #Directory where product variable data is stored. VARDIR=${VARLIB}/$PRODUCT #Directory where product variable data is stored. diff --git a/Shorewall-core/shorewallrc.default b/Shorewall-core/shorewallrc.default index 5f875bad0..f8cfcf89f 100644 --- a/Shorewall-core/shorewallrc.default +++ b/Shorewall-core/shorewallrc.default @@ -14,7 +14,7 @@ INITDIR=/etc/init.d #Directory where SysV init scripts are i INITFILE=$PRODUCT #Name of the product's installed SysV init script INITSOURCE=init.sh #Name of the distributed file to be installed as the SysV init script ANNOTATED= #If non-zero, annotated configuration files are installed -SYSTEMDDIR= #Directory where .service files are installed (systems running systemd only) +SERVICEDIR= #Directory where .service files are installed (systems running systemd only) SERVICEFILE= #Name of the file to install in $SYSTEMD. Default is $PRODUCT.service SYSCONFFILE= #Name of the distributed file to be installed in $SYSCONFDIR SYSCONFDIR= #Directory where SysV init parameter files are installed diff --git a/Shorewall-core/shorewallrc.redhat b/Shorewall-core/shorewallrc.redhat index dfc8d1189..d0ac7cc28 100644 --- a/Shorewall-core/shorewallrc.redhat +++ b/Shorewall-core/shorewallrc.redhat @@ -14,7 +14,7 @@ INITDIR=/etc/rc.d/init.d #Directory where SysV init scripts are i INITFILE=$PRODUCT #Name of the product's installed SysV init script INITSOURCE=init.fedora.sh #Name of the distributed file to be installed as the SysV init script ANNOTATED= #If non-zero, annotated configuration files are installed -SYSTEMDDIR=/lib/systemd/system #Directory where .service files are installed (systems running systemd only) +SERVICEDIR=/lib/systemd/system #Directory where .service files are installed (systems running systemd only) SYSCONFFILE=sysconfig #Name of the distributed file to be installed as $SYSCONFDIR/$PRODUCT SERVICEFILE= #Name of the file to install in $SYSTEMD. Default is $PRODUCT.service SYSCONFDIR=/etc/sysconfig/ #Directory where SysV init parameter files are installed diff --git a/Shorewall-core/shorewallrc.slackware b/Shorewall-core/shorewallrc.slackware index 4a9a0b0b9..c7f072e38 100644 --- a/Shorewall-core/shorewallrc.slackware +++ b/Shorewall-core/shorewallrc.slackware @@ -15,7 +15,7 @@ AUXINITSOURCE=init.slackware.firewall.sh #Name of the distributed file to be i AUXINITFILE=rc.firewall #Name of the product's installed SysV init script INITSOURCE=init.slackware.$PRODUCT.sh #Name of the distributed file to be installed as a second SysV init script INITFILE=rc.$PRODUCT #Name of the product's installed second init script -SYSTEMDDIR= #Name of the directory where .service files are installed (systems running systemd only) +SERVICEDIR= #Name of the directory where .service files are installed (systems running systemd only) SERVICEFILE= #Name of the file to install in $SYSTEMD. Default is $PRODUCT.service SYSCONFFILE= #Name of the distributed file to be installed in $SYSCONFDIR SYSCONFDIR= #Name of the directory where SysV init parameter files are installed. diff --git a/Shorewall-core/shorewallrc.suse b/Shorewall-core/shorewallrc.suse index 54f35e69a..436409dfa 100644 --- a/Shorewall-core/shorewallrc.suse +++ b/Shorewall-core/shorewallrc.suse @@ -14,7 +14,7 @@ INITDIR=/etc/init.d #Directory where SysV init INITFILE=$PRODUCT #Name of the product's SysV init script INITSOURCE=init.suse.sh #Name of the distributed file to be installed as the SysV init script ANNOTATED= #If non-zero, annotated configuration files are installed -SYSTEMDDIR= #Directory where .service files are installed (systems running systemd only) +SERVICEDIR= #Directory where .service files are installed (systems running systemd only) SERVICEFILE= #Name of the file to install in $SYSTEMD. Default is $PRODUCT.service SYSCONFFILE=sysconfig #Name of the distributed file to be installed in $SYSCONFDIR SYSCONFDIR=/etc/sysconfig/ #Directory where SysV init parameter files are installed