diff options
| author | Chia-I Wu <olv@openmoko.com> | 2008-10-30 16:16:14 +0800 |
|---|---|---|
| committer | John Lee <john_lee@openmoko.org> | 2009-01-12 14:29:43 +0800 |
| commit | 02d17611c90fb984000e35900c0f5788c352fafc (patch) | |
| tree | c51d9df2449288c0a284696711f68b8282de10d6 | |
| parent | 89e48df3c27b09c5752cd56bc165b72c4d002cfc (diff) | |
fastboot: netbase: Prefer /etc/sysctl.conf over /etc/network/options.
| -rw-r--r-- | packages/netbase/netbase/init | 9 | ||||
| -rw-r--r-- | packages/netbase/netbase/options | 1 | ||||
| -rw-r--r-- | packages/netbase/netbase_4.21.bb | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/packages/netbase/netbase/init b/packages/netbase/netbase/init index 8d6b9aa426..acc26cba61 100644 --- a/packages/netbase/netbase/init +++ b/packages/netbase/netbase/init @@ -62,9 +62,12 @@ doopt () { case "$1" in start) - doopt spoofprotect yes - doopt syncookies no - doopt ip_forward no + # /etc/sysctl.conf is preferred + if [ ! -f /etc/sysctl.conf ]; then + doopt spoofprotect yes + doopt syncookies no + doopt ip_forward no + fi echo -n "Configuring network interfaces... " ifup -a diff --git a/packages/netbase/netbase/options b/packages/netbase/netbase/options index 2000189d19..a1f9d05f75 100644 --- a/packages/netbase/netbase/options +++ b/packages/netbase/netbase/options @@ -1,3 +1,4 @@ +# used only when /etc/sysctl.conf does not exist ip_forward=no spoofprotect=yes syncookies=no diff --git a/packages/netbase/netbase_4.21.bb b/packages/netbase/netbase_4.21.bb index a0baa81658..9d5f2c6826 100644 --- a/packages/netbase/netbase_4.21.bb +++ b/packages/netbase/netbase_4.21.bb @@ -2,7 +2,7 @@ DESCRIPTION = "This package provides the necessary \ infrastructure for basic TCP/IP based networking." SECTION = "base" LICENSE = "GPL" -PR = "r29" +PR = "r30" inherit update-rc.d |