From: VMware, Inc <> Date: Tue, 24 Aug 2010 18:26:34 +0000 (-0700) Subject: GOS table: add new definitions X-Git-Tag: 2010.08.24-292196~42 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=90bd2deee3452c0bb69dab6d4ccc96ec170095e2;p=thirdparty%2Fopen-vm-tools.git GOS table: add new definitions Add Open Solaris (solaris 11) and Debian 6 entries. Signed-off-by: Marcelo Vanzin --- diff --git a/open-vm-tools/lib/include/guest_os.h b/open-vm-tools/lib/include/guest_os.h index 7fa2cc94d..e78b704eb 100644 --- a/open-vm-tools/lib/include/guest_os.h +++ b/open-vm-tools/lib/include/guest_os.h @@ -190,73 +190,67 @@ typedef enum GuestOSFamilyType { */ /* Linux */ -#define STR_OS_ANNVIX "Annvix" -#define STR_OS_ARCH "Arch" -#define STR_OS_ARKLINUX "Arklinux" +#define STR_OS_ANNVIX "Annvix" +#define STR_OS_ARCH "Arch" +#define STR_OS_ARKLINUX "Arklinux" #define STR_OS_ASIANUX_3 "asianux3" #define STR_OS_ASIANUX_4 "asianux4" -#define STR_OS_AUROX "Aurox" -#define STR_OS_ASIANUX "asianux" -#define STR_OS_BLACKCAT "BlackCat" +#define STR_OS_AUROX "Aurox" +#define STR_OS_ASIANUX "asianux" +#define STR_OS_BLACKCAT "BlackCat" #define STR_OS_CENTOS "centos" -#define STR_OS_COBALT "Cobalt" -#define STR_OS_CONECTIVA "Conectiva" +#define STR_OS_COBALT "Cobalt" +#define STR_OS_CONECTIVA "Conectiva" #define STR_OS_DEBIAN "Debian" #define STR_OS_DEBIAN_4 "debian4" #define STR_OS_DEBIAN_5 "debian5" -#define STR_OS_FEDORA "Fedora" -#define STR_OS_GENTOO "Gentoo" -#define STR_OS_IMMUNIX "Immunix" -#define STR_OS_LINUX "linux" -#define STR_OS_LINUX_FROM_SCRATCH "Linux-From-Scratch" +#define STR_OS_DEBIAN_6 "debian6" +#define STR_OS_FEDORA "Fedora" +#define STR_OS_GENTOO "Gentoo" +#define STR_OS_IMMUNIX "Immunix" +#define STR_OS_LINUX "linux" +#define STR_OS_LINUX_FROM_SCRATCH "Linux-From-Scratch" #define STR_OS_LINUX_FULL "Other Linux" -#define STR_OS_LINUX_PPC "Linux-PPC" -#define STR_OS_MANDRAKE "mandrake" -#define STR_OS_MANDRAKE_FULL "Mandrake Linux" -#define STR_OS_MANDRIVA "mandriva" -#define STR_OS_MKLINUX "MkLinux" -#define STR_OS_NOVELL "nld9" -#define STR_OS_NOVELL_FULL "Novell Linux Desktop 9" +#define STR_OS_LINUX_PPC "Linux-PPC" +#define STR_OS_MANDRAKE "mandrake" +#define STR_OS_MANDRAKE_FULL "Mandrake Linux" +#define STR_OS_MANDRIVA "mandriva" +#define STR_OS_MKLINUX "MkLinux" +#define STR_OS_NOVELL "nld9" +#define STR_OS_NOVELL_FULL "Novell Linux Desktop 9" #define STR_OS_ORACLE "oraclelinux" -#define STR_OS_OPENSUSE "opensuse" -#define STR_OS_OTHER "otherlinux" -#define STR_OS_OTHER_24 "other24xlinux" -#define STR_OS_OTHER_24_FULL "Other Linux 2.4.x kernel" -#define STR_OS_OTHER_26 "other26xlinux" -#define STR_OS_OTHER_26_FULL "Other Linux 2.6.x kernel" -#define STR_OS_OTHER_FULL "Other Linux" -#define STR_OS_PLD "PLD" -#define STR_OS_RED_HAT "redhat" -#define STR_OS_RED_HAT_EN "rhel" -#define STR_OS_RED_HAT_EN_2 "rhel2" -#define STR_OS_RED_HAT_EN_2_FULL "Red Hat Enterprise Linux 2" -#define STR_OS_RED_HAT_EN_3 "rhel3" -#define STR_OS_RED_HAT_EN_3_FULL "Red Hat Enterprise Linux 3" -#define STR_OS_RED_HAT_EN_4 "rhel4" -#define STR_OS_RED_HAT_EN_4_FULL "Red Hat Enterprise Linux 4" -#define STR_OS_RED_HAT_FULL "Red Hat Linux" -#define STR_OS_SLACKWARE "Slackware" +#define STR_OS_OTHER "otherlinux" +#define STR_OS_OTHER_24 "other24xlinux" +#define STR_OS_OTHER_24_FULL "Other Linux 2.4.x kernel" +#define STR_OS_OTHER_26 "other26xlinux" +#define STR_OS_OTHER_26_FULL "Other Linux 2.6.x kernel" +#define STR_OS_OTHER_FULL "Other Linux" +#define STR_OS_PLD "PLD" +#define STR_OS_RED_HAT "redhat" +#define STR_OS_RED_HAT_EN "rhel" +#define STR_OS_RED_HAT_FULL "Red Hat Linux" +#define STR_OS_SLACKWARE "Slackware" +#define STR_OS_SLES "sles" +#define STR_OS_SLES_FULL "SUSE Linux Enterprise Server" #define STR_OS_SLES_10 "sles10" #define STR_OS_SLES_10_FULL "SUSE Linux Enterprise Server 10" #define STR_OS_SLES_11 "sles11" #define STR_OS_SLES_11_FULL "SUSE Linux Enterprise Server 11" -#define STR_OS_SMESERVER "SMEServer" -#define STR_OS_SUN_DESK "sjds" -#define STR_OS_SUN_DESK_FULL "Sun Java Desktop System" -#define STR_OS_SUSE "suse" -#define STR_OS_SUSE_EN "sles" -#define STR_OS_SUSE_EN_FULL "SUSE Linux Enterprise Server" +#define STR_OS_SUSE "suse" #define STR_OS_SUSE_FULL "SUSE Linux" -#define STR_OS_TINYSOFA "Tiny Sofa" -#define STR_OS_TURBO "turbolinux" -#define STR_OS_TURBO_FULL "Turbolinux" -#define STR_OS_UBUNTU "Ubuntu" -#define STR_OS_ULTRAPENGUIN "UltraPenguin" -#define STR_OS_UNITEDLINUX "UnitedLinux" -#define STR_OS_VALINUX "VALinux" +#define STR_OS_OPENSUSE "opensuse" +#define STR_OS_SMESERVER "SMEServer" +#define STR_OS_SUN_DESK "sjds" +#define STR_OS_SUN_DESK_FULL "Sun Java Desktop System" +#define STR_OS_TINYSOFA "Tiny Sofa" +#define STR_OS_TURBO "turbolinux" +#define STR_OS_TURBO_FULL "Turbolinux" +#define STR_OS_UBUNTU "Ubuntu" +#define STR_OS_ULTRAPENGUIN "UltraPenguin" +#define STR_OS_UNITEDLINUX "UnitedLinux" +#define STR_OS_VALINUX "VALinux" #define STR_OS_YELLOW_DOG "Yellow Dog" #define STR_OS_ECOMSTATION "eComStation" -#define STR_OS_ECOMSTATION2 "eComStation2" /* Windows */ #define STR_OS_WIN_31 "win31" @@ -283,7 +277,7 @@ typedef enum GuestOSFamilyType { #define STR_OS_WIN_XP_PRO_FULL "Windows XP Professional" #define STR_OS_WIN_XP_PRO_X64 "winXPPro-64" #define STR_OS_WIN_XP_PRO_X64_FULL "Windows XP Professional x64 Edition" -#define STR_OS_WIN_NET_WEB "winNetWeb" +#define STR_OS_WIN_NET_WEB "winNetWeb" #define STR_OS_WIN_NET_WEB_FULL "Windows Server 2003 Web Edition" #define STR_OS_WIN_NET_ST "winNetStandard" #define STR_OS_WIN_NET_ST_FULL "Windows Server 2003 Standard Edition" @@ -430,6 +424,7 @@ typedef enum GuestOSFamilyType { /* Solaris */ #define STR_OS_SOLARIS "solaris" +#define STR_OS_OPENSOLARIS "openSolaris" /* All */ #define STR_OS_64BIT_SUFFIX "-64" diff --git a/open-vm-tools/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c index 52635b047..0b05399ea 100644 --- a/open-vm-tools/lib/misc/hostinfoPosix.c +++ b/open-vm-tools/lib/misc/hostinfoPosix.c @@ -510,7 +510,7 @@ HostinfoGetOSShortName(char *distro, // IN: full distro name strstr(distroLower, "desktop 10")) { Str_Strcpy(distroShort, STR_OS_SLES_10, distroShortSize); } else { - Str_Strcpy(distroShort, STR_OS_SUSE_EN, distroShortSize); + Str_Strcpy(distroShort, STR_OS_SLES, distroShortSize); } } else if (strstr(distroLower, "sun")) { Str_Strcpy(distroShort, STR_OS_SUN_DESK, distroShortSize);