diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-28 20:05:07 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-28 20:05:07 +0100 |
| commit | 691c3e56eeab05ab91b6ba4956b842180eac7235 (patch) | |
| tree | cc659f53b2fe2cd38b47bf4024e3fbc52c16b63e | |
| parent | 9b06f46bb5bdcb5d21fd1918d2e8aa7e17fdd91c (diff) | |
| parent | aeab6c21d1505c795167d7b671b60f54402ef536 (diff) | |
Merge branch 'master' of git+ssh://wbx@openadk.org/git/openadk
| -rw-r--r-- | package/dhcp/Makefile | 4 | ||||
| -rw-r--r-- | package/dhcp/files/dhcpd.conf | 11 | ||||
| -rw-r--r-- | target/linux/config/Config.in.netdevice | 17 |
3 files changed, 31 insertions, 1 deletions
diff --git a/package/dhcp/Makefile b/package/dhcp/Makefile index 6bd7cf6a9..1b12e3a5c 100644 --- a/package/dhcp/Makefile +++ b/package/dhcp/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= dhcp PKG_VERSION:= 4.1.1 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 38a74c89d8913b9b5f33737047623c18 PKG_DESCR:= ISC DHCP server PKG_SECTION:= net @@ -27,6 +27,8 @@ post-install: ${INSTALL_BIN} ${WRKINST}/usr/sbin/dhcrelay \ ${IDIR_DHCP_RELAY}/usr/sbin/ ${INSTALL_DIR} ${IDIR_DHCP_SERVER}/usr/sbin + ${INSTALL_DIR} ${IDIR_DHCP_SERVER}/etc + ${INSTALL_DATA} ./files/dhcpd.conf ${IDIR_DHCP_SERVER}/etc ${INSTALL_BIN} ${WRKINST}/usr/sbin/dhcpd \ ${IDIR_DHCP_SERVER}/usr/sbin/ diff --git a/package/dhcp/files/dhcpd.conf b/package/dhcp/files/dhcpd.conf new file mode 100644 index 000000000..1caf07048 --- /dev/null +++ b/package/dhcp/files/dhcpd.conf @@ -0,0 +1,11 @@ +# basic example configuration +ddns-update-style none; +option domain-name "example.org"; +option domain-name-servers ns1.example.org, ns2.example.org; +default-lease-time 600; +max-lease-time 7200; +authoritative; + +subnet 192.168.0.0 netmask 255.255.255.0 { + range 192.168.0.10 192.168.0.20; +} diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice index 2f368773c..457fcaba2 100644 --- a/target/linux/config/Config.in.netdevice +++ b/target/linux/config/Config.in.netdevice @@ -163,6 +163,15 @@ config ADK_MOD_KERNEL_MAC80211 menu "Wireless card support" depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_USB +config ADK_KERNEL_MAC80211_DEBUG_MENU + boolean + default n + +config ADK_KERNEL_MAC80211_VERBOSE_DEBUG + select ADK_KERNEL_MAC80211_DEBUG_MENU + boolean + default n + config ADK_KPACKAGE_KMOD_MAC80211 prompt "kmod-mac80211.................. mac80211 softmac" tristate @@ -176,6 +185,14 @@ config ADK_KPACKAGE_KMOD_MAC80211 select ADK_KERNEL_CRC32 default n +config ADK_DEBUG_MAC80211 + boolean + prompt "enable verbose debugging messages in mac80211" + select ADK_KERNEL_MAC80211_VERBOSE_DEBUG + default n + depends on ADK_KPACKAGE_KMOD_MAC80211 + help + config ADK_KPACKAGE_KMOD_ATH5K prompt "kmod-ath5k................... Atheros 5xxx wireless cards" tristate |