lib/vserver.in [init_vservers] : canonicalize VROOTDIR (since duplicity et al. don...

diff --git a/ChangeLog b/ChangeLog
index 0037fbb2451ca0bc8d9f28b0d309402960fab049..b8ca3c2b1e897f619800695299050e3ae144c493 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,8 +28,10 @@ version 0.9.3 -- unreleased
          . code formatting cleanup (three spaces indent)
     lib changes
        vserver:
-        . improved VROOTDIR detection
-        . test in a stricter way the real vservers availability
+        . init_vservers: improved VROOTDIR detection
+        . init_vservers: test in a stricter way the real vservers availability
+        . init_vservers: canonicalize VROOTDIR (since duplicity et al.
+          don't follow symlinks)
     known bugs:
         easydialog: 
          . formDisplay does not return exit status.

diff --git a/lib/vserver.in b/lib/vserver.in
index 7108dac78563aea64ffef4c43e6f040a04d2c261..3030387a00aa1cca5a4b3272f14b923610bfb84a 100644 (file)
--- a/lib/vserver.in
+++ b/lib/vserver.in
@@ -34,6 +34,8 @@ init_vservers() {
    getconf VSERVERINFO /usr/sbin/vserver-info
    getconf VSERVER /usr/sbin/vserver
    getconf VROOTDIR `if [ -x "$VSERVERINFO" ]; then $VSERVERINFO info SYSINFO | grep '^ *vserver-Rootdir' | awk '{print $2}'; fi`
+   # canonicalize VROOTDIR
+   VROOTDIR=`readlink --canonicalize $VROOTDIR`
    # init this library's global variables
    vservers_are_available=no
    found_vservers=