From: David Paleino <dapal@debian.org>
Subject: Fix mountpoint ordering
Bug-Debian: http://bugs.debian.org/519439
Forwarded: no

---
 DiskManager/Fstab/Fstab.py     |    6 +++---
 DiskManager/Fstab/FstabData.py |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

--- disk-manager.orig/DiskManager/Fstab/FstabData.py
+++ disk-manager/DiskManager/Fstab/FstabData.py
@@ -55,7 +55,7 @@ dont_need_remount = ("auto", "noauto", "
 
 
 # Write entry in MntFile in this order :
-path_order = ("/", "/usr", "/home")
+path_order = ("/", "/usr", "/opt", "/var", "/home")
 
 # System partitions :
 system = { "exact"  : ("/", "/home", "/tmp"),
--- disk-manager.orig/DiskManager/Fstab/Fstab.py
+++ disk-manager/DiskManager/Fstab/Fstab.py
@@ -466,11 +466,11 @@ class MntFile(list) :
         try :
             ix =  list(FstabData.path_order).index(x)
         except ValueError :
-            ix = 0
+            ix = len(FstabData.path_order)
         try :
-            iy =  list(FstabData.path_order).index(x)
+            iy =  list(FstabData.path_order).index(y)
         except ValueError :
-            iy = 0
+            iy = len(FstabData.path_order)
         if ix > iy :
             return 1
         if ix < iy :