diff --git a/NEWS b/NEWS index 70b1c0a95b8dfd0853c7df2a22b47c6158a2789c..1e752b8e09702abde2b746cacb50f6aee113efe0 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,9 @@ -UNRELEASED (2015-04-24) +release/004.041 (2015-04-29) - VMWare does not package vmware-tools-esx-nox for EL7. They + [os] Edited conditional in sources.list.erb to allow Jessie hosts + to get the expected Stanford-hosted Debian repositories (jlent) + + [vmguest] VMWare does not package vmware-tools-esx-nox for EL7. They instead recommend the use of open-vm-tools. Added a condition and refactored vmguest.pp appropriately. Also, change to portmap.pp. EL7, like EL6, requires rpcbind and not portmap (jlent) diff --git a/templates/os/sources/sources.list.erb b/templates/os/sources/sources.list.erb index e4e729499baec2579f22f90869c5b8eb328f1009..26777c40f1ed7001536d4aaab8aa17f2f28ce2fb 100644 --- a/templates/os/sources/sources.list.erb +++ b/templates/os/sources/sources.list.erb @@ -26,7 +26,7 @@ deb-src http://debian.stanford.edu/debian <%= @lsbdistcodename %> main non-free deb http://debian.stanford.edu/debian <%= @lsbdistcodename %>-lts main non-free contrib deb-src http://debian.stanford.edu/debian <%= @lsbdistcodename %>-lts main non-free contrib <% end -%> -<% if (@lsbdistcodename == 'squeeze') or (@lsbdistcodename == 'wheezy') -%> +<% if (@lsbdistcodename == 'squeeze') or (@lsbdistcodename == 'wheezy') or (@lsbdistcodename == 'jessie') -%> # The archive that publishes updates for security vulnerabilities. deb http://debian.stanford.edu/debian-security <%= @lsbdistcodename %>/updates main non-free contrib