From dcfa315acfc348f140b5c75a49015f76b01b3c3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sun, 27 Mar 2011 16:06:44 +0200 Subject: [PATCH] windows 31.24 --- Memory.xml | 5 ++++- package/ubuntu-10.10/postinst | 10 ++++++++-- package/ubuntu-10.10/preinst | 3 +-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Memory.xml b/Memory.xml index 15bb900b8..50f141d7f 100644 --- a/Memory.xml +++ b/Memory.xml @@ -2145,7 +2145,10 @@ BLAH! - + + + + .-"""-. ' \ |,. ,-. | _________________________ diff --git a/package/ubuntu-10.10/postinst b/package/ubuntu-10.10/postinst index a628ada3f..ed50fde48 100755 --- a/package/ubuntu-10.10/postinst +++ b/package/ubuntu-10.10/postinst @@ -3,5 +3,11 @@ echo "Setting required kernel parameters." # I actually do it three times, hoping to hammer this into Ubuntu's dense skull. sysctl -w kernel.randomize_va_space=0 sysctl -w kernel.yama.ptrace_scope=0 -echo "kernel.randomize_va_space=0" >> /etc/sysctl.conf -echo "kernel.yama.ptrace_scope=0" >> /etc/sysctl.conf \ No newline at end of file +if grep -q "kernel.yama.ptrace_scope=0" /etc/sysctl.conf +then + echo "Already installed into /etc/sysctl.conf, doing nothing." +else + echo "kernel.randomize_va_space=0" >> /etc/sysctl.conf + echo "kernel.yama.ptrace_scope=0" >> /etc/sysctl.conf +fi + diff --git a/package/ubuntu-10.10/preinst b/package/ubuntu-10.10/preinst index b194ee6c6..13f47935d 100755 --- a/package/ubuntu-10.10/preinst +++ b/package/ubuntu-10.10/preinst @@ -1,3 +1,2 @@ #!/bin/sh -mkdir -p /usr/share/dfhack/doc -mkdir -p /usr/share/dfhack \ No newline at end of file +