Skip to content

Commit

Permalink
Small fixes + cleanup
Browse files Browse the repository at this point in the history
[ci skip]
  • Loading branch information
nuxwin committed Sep 21, 2016
1 parent 61517ed commit aa2ee3b
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 9 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG
Expand Up @@ -9,7 +9,7 @@ BACKEND
Fixed: An IP address must not be added in the interfaces file if already present, even if auto mode is set
Fixed: Lock files are never deleted
Fixed: Remove any lock on shutdown (iMSCP::Bootstrapper)
Fixed: Read mount entries once per run (IMSCP::Mount)
Fixed: Read mount entries once per run (iMSCP::Mount)

CONFIGS
Updated: Request headers in redirect vhosts (Apache2)
Expand Down
2 changes: 1 addition & 1 deletion docs/1.3.x_errata.md
Expand Up @@ -15,7 +15,7 @@ on themselves as follow:
- `/var/www` is mounted on himself as slave subtree
- `/var/www/virtual` shared is mounted on himself as shared subtree

Note that directories can differ according your installation layout
Note that directory paths can differ according your installation layout.

## Update to version 1.3.1

Expand Down
9 changes: 2 additions & 7 deletions engine/PerlLib/iMSCP/Mount.pm
Expand Up @@ -29,12 +29,10 @@ use Errno qw / EINVAL /;
use File::Spec;
use File::stat ();
use iMSCP::Debug;
use iMSCP::Dir;
use iMSCP::File;
use iMSCP::Syscall;
use Scalar::Defer;
use Quota;
use parent 'Exporter';
use Scalar::Defer;

our @EXPORT_OK = qw/ mount umount setPropagationFlag isMountpoint addMountEntry removeMountEntry /;

Expand Down Expand Up @@ -298,7 +296,7 @@ sub setPropagationFlag($;$)
0;
}

=item isMountpoint()
=item isMountpoint($path)
Is the given path a mountpoint or bind mount?
Expand Down Expand Up @@ -339,9 +337,6 @@ sub addMountEntry($)
return 1;
}

my $rs = removeMountEntry( $entry );
return $rs if $rs;

my $fh;
unless (open $fh, '>>', "$main::imscpConfig{'CONF_DIR'}/mounts/mounts.conf") {
error( sprintf( "Could not open `%s' file: %s", "$main::imscpConfig{'CONF_DIR'}/mounts/mounts.conf", $! ) );
Expand Down

0 comments on commit aa2ee3b

Please sign in to comment.