From: intrigeri <intrigeri@758a04ac-41e6-0310-8a23-8373a73cc35d>
Date: Tue, 17 Jan 2006 22:23:24 +0000 (+0000)
Subject: lib/vserver.in [init_vservers] : canonicalize VROOTDIR (since duplicity et al. don... 
X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fbackupninja.git;a=commitdiff_plain;h=24e4a05362bfd99fde6510bb8698d8eb237fab28

lib/vserver.in [init_vservers] : canonicalize VROOTDIR (since duplicity et al. don't follow symlinks)



git-svn-id: http://code.autistici.org/svn/backupninja/trunk@324 758a04ac-41e6-0310-8a23-8373a73cc35d
---

diff --git a/ChangeLog b/ChangeLog
index 0037fbb..b8ca3c2 100644
--- 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 7108dac..3030387 100644
--- 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=