diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-10-21 10:47:37 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-10-21 10:47:37 +0200 |
commit | aec9ffe68488d34c02bceb4942b87779f5c460d5 (patch) | |
tree | 5aaa0d61510bf94c4dd5bd751b53f61d39817e96 /staging/vde2/dhcpd.conf.sample | |
parent | 59d570b2f4d752b3cd4dfcdf2ce8c75993d9c2eb (diff) | |
parent | 9598f5141ea75ffa72a3c7c85639c6f296020ef1 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/projectm/PKGBUILD
community-testing/evas_generic_loaders-svn/PKGBUILD
community-testing/gambas2/PKGBUILD
community-testing/gambas3/PKGBUILD
community-testing/libextractor/PKGBUILD
community-testing/pdf2djvu/PKGBUILD
community-testing/qtcreator/PKGBUILD
community-testing/qtcreator/qtcreator.desktop
community/galculator/PKGBUILD
community/ristretto/PKGBUILD
core/systemd/PKGBUILD
extra/llvm/PKGBUILD
extra/pyqt/PKGBUILD
extra/python-lxml/PKGBUILD
multilib/lib32-util-linux/PKGBUILD
staging/glew/PKGBUILD
staging/xine-lib/PKGBUILD
testing/calligra/PKGBUILD
testing/gdk-pixbuf2/PKGBUILD
testing/gdm/PKGBUILD
testing/gdm/fix_external_program_directories.patch
testing/glib2/PKGBUILD
testing/gnome-color-manager/PKGBUILD
testing/gthumb/PKGBUILD
testing/gtk3/PKGBUILD
testing/gvfs/PKGBUILD
testing/inkscape/PKGBUILD
testing/kdebase-workspace/PKGBUILD
testing/libreoffice/PKGBUILD
testing/networkmanager/PKGBUILD
testing/polkit/PKGBUILD
testing/poppler/PKGBUILD
testing/rhythmbox/PKGBUILD
testing/xorg-server/PKGBUILD
testing/xorg-xdm/PKGBUILD
Diffstat (limited to 'staging/vde2/dhcpd.conf.sample')
-rw-r--r-- | staging/vde2/dhcpd.conf.sample | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/staging/vde2/dhcpd.conf.sample b/staging/vde2/dhcpd.conf.sample deleted file mode 100644 index 565a78b27..000000000 --- a/staging/vde2/dhcpd.conf.sample +++ /dev/null @@ -1,12 +0,0 @@ -ddns-update-style none; - -subnet 192.168.254.0 netmask 255.255.255.0 { - range 192.168.254.1 192.168.254.253; - option routers 192.168.254.254; - option domain-name "virtual.example.com"; - # find your DNS servers from /etc/resolv.conf - # otherwise only pure IP addresses will work - option domain-name-servers 192.168.254.254; - option broadcast-address 192.168.254.255; - default-lease-time 86400; -} |