summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2004-08-13 05:37:53 +0000
committerOlivier Blin <oblin@mandriva.org>2004-08-13 05:37:53 +0000
commitf658b1cf99a8c2e277dbf9a8601a9e63e123a745 (patch)
tree95fed8e64c6d049316c7abb41a590f5f4143a93a
parenta760b07d7a5f0252ed61f68beb7176565166a195 (diff)
downloaddrakx-f658b1cf99a8c2e277dbf9a8601a9e63e123a745.tar
drakx-f658b1cf99a8c2e277dbf9a8601a9e63e123a745.tar.gz
drakx-f658b1cf99a8c2e277dbf9a8601a9e63e123a745.tar.bz2
drakx-f658b1cf99a8c2e277dbf9a8601a9e63e123a745.tar.xz
drakx-f658b1cf99a8c2e277dbf9a8601a9e63e123a745.zip
do not assume drakvpn is already configured if the tunnels file is
made of comments only
-rw-r--r--perl-install/standalone/drakvpn2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/standalone/drakvpn b/perl-install/standalone/drakvpn
index fd6fb5c3f..e7ac4c902 100644
--- a/perl-install/standalone/drakvpn
+++ b/perl-install/standalone/drakvpn
@@ -88,7 +88,7 @@ begin:
#- **********************************
#- * 0th step: verify if we are already set up
-if ($shorewall && -f "/etc/shorewall/tunnels") {
+if ($shorewall && any { !/^\s*(?:#|\n)/ } cat_($tunnels_file)) {
$::Wizard_no_previous = 1;
if (!$shorewall->{disabled}) {