fix bug #171: fix path_to_volume_id for unmounted NFS

diff --git a/Makefile b/Makefile
index 67ebde1f3f22f539ba4cd87da039e5c55ea67d9b..bc28b24c44419e80a506f8ebb6ad732d906fd115 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ RELEASE=2.0
 
 VERSION=2.0
 PACKAGE=libpve-storage-perl
-PKGREL=17
+PKGREL=18
 
 DESTDIR=
 PREFIX=/usr

diff --git a/PVE/Storage.pm b/PVE/Storage.pm
index 4148ed34ca21b1c34ba037f3938f94ede58bb859..c78bac6c06963de1210e05527d446385b8f4e467 100755 (executable)
--- a/PVE/Storage.pm
+++ b/PVE/Storage.pm
@@ -1018,7 +1018,9 @@ sub path_to_volume_id {
        return ('');
     }
 
-    $path = abs_path ($path);
+    # Note: abs_path() return undef if $path doesn not exist 
+    # for example when nfs storage is not mounted
+    $path = abs_path($path) || $path;
 
     foreach my $sid (keys %$ids) {
        my $type = $ids->{$sid}->{type};

diff --git a/changelog.Debian b/changelog.Debian
index 9f21ff3e712820ad8c11c0fe2878650fff9fe5c2..cae22a98775340eacb3963a7621b510b8e832550 100644 (file)
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -1,3 +1,9 @@
+libpve-storage-perl (2.0-18) unstable; urgency=low
+
+  * fix bug #171: fix path_to_volume_id for unmounted NFS
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 18 Apr 2012 12:34:11 +0200
+
 libpve-storage-perl (2.0-17) unstable; urgency=low
 
   * fix bug #148: set maxfiles for default local storage