mirror of
https://gitlab.com/shorewall/code.git
synced 2024-11-25 17:13:11 +01:00
Don't require SYSCONFFILE for all products
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
parent
159d677acb
commit
14bd1a9061
@ -497,7 +497,10 @@ delete_file ${DESTDIR}${SHAREDIR}/$PRODUCT/lib.common
|
|||||||
delete_file ${DESTDIR}${SHAREDIR}/$PRODUCT/lib.cli
|
delete_file ${DESTDIR}${SHAREDIR}/$PRODUCT/lib.cli
|
||||||
delete_file ${DESTDIR}${SHAREDIR}/$PRODUCT/wait4ifup
|
delete_file ${DESTDIR}${SHAREDIR}/$PRODUCT/wait4ifup
|
||||||
|
|
||||||
if [ -n "$SYSCONFFILE" -a ! -f ${DESTDIR}${SYSCONFDIR}/${PRODUCT} ]; then
|
#
|
||||||
|
# Note -- not all packages will have the SYSCONFFILE so we need to check for its existance here
|
||||||
|
#
|
||||||
|
if [ -n "$SYSCONFFILE" -a -f "$SYSCONFFILE" -a ! -f ${DESTDIR}${SYSCONFDIR}/${PRODUCT} ]; then
|
||||||
if [ ${DESTDIR} ]; then
|
if [ ${DESTDIR} ]; then
|
||||||
mkdir -p ${DESTDIR}${SYSCONFDIR}
|
mkdir -p ${DESTDIR}${SYSCONFDIR}
|
||||||
chmod 755 ${DESTDIR}${SYSCONFDIR}
|
chmod 755 ${DESTDIR}${SYSCONFDIR}
|
||||||
|
@ -1143,7 +1143,10 @@ if [ -d ${DESTDIR}${CONFDIR}/logrotate.d ]; then
|
|||||||
echo "Logrotate file installed as ${DESTDIR}${CONFDIR}/logrotate.d/$PRODUCT"
|
echo "Logrotate file installed as ${DESTDIR}${CONFDIR}/logrotate.d/$PRODUCT"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -n "$SYSCONFFILE" -a ! -f ${DESTDIR}${SYSCONFDIR}/${PRODUCT} ]; then
|
#
|
||||||
|
# Note -- not all packages will have the SYSCONFFILE so we need to check for its existance here
|
||||||
|
#
|
||||||
|
if [ -n "$SYSCONFFILE" -a -f "$SYSCONFFILE" -a ! -f ${DESTDIR}${SYSCONFDIR}/${PRODUCT} ]; then
|
||||||
if [ ${DESTDIR} ]; then
|
if [ ${DESTDIR} ]; then
|
||||||
mkdir -p ${DESTDIR}${SYSCONFDIR}
|
mkdir -p ${DESTDIR}${SYSCONFDIR}
|
||||||
chmod 755 ${DESTDIR}${SYSCONFDIR}
|
chmod 755 ${DESTDIR}${SYSCONFDIR}
|
||||||
|
Loading…
Reference in New Issue
Block a user