Add Android OS Type support

Normation · May 10, 2012 · caa3b29 · caa3b29
1 parent b2298b2
commit caa3b29
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/rudder-core/src/main/scala/com/normation/rudder/domain/queries/CmdbQuery.scala b/rudder-core/src/main/scala/com/normation/rudder/domain/queries/CmdbQuery.scala
@@ -288,7 +288,7 @@ case object OstypeComparator extends CriterionType {
 case object OsNameComparator extends CriterionType { 
   import net.liftweb.http.S
 
-  val osNames = List(Centos, Debian, Fedora, Redhat, Suse, Ubuntu, UnknownWindowsType)
+  val osNames = List(Centos, Debian, Fedora, Redhat, Suse, Ubuntu, Android, UnknownWindowsType)
   override def comparators = Seq(Equals, NotEquals)
   override protected def validateSubCase(v:String,comparator:CriterionComparator) = {
     if(null == v || v.length == 0) Failure("Empty string not allowed") else Full(v)

diff --git a/rudder-web/src/main/resources/ldapObjectAndAttributes.properties b/rudder-web/src/main/resources/ldapObjectAndAttributes.properties
@@ -86,6 +86,7 @@ os.name.Redhat=Red Hat
 os.name.Centos=CentOS
 os.name.Fedora=Fedora
 os.name.Suse=SuSE
+os.name.Android=Android
 os.name.Windows=Windows
 
 # Attributes