diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-21 20:57:35 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-21 20:57:35 +0200 |
| commit | 4dc2822fa71e8e3d3ab004c8c14867607bb4de06 (patch) | |
| tree | 21e5b36849ea23f526cc58578a540de3882d7376 /package/base-files | |
| parent | 8f1eff09d5706cbea36ddf1bfc4661579f688853 (diff) | |
| parent | 38910b0bc0393c60da90e1b2540e3d4c5858dae9 (diff) | |
resolve merge conflict
Diffstat (limited to 'package/base-files')
| -rw-r--r-- | package/base-files/src/etc/init.d/boot | 2 | ||||
| -rw-r--r-- | package/base-files/src/etc/sysctl.conf | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/package/base-files/src/etc/init.d/boot b/package/base-files/src/etc/init.d/boot index 2ef6538e0..ed55ccc88 100644 --- a/package/base-files/src/etc/init.d/boot +++ b/package/base-files/src/etc/init.d/boot @@ -8,7 +8,7 @@ mkdir -p /var/log mkdir -p /var/run touch /var/log/lastlog touch /var/log/wtmp -ln -s /var/tmp /tmp +ln -s /tmp /var/tmp echo 0 > /proc/sys/kernel/printk diff --git a/package/base-files/src/etc/sysctl.conf b/package/base-files/src/etc/sysctl.conf index 73260cf9d..f45e98632 100644 --- a/package/base-files/src/etc/sysctl.conf +++ b/package/base-files/src/etc/sysctl.conf @@ -4,6 +4,7 @@ #kernel.panic = 3 # Enable packet forwarding #net.ipv4.ip_forward = 1 +#net.ipv6.conf.all.forwarding = 1 # Disables IP dynaddr #net.ipv4.ip_dynaddr = 0 # Disable ECN |