From 5645d667196a531aee4c3d2bc2b712c3581aa8eb Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Mon, 3 Sep 2012 10:52:40 -0700 Subject: [PATCH] Add VARDIR to the shorewallrc files. Signed-off-by: Tom Eastep --- Shorewall-core/shorewallrc.archlinux | 1 + Shorewall-core/shorewallrc.debian | 1 + Shorewall-core/shorewallrc.default | 1 + Shorewall-core/shorewallrc.redhat | 1 + Shorewall-core/shorewallrc.slackware | 1 + Shorewall-core/shorewallrc.suse | 1 + 6 files changed, 6 insertions(+) diff --git a/Shorewall-core/shorewallrc.archlinux b/Shorewall-core/shorewallrc.archlinux index ff4146c2d..cc5d66dd5 100644 --- a/Shorewall-core/shorewallrc.archlinux +++ b/Shorewall-core/shorewallrc.archlinux @@ -18,3 +18,4 @@ SYSCONFDIR= #Directory where SysV init parameter file SYSTEMD= #Directory where .service files are installed (systems running systemd only) SPARSE= #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.debian b/Shorewall-core/shorewallrc.debian index a2ebf8bd0..de223396b 100644 --- a/Shorewall-core/shorewallrc.debian +++ b/Shorewall-core/shorewallrc.debian @@ -19,3 +19,4 @@ SYSCONFDIR=/etc/default #Directory where SysV init parameter fil SYSTEMD= #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 2169fa854..f2a0b556d 100644 --- a/Shorewall-core/shorewallrc.default +++ b/Shorewall-core/shorewallrc.default @@ -19,3 +19,4 @@ SYSCONFFILE= #Name of the distributed file to be inst SYSCONFDIR= #Directory where SysV init parameter files are installed SPARSE= #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.redhat b/Shorewall-core/shorewallrc.redhat index 0b7e95079..ad827b3e8 100644 --- a/Shorewall-core/shorewallrc.redhat +++ b/Shorewall-core/shorewallrc.redhat @@ -19,3 +19,4 @@ SYSCONFFILE=sysconfig #Name of the distributed file to be inst SYSCONFDIR=/etc/sysconfig/ #Directory where SysV init parameter files are installed SPARSE= #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.slackware b/Shorewall-core/shorewallrc.slackware index cc7e4e5b7..e5a47fa0d 100644 --- a/Shorewall-core/shorewallrc.slackware +++ b/Shorewall-core/shorewallrc.slackware @@ -20,3 +20,4 @@ SYSCONFFILE= #Name of the distributed file to be i SYSCONFDIR= #Name of the directory where SysV init parameter files are installed. ANNOTATED= #If non-empty, install annotated configuration files 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.suse b/Shorewall-core/shorewallrc.suse index cc5a273f1..da09256e4 100644 --- a/Shorewall-core/shorewallrc.suse +++ b/Shorewall-core/shorewallrc.suse @@ -19,3 +19,4 @@ SYSCONFFILE= #Name of the distributed f SYSCONFDIR=/etc/sysconfig/ #Directory where SysV init parameter files are installed SPARSE= #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR VARLIB=/var/lib #Directory where persistent product data is stored. +VARDIR=${VARLIB}/$PRODUCT #Directory where product variable data is stored.