Revision 29a30533 htools/Ganeti/Ssconf.hs

b/htools/Ganeti/Ssconf.hs
111 111
               -> SSKey                     -- ^ Desired ssconf key
112 112
               -> IO (Result String)
113 113
readSSConfFile optpath def key = do
114
  dpath <- Path.dataDir
114 115
  result <- catchIOErrors def . readFile .
115
            keyToFilename (fromMaybe Path.dataDir optpath) $ key
116
            keyToFilename (fromMaybe dpath optpath) $ key
116 117
  return (liftM (take maxFileSize) result)
117 118

  
118 119
-- | Strip space characthers (including newline). As this is

Also available in: Unified diff