summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2015-07-10 08:39:48 +0300
committerTimo Teräs <timo.teras@iki.fi>2015-07-10 08:40:16 +0300
commitc70092f2d6db72b9d1536953c5eb444865872d2b (patch)
tree4d3c31d3a09f8bdebf63879f88a649188d34cda1
parent4d38e12cfb081241e7370430805bc6911e676508 (diff)
downloadalpine-baselayout-c70092f2d6db72b9d1536953c5eb444865872d2b.tar.gz
alpine-baselayout-c70092f2d6db72b9d1536953c5eb444865872d2b.tar.bz2
alpine-baselayout-c70092f2d6db72b9d1536953c5eb444865872d2b.tar.xz
fix sysctl location and contentsHEADmaster
put sysctl to /etc/sysctl.d with 00 prefix so later sysctl.d files can override it if needed. also remove ip_forward, it default to zero in kernel, and is controlled by iptables init.d or quagga.
-rw-r--r--00-alpine.conf (renamed from sysctl.conf)3
-rw-r--r--Makefile10
2 files changed, 6 insertions, 7 deletions
diff --git a/sysctl.conf b/00-alpine.conf
index bd71168..bba89a0 100644
--- a/sysctl.conf
+++ b/00-alpine.conf
@@ -1,7 +1,4 @@
-net.ipv4.ip_forward = 0
net.ipv4.tcp_syncookies = 1
net.ipv4.conf.default.rp_filter = 1
net.ipv4.conf.all.rp_filter = 1
-
kernel.panic = 120
-
diff --git a/Makefile b/Makefile
index aa60130..d654184 100644
--- a/Makefile
+++ b/Makefile
@@ -19,13 +19,13 @@ ETC_FILES = TZ \
profile \
protocols \
services \
- shells \
- sysctl.conf \
+ shells
MODPROBED_FILES =aliases.conf blacklist.conf i386.conf kms.conf
PROFILED_FILES =color_prompt
+SYSCTL_FILES =00-alpine.conf
CRONTABS =crontab
-DISTFILES =$(ETC_FILES) $(MODPROBED_FILES) Makefile
+DISTFILES =$(ETC_FILES) $(SYSCTL_FILES) $(MODPROBED_FILES) Makefile
all: $(GENERATED_FILES)
for i in $(SUBDIRS) ; do \
@@ -58,6 +58,7 @@ install: $(GENERATED_FILES)
etc/init.d \
etc/modprobe.d \
etc/profile.d \
+ etc/sysctl.d \
etc/network/if-down.d \
etc/network/if-post-down.d \
etc/network/if-pre-up.d \
@@ -98,8 +99,9 @@ install: $(GENERATED_FILES)
done
install -m 0644 $(ETC_FILES) $(GENERATED_FILES) $(DESTDIR)/etc
chmod 600 $(DESTDIR)/etc/shadow
- install -m 0755 $(MODPROBED_FILES) $(DESTDIR)/etc/modprobe.d
+ install -m 0644 $(MODPROBED_FILES) $(DESTDIR)/etc/modprobe.d
install -m 0755 $(PROFILED_FILES) $(DESTDIR)/etc/profile.d
+ install -m 0644 $(SYSCTL_FILES) $(DESTDIR)/etc/sysctl.d
mv $(DESTDIR)/etc/crontab $(DESTDIR)/etc/crontabs/root
ln -s /etc/crontabs $(DESTDIR)/var/spool/cron/crontabs
ln -s /proc/mounts $(DESTDIR)/etc/mtab