| Index: trunk/debs/wikimedia-base/debian/postinst |
| — | — | @@ -59,7 +59,7 @@ |
| 60 | 60 | fi |
| 61 | 61 | |
| 62 | 62 | # Optimize TCP |
| 63 | | - if ! grep -q "^### START: Added by wikimedia-base" /etc/sysctl.conf || dpkg --compare-versions "$2" lt "0.18" |
| | 63 | + if [ ! -d /etc/sysctl.d ] && ( ! grep -q "^### START: Added by wikimedia-base" /etc/sysctl.conf || dpkg --compare-versions "$2" lt "0.18") |
| 64 | 64 | then |
| 65 | 65 | cat /usr/share/doc/wikimedia-base/sysctl.conf >> /etc/sysctl.conf |
| 66 | 66 | sysctl -p /usr/share/doc/wikimedia-base/sysctl.conf |
| Index: trunk/debs/wikimedia-base/debian/changelog |
| — | — | @@ -1,3 +1,9 @@ |
| | 2 | +wikimedia-base (0.25) hardy; urgency=low |
| | 3 | + |
| | 4 | + * Only add sysctl settings to /etc/sysctl.conf pre-karmic; rely on puppet |
| | 5 | + |
| | 6 | + -- Mark Bergsma <mark@wikimedia.org> Mon, 01 Feb 2010 19:57:26 +0000 |
| | 7 | + |
| 2 | 8 | wikimedia-base (0.24) hardy; urgency=low |
| 3 | 9 | |
| 4 | 10 | * Disable "quiet splash" default kernel boot options in grub2 |