Merge branch 'master' into 4.5.21

This commit is contained in:
Tom Eastep 2013-10-04 15:54:41 -07:00
commit 13db1bd3be

View File

@ -454,7 +454,7 @@ if [ -z "$DESTDIR" ]; then
if [ -n "$first_install" ]; then
if [ $HOST = debian ]; then
if mywhich insserv; then
if insserv enable; then
if insserv ${INITDIR}/shorewall-init; then
echo "Shorewall Init will start automatically at boot"
else
cant_autostart