X-Git-Url: http://git.pjr.cc/?p=glcas.git;a=blobdiff_plain;f=plugins%2Fknownos.php;h=1a8b4472197f008b9f2043c6aad754264177797c;hp=eda7b96425696e19dc6af388c08ff396af9f33bf;hb=ce6eddc1cf6b4a879b9239fec18258b99f3d739a;hpb=f3bb1ef4d1fb0297498f8a1a30c2332e2e5905e8

diff --git a/plugins/knownos.php b/plugins/knownos.php
index eda7b96..1a8b447 100644
--- a/plugins/knownos.php
+++ b/plugins/knownos.php
@@ -37,11 +37,36 @@ function getKnownOSList()
 	$kos["repotype"]["apt"][0] = "baseurl";
 	
 	// OS's
-	$kos["os"]["Fedora"] = "Fedora";
-	$kos["os"]["Debian"] = "Debian";
-	$kos["os"]["RedHat"] = "RedHat Enterprise Linux";
-	$kos["os"]["Ubuntu"] = "Ubuntu";
-	$kos["os"]["CentOS"] = "Community Enterprise OS";
+	$kos["os"]["short"]["fedora"] = "Fedora";
+	$kos["os"]["short"]["debian"] = "Debian";
+	$kos["os"]["short"]["redhat"] = "RedHat";
+	$kos["os"]["short"]["ubuntu"] = "Ubuntu";
+	$kos["os"]["short"]["centos"] = "CentOS";
+	$kos["os"]["fedora"]["long"] = "Fedora";
+	$kos["os"]["debian"]["long"] = "Debian";
+	$kos["os"]["redhat"]["long"] = "RedHat Enterprise Linux";
+	$kos["os"]["ubuntu"]["long"] = "Ubuntu";
+	$kos["os"]["centos"]["long"] = "Community Enterprise OS";
+	
+	
+	// ubuntu bit for apt
+	// TODO uncomment these ones out of testing
+	$kos["apt"]["hardy"] = "Hardy Heron (8.04 LTS)";
+	$kos["apt"]["karmic"] = "Karmic Koala (9.10)";
+	$kos["apt"]["lucid"] = "Lucid Lynx (10.04 LTS)";
+	$kos["apt"]["maverick"] = "Maverick Meerkat (10.10)";
+	$kos["apt"]["natty"] = "Natty Narwhal (11.04)";
+	$kos["apt"]["oneiric"] = "Oneiric Ocelot (11.10)";
+	$kos["apt"]["lenny"] = "Debian Lenny";
+	$kos["apt"]["sid"] = "Debian Sid";
+	$kos["apt"]["squeeze"] = "Debian Squeeze";
+	$kos["apt"]["wheezy"] = "Debian Wheezy";
+	$kos["apt"]["stable"] = "Debian Stable";
+	$kos["apt"]["unstable"] = "Debian Unstable";
+	
+	
+
+				
 	
 	// Repo types per os
 	$kos["os"]["Fedora"]["repotype"] = "yum";
@@ -50,6 +75,12 @@ function getKnownOSList()
 	$kos["os"]["Ubuntu"]["repotype"] = "apt";
 	$kos["os"]["CentOS"]["repotype"] = "yum";
 	
+	// architectyres
+	$kos["arch"]["intel32"] = "i386";
+	$kos["arch"]["amdcrazy"] = "i586";
+	$kos["arch"]["amd64"] = "x86_64";
+	$kos["arch"]["amd64_2"] = "amd64";
+	
 	
 	
 	return $kos;