alpinelinux/alpine-baselayout
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/alpine-baselayout.git synced 2025-04-19 09:42:19 +03:00
Code

fix sysctl location and contents

Browse Source 
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.
This commit is contained in:
Timo Teräs 2015-07-10 08:39:48 +03:00
parent 4d38e12cfb
commit c70092f2d6
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sysctl.conf → 00-alpine.conf
View File

@ -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

10
Makefile
View File

@ -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