- jails_list, error = parse_conf_dir(self.conf_dir)
- else:
- jails_list, error = parse_conf_path(self.conf_path)
-
- if not jails_list:
- self.error(error)
+ dir_jails, error = parse_conf_dir(self.conf_dir)
+ jails_list.extend(dir_jails)
+ if not dir_jails:
+ self.error(error)
+
+ if self.conf_path:
+ path_jails, error = parse_conf_path(self.conf_path)
+ jails_list.extend(path_jails)
+ if not path_jails:
+ self.error(error)