summaryrefslogtreecommitdiff
path: root/package/dnsmasq/files
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-07-25 18:12:30 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-07-25 18:12:30 +0000
commit37ba07b32c887726aeffa54fb6d3af8665402b25 (patch)
treeb512b980f06587a8f45c522b7c3d1503ebd31d46 /package/dnsmasq/files
parentbcd02c4560c0c035d83cbf70f6bf1ca43425b4fa (diff)
use 127.0.0.1 as dns server and point dnsmasq to /tmp/resolv.conf
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4282 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/dnsmasq/files')
-rw-r--r--package/dnsmasq/files/dnsmasq.conf1
1 files changed, 1 insertions, 0 deletions
diff --git a/package/dnsmasq/files/dnsmasq.conf b/package/dnsmasq/files/dnsmasq.conf
index 7aed3a3da4..43acd85b15 100644
--- a/package/dnsmasq/files/dnsmasq.conf
+++ b/package/dnsmasq/files/dnsmasq.conf
@@ -8,6 +8,7 @@ localise-queries
local=/lan/
domain=lan
expand-hosts
+resolv-file=/tmp/resolv.conf
@ifdef dhcp_enable
dhcp-range=@@start@@,@@end@@,@@netmask@@,@@lease@@
rg/openwrt/trunk@27136 3c298f89-4303-0410-b956-a3cf2f4a3e73 2011-04-07[package] block-mount: Reverting 26503. Was already fixed in a better way ↵cshore in commit 26474. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26505 3c298f89-4303-0410-b956-a3cf2f4a3e73 2011-04-06[package] block-mount: fsck.sh should only call pi_include() if dir ↵acinonyx /lib/functions/fsck exists. /etc/functions.sh:pi_include() checks if the argument exists and prints a warning if not. To prevent this warning if package block-mount is installed but not package e2fsprogs, the script should check if this directory exists before calling pi_include() A wrong patch to suppress this warning was previously posted with subject: [PATCH] Fix typo in name of to be included file Signed-off-by: Mark Vels <mark.vels@team-embedded.nl> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26503 3c298f89-4303-0410-b956-a3cf2f4a3e73 2011-04-05[package] block-mount base-files: Added additional check to pi_include to ↵cshore ensure that a directory used with pi_include actually contains files matching the souring pattern because if not the shell dies due to an empty string in for statement. Added /lib/functions/fsck as an empty dir to block-mount. This combination fixes a warning which generates a lot of bug reports, without panicking the kernel like the last attempt. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26479 3c298f89-4303-0410-b956-a3cf2f4a3e73 2011-04-05[package] block-mount: Revert 26468: it causes a kernel panic due to ↵cshore pi_include failing due to the included directory being empty. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26476 3c298f89-4303-0410-b956-a3cf2f4a3e73 2011-04-04[package] block-mount: Removed duplicated directory creation in the package ↵cshore install section. The duplicates were a result of the mergin the block-* packages. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26469 3c298f89-4303-0410-b956-a3cf2f4a3e73 2011-04-04[package] block-mount: Fixed warning of missing /lib/functions/fsck during ↵cshore boot when no scripts are installed in the directory. Thanks to Maarten Bezemer. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26468 3c298f89-4303-0410-b956-a3cf2f4a3e73 2011-03-27[package] block-mount: Merged block-mount, block-extroot, and block-hotplug ↵cshore into a single binary package called block-mount. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26314 3c298f89-4303-0410-b956-a3cf2f4a3e73 2011-03-27[package] block-mount block-extroot: Bump packages versions forgetten during ↵cshore previous two commits git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26313 3c298f89-4303-0410-b956-a3cf2f4a3e73 2011-03-27[package] block-mount block-extroot: Add commands /etc/init.d/fstab ↵cshore overlay_enable and /etc/init.d/fstab whole_root_enable to renable a disable rootfs. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26312 3c298f89-4303-0410-b956-a3cf2f4a3e73 2011-03-27[package] block-mount block-extroot: Rename /tmp/rom-disabled to ↵cshore /tmp/whole_root-dsibled for disabled mounts of a non-overlay external rootfs. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26311 3c298f89-4303-0410-b956-a3cf2f4a3e73 2011-03-20[package] block-mount busybox: Removed busybox versions of blkid and ↵cshore swap-utils since they are only used by block-mount and block-extroot, and those packages don't have as much need for the image space-savings of busybox versions, especially at the cost of including it in all images even those with no external storage. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26245 3c298f89-4303-0410-b956-a3cf2f4a3e73 2011-03-14[package] block-mount: Changed default filesystem for /e/c/fstab to be ext4 ↵cshore instead of ext3 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26156 3c298f89-4303-0410-b956-a3cf2f4a3e73 2011-03-13[package] extroot: block-mount block-extroot: Added ability to do a whole ↵cshore disk extroot instead of only an overlay-based extroot. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26109 3c298f89-4303-0410-b956-a3cf2f4a3e73 2011-02-28[package] block-mount: Fixed shell error on empty string due to -eq to ↵cshore number for the optional find_root variable git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25787 3c298f89-4303-0410-b956-a3cf2f4a3e73 2011-02-28[package] block-mount,block-extroot: Modify mount.sh so that block-extroot ↵cshore mounts target /overlay as rootfs (use if is_rootfs is now deprecated) when block-extroot is installed, and as /tmp/overlay-disabled otherwise git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25786 3c298f89-4303-0410-b956-a3cf2f4a3e73 2010-10-07[package] block-mount: fix fstab.init for IB and buildrootjow git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23296 3c298f89-4303-0410-b956-a3cf2f4a3e73 2010-09-23[package] base/block-extroot, base/block-mount: Modified preinit and ↵cshore block-extroot and block-mount so that use of block-mount and block-extroot do not require that block-extroot, block-mount, nor the kernel modules they depend, on are required to included in the image. That is block-extroot and dependencies may now be installed as modules onto the jffs2 part of a squashfs system and it will work. In addition packages which are installed into the jffs2 of a squashfs system may now affect preinit, so long as they do not require execution of commands that occur before the merging of the jffs2 and built-in (squashfs) preinit scripts is done. Thanks jow for the preinit merge stuff! git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23110 3c298f89-4303-0410-b956-a3cf2f4a3e73 2010-07-12[package] block-mount: Attempt swapon a after mounting as well as before. ↵cshore This ensures that swap on a filesystem is enabled. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22150 3c298f89-4303-0410-b956-a3cf2f4a3e73 2010-07-12[package]: block-mount: Fixed two bugs in fstab.init. /etc/fstab was used ↵cshore where /tmp/fstab should have been, and locking was insufficiently careful and was such that it could result in deadlock when hotplug was in use. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22148 3c298f89-4303-0410-b956-a3cf2f4a3e73 2010-07-12[package]: block-mount: Enable swap before doing fsck so that large ↵cshore filesystem checks have swap as well as memory (as they take large memory for large partitions). Closes #7599. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22147 3c298f89-4303-0410-b956-a3cf2f4a3e73 2010-06-30block-extroot, block-mount: Fixed multiple bugs which prevented e2fsck from ↵cshore being executed on the external root filesystem before mounting it as root. Added /etc/e2fsck.conf which indicates that the clock is broken (since most OpenWRT devices don't have a battery backed RTC) so that e2fsck will not exit with fatal error when the rdat has not yet been run (i.e. before network). git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22002 3c298f89-4303-0410-b956-a3cf2f4a3e73 2010-06-29block-mount: Fixed mount deadlocks due to buggy use of locks in ↵cshore /lib/functions/block.sh git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21987 3c298f89-4303-0410-b956-a3cf2f4a3e73 2010-04-15package/block-mount: mark /etc/config/fstab as conffiles (closes: #7130)nico git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20875 3c298f89-4303-0410-b956-a3cf2f4a3e73 2010-04-06package/block-mount: disable config options altering busybox configuration, ↵nico fix dependencies git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20727 3c298f89-4303-0410-b956-a3cf2f4a3e73 2010-02-26add the block-mount package by Daniel Dickinson (cshore), replacing existing ↵nbd automount functionality git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19877 3c298f89-4303-0410-b956-a3cf2f4a3e73