From 877e8a59cb9a0df412970f087b486a176573f9ad Mon Sep 17 00:00:00 2001
From: Mikaela Suomalainen <mikaela+git@mikaela.info>
Date: Sun, 22 Feb 2015 11:41:15 +0200
Subject: [PATCH] rc: sysctl-mikaela-run: use sysctl.d

---
 rc/bashrc | 12 +++++++-----
 rc/zshrc  | 14 ++++++++------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/rc/bashrc b/rc/bashrc
index 38c4e19b..8165cba8 100644
--- a/rc/bashrc
+++ b/rc/bashrc
@@ -845,12 +845,14 @@ function sysctl-mikaela() {
 # Function to permanently set sysctl options which I want.
 function sysctl-mikaela-run() {
     set -x
-    echo kernel.core_pattern = %e-%p-%h.core >> /etc/sysctl.conf
-    echo vm.swappiness = 1 >> /etc/sysctl.conf
-    echo net.ipv6.bindv6only=1 >> /etc/sysctl.conf
-    echo net.ipv6.conf.eth0.use_tempaddr=2 >> /etc/sysctl.conf
-    echo net.ipv6.conf.wlan0.use_tempaddr=2 >> /etc/sysctl.conf
+    mkdir -p /etc/sysctl.d/
+    echo kernel.core_pattern = %e-%p-%h.core > /etc/sysctl.d/60-mikaela.conf
+    echo vm.swappiness = 10 >> /etc/sysctl.d/60-mikaela.conf
+    echo net.ipv6.bindv6only=1 >> /etc/sysctl.d/60-mikaela.conf
+    echo net.ipv6.conf.eth0.use_tempaddr=2 >> /etc/sysctl.d/60-mikaela.conf
+    echo net.ipv6.conf.wlan0.use_tempaddr=2 >> /etc/sysctl.d/60-mikaela.conf
     sysctl -p
+    service procps start
     echo 'If network-manager is used, see /etc/NetworkManager/system-connections/<connection>'
     set +x
 }
diff --git a/rc/zshrc b/rc/zshrc
index 4a031006..4000fdc0 100644
--- a/rc/zshrc
+++ b/rc/zshrc
@@ -823,13 +823,15 @@ function sysctl-mikaela() {
 # Function to permanently set sysctl options which I want.
 function sysctl-mikaela-run() {
     set -x
-    echo kernel.core_pattern = %e-%p-%h.core >> /etc/sysctl.conf
-    echo vm.swappiness = 1 >> /etc/sysctl.conf
-    echo net.ipv6.bindv6only=1 >> /etc/sysctl.conf
-    echo net.ipv6.conf.eth0.use_tempaddr=2 >> /etc/sysctl.conf
-    echo net.ipv6.conf.wlan0.use_tempaddr=2 >> /etc/sysctl.conf
-    echo 'If network-manager is used, see /etc/NetworkManager/system-connections/<connection>'
+    mkdir -p /etc/sysctl.d/
+    echo kernel.core_pattern = %e-%p-%h.core > /etc/sysctl.d/60-mikaela.conf
+    echo vm.swappiness = 10 >> /etc/sysctl.d/60-mikaela.conf
+    echo net.ipv6.bindv6only=1 >> /etc/sysctl.d/60-mikaela.conf
+    echo net.ipv6.conf.eth0.use_tempaddr=2 >> /etc/sysctl.d/60-mikaela.conf
+    echo net.ipv6.conf.wlan0.use_tempaddr=2 >> /etc/sysctl.d/60-mikaela.conf
     sysctl -p
+    service procps start
+    echo 'If network-manager is used, see /etc/NetworkManager/system-connections/<connection>'
     set +x
 }