extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-01-10 15:48:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5.1.10'

Browse Source 
# Conflicts:
#	Shorewall-core/install.sh
#	Shorewall/install.sh
This commit is contained in:
Tom Eastep 2017-12-26 15:45:20 -08:00
commit 9afe8daae0
No known key found for this signature in database
GPG Key ID: 96E6B3F2423A4D10
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Shorewall-core/install.sh
View File

@ -336,7 +336,6 @@ done
if [ $SHAREDIR != /usr/share ]; then
eval sed -i \'s\|/usr/share/\|${SHAREDIR}/\|\' ${DESTDIR}${SHAREDIR}/shorewall/lib.base
eval sed -i \'s\|/usr/share/\|${SHAREDIR}/\|\' ${DESTDIR}${SHAREDIR}/shorewall/lib.core
eval sed -i \'s\|/usr/share/\|${SHAREDIR}/\|\' ${DESTDIR}${SHAREDIR}/shorewall/lib.cli
fi

2
Shorewall/install.sh
View File

@ -508,7 +508,7 @@ fix_config() {
fi
}
run_install $OWNERSHIP -m 0644 ${PRODUCT}.conf ${DESTDIR}${SHAREDIR}/${PRODUCT}/configfiles/
run_install $OWNERSHIP -m 0644 $PRODUCT.conf ${DESTDIR}${SHAREDIR}/$PRODUCT/configfiles/
fix_config ${DESTDIR}${SHAREDIR}/${PRODUCT}/configfiles/${PRODUCT}.conf