From: Michael Tremer Date: Fri, 6 Sep 2013 13:03:43 +0000 (+0200) Subject: Use autotools. X-Git-Url: http://git.ipfire.org/?p=people%2Fstevee%2Fnetwork.git;a=commitdiff_plain;h=5ca9dc303abeeea7aa66c47d66c17b153bf419e6 Use autotools. --- diff --git a/.gitignore b/.gitignore index f298e9ea..d522de39 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,22 @@ -html -man/*.[0-9] -man/*.html +/Makefile +/build-aux +/missing +/src/functions/functions +/src/network.pc +/src/ppp/ip-updown +/src/systemd/*.service +/tmp +/*.tar.bz2 +/*.tar.gz +/*.tar.xz +*.log +*.cache +*.stamp +*.trs +*~ +Makefile.in +aclocal.m4 +config.status +configure +install-sh +stamp-* diff --git a/Makefile b/Makefile deleted file mode 100644 index 7c2addc0..00000000 --- a/Makefile +++ /dev/null @@ -1,168 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2012-2013 IPFire Network Development Team # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see . # -# # -############################################################################### - -PACKAGE_NAME = network -PACKAGE_VERSION = 006 - -DESTDIR= - -# Export HTML documents to this directory. -HTML_DOCS_DIR = html - -prefix=/usr -bindir=$(prefix)/bin -sbindir=$(prefix)/sbin -libdir=$(prefix)/lib -datadir=$(prefix)/share -mandir=$(datadir)/man -sysconfdir=/etc -localstatedir=/var -systemdunitdir=$(prefix)/lib/systemd/system -tmpfilesdir=$(prefix)/lib/tmpfiles.d - -# File to store the version number in. -VERSION_FILE = $(DESTDIR)$(libdir)/network/version - -# A list of files which should be removed on "make clean" -CLEANFILES = - -# man pages -MAN_PAGES = \ - man/firewall-config.8 \ - man/network.8 \ - man/network-config.8 \ - man/network-device.8 \ - man/network-dns-server.8 \ - man/network-port-batman-adv.8 \ - man/network-port-batman-adv-port.8 \ - man/network-route.8 \ - man/network-zone.8 \ - man/network-zone-6rd.8 \ - man/network-zone-6to4-tunnel.8 \ - man/network-zone-aiccu.8 \ - man/network-zone-bridge.8 \ - man/network-zone-config-pppoe-server.8 \ - man/network-zone-pppoe.8 \ - man/network-zone-pptp.8 - -MAN_PAGES_HTML = $(patsubst %.xml,%.html,$(MAN_PAGES_XML)) -MAN_PAGES_XML = $(patsubst %.8,%.xml,$(MAN_PAGES)) -MAN_PAGES_8 = $(filter %.8,$(MAN_PAGES)) - -CLEANFILES += \ - $(MAN_PAGES) \ - $(MAN_PAGES_HTML) - -XSLTPROC = xsltproc - -XSLTPROC_FLAGS = \ - --nonet \ - --stringparam man.output.quietly 1 \ - --stringparam funcsynopsis.style ansi \ - --stringparam man.th.extra1.suppress 1 \ - --stringparam man.authors.section.enabled 1 \ - --stringparam man.copyright.section.enabled 1 - -XSLTPROC_COMMAND_MAN = \ - $(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) \ - http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< - -XSLTPROC_COMMAND_HTML = \ - $(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) man/custom-html.xsl $< - -man/%.8: man/%.xml - $(XSLTPROC_COMMAND_MAN) - -man/%.html: man/%.xml man/custom-html.xsl - $(XSLTPROC_COMMAND_HTML) - -.PHONY: all -all: $(MAN_PAGES) - -.PHONY: install -install: $(MAN_PAGES) - -mkdir -pv $(DESTDIR)$(sysconfdir)/{network/{ports,zones},ppp} - -mkdir -pv $(DESTDIR)$(libdir)/{network,sysctl.d,udev} - -mkdir -pv $(DESTDIR)$(localstatedir)/log/network - -mkdir -pv $(DESTDIR)$(sbindir) - -mkdir -pv $(DESTDIR)$(systemdunitdir) - -mkdir -pv $(DESTDIR)$(tmpfilesdir) - -mkdir -pv $(DESTDIR)$(datadir)/firewall - - install -m 755 -v firewall-config $(DESTDIR)$(sbindir) - install -m 755 -v firewall6 $(DESTDIR)$(sbindir) - install -m 755 -v firewall4 $(DESTDIR)$(sbindir) - install -m 755 -v network $(DESTDIR)$(sbindir) - - cp -rfv {hooks,header*,functions*} $(DESTDIR)$(libdir)/network/ - cp -fv sysctl.d/* $(DESTDIR)$(libdir)/sysctl.d/ - cp -rfv udev/* $(DESTDIR)$(libdir)/udev - cp -rfv network-* $(DESTDIR)$(libdir)/network/ - cp -vf systemd/*.service $(DESTDIR)$(systemdunitdir) - cp -vf network.tmpfiles $(DESTDIR)$(tmpfilesdir)/network.conf - - # Install the helper tools. - -mkdir -pv $(DESTDIR)$(libdir)/network/helpers - cp -vf helpers/* $(DESTDIR)$(libdir)/network/helpers - - # Install bridge-stp. - ln -svf --relative \ - $(DESTDIR)$(libdir)/network/helpers/bridge-stp \ - $(DESTDIR)$(sbindir)/ - - # Install dhclient script and helper. - install -m 755 dhclient-helper $(DESTDIR)$(libdir)/network/ - install -m 755 dhclient-script $(DESTDIR)$(sbindir)/ - - install -m 755 -v ppp/ip-updown $(DESTDIR)$(sysconfdir)/ppp - ln -svf ip-updown $(DESTDIR)$(sysconfdir)/ppp/ip-pre-up - ln -svf ip-updown $(DESTDIR)$(sysconfdir)/ppp/ip-up - ln -svf ip-updown $(DESTDIR)$(sysconfdir)/ppp/ip-down - ln -svf ip-updown $(DESTDIR)$(sysconfdir)/ppp/ipv6-up - ln -svf ip-updown $(DESTDIR)$(sysconfdir)/ppp/ipv6-down - install -m 755 -v ppp/dialer $(DESTDIR)$(libdir)/network/ - - # Install pppoe-server wrapper. - install -m 755 ppp/pppoe-server $(DESTDIR)$(libdir)/network/ - - # Install the firewall macros. - cp -av macros $(DESTDIR)$(datadir)/firewall/ - - # Create the version file. - : > $(VERSION_FILE) - echo "# This file is automatically generated." >> $(VERSION_FILE) - echo "NETWORK_VERSION=$(PACKAGE_VERSION)" >> $(VERSION_FILE) - - # Install man pages. - -mkdir -pv $(DESTDIR)$(mandir)/man8 - install -v -m 644 $(MAN_PAGES_8) $(DESTDIR)$(mandir)/man8 - -.PHONY: clean -clean: - rm -f $(CLEANFILES) - -dist: - git archive --format tar --prefix $(PACKAGE_NAME)-$(PACKAGE_VERSION)/ HEAD | gzip -9 > \ - $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz - -.PHONY: export-html-docs -export-html-docs: $(MAN_PAGES_HTML) - mkdir -pv $(HTML_DOCS_DIR) - cp -vf $^ $(HTML_DOCS_DIR) diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 00000000..bafbc883 --- /dev/null +++ b/Makefile.am @@ -0,0 +1,411 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2012-2013 IPFire Network Development Team # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +# # +############################################################################### + +ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} +AM_MAKEFLAGS = --no-print-directory +AUTOMAKE_OPTIONS = color-tests + +# remove target it the command fails +.DELETE_ON_ERROR: + +# keep itermediate files +.SECONDARY: + +libexecdir = $(prefix)/lib +pkgconfigdatadir = $(datadir)/pkgconfig +pppdir = $(sysconfdir)/ppp +sysctldir = $(prefix)/lib/sysctl.d +tmpfilesdir = $(prefix)/lib/tmpfiles.d +udevrulesdir = $(udevdir)/rules.d + +networkdir = $(libexecdir)/network +helpersdir = $(networkdir)/helpers + +macrosdir = $(libexecdir)/firewall/macros + +hooksdir = $(networkdir)/hooks +hooks_portsdir = $(hooksdir)/ports +hooks_zonesdir = $(hooksdir)/zones + +CLEANFILES = +DISTCLEANFILES = +EXTRA_DIST = +INSTALL_DIRS = +INSTALL_EXEC_HOOKS = +UNINSTALL_EXEC_HOOKS = +noinst_DATA = + +DISTCHECK_CONFIGURE_FLAGS = \ + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) \ + --with-udevdir=$$dc_install_base/$(udevdir) + +install-directories-hook: + $(MKDIR_P) $(addprefix $(DESTDIR),$(INSTALL_DIRS)) + +INSTALL_EXEC_HOOKS += \ + install-directories-hook + +# ------------------------------------------------------------------------------ + +AM_V_XSLT = $(AM_V_XSLT_$(V)) +AM_V_XSLT_ = $(AM_V_XSLT_$(AM_DEFAULT_VERBOSITY)) +AM_V_XSLT_0 = @echo " XSLT " $@; + +# ------------------------------------------------------------------------------ + +dist_doc_DATA = \ + README + +dist_sbin_SCRIPTS = \ + src/dhclient-script \ + src/firewall-config \ + src/firewall4 \ + src/firewall6 \ + src/network + +network_SCRIPTS = \ + src/functions/functions + +CLEANFILES += \ + src/functions/functions + +EXTRA_DIST += \ + src/functions/functions.in + +dist_network_SCRIPTS = \ + src/functions/functions.aiccu \ + src/functions/functions.at \ + src/functions/functions.auth \ + src/functions/functions.batman-adv \ + src/functions/functions.bonding \ + src/functions/functions.bridge \ + src/functions/functions.cli \ + src/functions/functions.cli.firewall \ + src/functions/functions.colors \ + src/functions/functions.config \ + src/functions/functions.conntrack \ + src/functions/functions.constants \ + src/functions/functions.constants-firewall \ + src/functions/functions.db \ + src/functions/functions.device \ + src/functions/functions.dhclient \ + src/functions/functions.dhcpd \ + src/functions/functions.distro \ + src/functions/functions.dns \ + src/functions/functions.dummy \ + src/functions/functions.ethernet \ + src/functions/functions.firewall \ + src/functions/functions.firewall-policy \ + src/functions/functions.firewall-zones \ + src/functions/functions.he \ + src/functions/functions.hook \ + src/functions/functions.hostapd \ + src/functions/functions.http \ + src/functions/functions.ip \ + src/functions/functions.iptables \ + src/functions/functions.ip-tunnel \ + src/functions/functions.ipv4 \ + src/functions/functions.ipv6 \ + src/functions/functions.isdn \ + src/functions/functions.list \ + src/functions/functions.lock \ + src/functions/functions.logging \ + src/functions/functions.macros \ + src/functions/functions.macvlan \ + src/functions/functions.modem \ + src/functions/functions.phy \ + src/functions/functions.ports \ + src/functions/functions.ppp \ + src/functions/functions.pppoe-server \ + src/functions/functions.radvd \ + src/functions/functions.red \ + src/functions/functions.route \ + src/functions/functions.routing \ + src/functions/functions.serial \ + src/functions/functions.service \ + src/functions/functions.stp \ + src/functions/functions.switch \ + src/functions/functions.sysctl \ + src/functions/functions.teredo \ + src/functions/functions.usb \ + src/functions/functions.util \ + src/functions/functions.vlan \ + src/functions/functions.wireless \ + src/functions/functions.wpa_supplicant \ + src/functions/functions.zone \ + src/network-radvd-config \ + src/dhclient-helper \ + src/header-config \ + src/header-port \ + src/header-zone \ + src/ppp/dialer \ + src/ppp/pppoe-server + +dist_helpers_SCRIPTS = \ + src/helpers/aiccu-config-helper \ + src/helpers/bridge-stp \ + src/helpers/dhcpd-config-helper \ + src/helpers/firewall-kernel-init \ + src/helpers/hostapd-config-helper \ + src/helpers/miredo-config-helper \ + src/helpers/miredo-helper \ + src/helpers/pppd-angel \ + src/helpers/wpa_supplicant \ + src/helpers/wpa_supplicant-config-helper + +bridge-stp-install-hook: + ln -svf --relative $(DESTDIR)$(helpersdir)/bridge-stp $(DESTDIR)$(sbindir)/ + +bridge-stp-uninstall-hook: + rm -f $(DESTDIR)$(sbindir)/bridge-stp + +INSTALL_EXEC_HOOKS += bridge-stp-install-hook +UNINSTALL_EXEC_HOOKS += bridge-stp-uninstall-hook + +dist_hooks_ports_SCRIPTS = \ + src/hooks/ports/batman-adv \ + src/hooks/ports/batman-adv-port \ + src/hooks/ports/bonding \ + src/hooks/ports/dummy \ + src/hooks/ports/ethernet \ + src/hooks/ports/macvlan \ + src/hooks/ports/vlan \ + src/hooks/ports/wireless-ap + +dist_hooks_zones_SCRIPTS = \ + src/hooks/zones/6rd \ + src/hooks/zones/6to4-tunnel \ + src/hooks/zones/aiccu \ + src/hooks/zones/batman-adv \ + src/hooks/zones/bridge \ + src/hooks/zones/isdn \ + src/hooks/zones/isdn-server \ + src/hooks/zones/modem \ + src/hooks/zones/pppoe \ + src/hooks/zones/pptp \ + src/hooks/zones/switch \ + src/hooks/zones/teredo \ + src/hooks/zones/wireless + +# ------------------------------------------------------------------------------ + +ppp_SCRIPTS = \ + src/ppp/ip-updown + +CLEANFILES += \ + src/ppp/ip-updown + +EXTRA_DIST += \ + src/ppp/ip-updown.in + +INSTALL_DIRS += \ + $(pppdir) + +ppp-install-hook: + ln -svf ip-updown $(DESTDIR)$(pppdir)/ip-pre-up + ln -svf ip-updown $(DESTDIR)$(pppdir)/ip-up + ln -svf ip-updown $(DESTDIR)$(pppdir)/ip-down + ln -svf ip-updown $(DESTDIR)$(pppdir)/ipv6-up + ln -svf ip-updown $(DESTDIR)$(pppdir)/ipv6-down + +ppp-uninstall-hook: + rm -f $(DESTDIR)$(pppdir)/ip-{down,pre-up,up} + rm -f $(DESTDIR)$(pppdir)/ipv6-{down,up} + +INSTALL_EXEC_HOOKS += ppp-install-hook +UNINSTALL_EXEC_HOOKS += ppp-uninstall-hook + +# ------------------------------------------------------------------------------ + +if HAVE_SYSTEMD +systemdsystemunit_DATA = \ + src/systemd/firewall4.service \ + src/systemd/firewall6.service \ + src/systemd/firewall-init.service \ + src/systemd/network-init.service \ + src/systemd/network@.service + +CLEANFILES += \ + $(systemdsystemunit_DATA) + +INSTALL_DIRS += \ + $(systemdsystemunitdir) +endif + +EXTRA_DIST += \ + src/systemd/firewall4.service.in \ + src/systemd/firewall6.service.in \ + src/systemd/firewall-init.service.in \ + src/systemd/network-init.service.in \ + src/systemd/network@.service.in + +# ------------------------------------------------------------------------------ + +dist_sysctl_DATA = \ + src/sysctl/network.conf + +# ------------------------------------------------------------------------------ + +dist_tmpfiles_DATA = \ + src/tmpfiles/network + +# ------------------------------------------------------------------------------ + +if HAVE_UDEV +dist_udev_SCRIPTS = \ + src/udev/network-hotplug \ + src/udev/network-hotplug-rename \ + src/udev/network-hotplug-serial + +dist_udevrules_DATA = \ + src/udev/rules.d/50-serial-whitelist.rules \ + src/udev/rules.d/60-net.rules + +INSTALL_DIRS += \ + $(udevdir) \ + $(udevrulesdir) +endif + +# ------------------------------------------------------------------------------ + +pkgconfigdata_DATA = \ + src/network.pc + +CLEANFILES += \ + $(pkgconfigdata_DATA) + +EXTRA_DIST += \ + src/network.pc.in + +# ------------------------------------------------------------------------------ + +dist_macros_DATA = \ + src/macros/DHCP \ + src/macros/HTTP \ + src/macros/HTTPS \ + src/macros/WWW + +# ------------------------------------------------------------------------------ + +MANPAGES = \ + man/firewall-config.8 \ + man/network.8 \ + man/network-config.8 \ + man/network-device.8 \ + man/network-dns-server.8 \ + man/network-port-batman-adv.8 \ + man/network-port-batman-adv-port.8 \ + man/network-route.8 \ + man/network-zone.8 \ + man/network-zone-6rd.8 \ + man/network-zone-6to4-tunnel.8 \ + man/network-zone-aiccu.8 \ + man/network-zone-bridge.8 \ + man/network-zone-config-pppoe-server.8 \ + man/network-zone-pppoe.8 \ + man/network-zone-pptp.8 + +MANPAGES_XML = $(patsubst %.8,%.xml,$(MANPAGES)) +MANPAGES_HTML = $(patsubst %.xml,%.html,$(MANPAGES_XML)) + +.PHONY: man +man: $(MANPAGES) $(MANPAGES_HTML) + +man_MANS = \ + $(MANPAGES) + +noinst_DATA += \ + $(MANPAGES_HTML) + +CLEANFILES += \ + $(man_MANS) \ + $(MANPAGES_HTML) + +EXTRA_DIST += \ + $(MANPAGES_XML) \ + man/custom-html.xsl + +XSLTPROC_FLAGS = \ + --nonet \ + --stringparam man.output.quietly 1 \ + --stringparam funcsynopsis.style ansi \ + --stringparam man.th.extra1.suppress 1 \ + --stringparam man.authors.section.enabled 1 \ + --stringparam man.copyright.section.enabled 1 + +XSLTPROC_COMMAND_MAN = \ + $(AM_V_XSLT)$(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) \ + http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< + +XSLTPROC_COMMAND_HTML = \ + $(AM_V_XSLT)$(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) $(srcdir)/man/custom-html.xsl $< + +man/%.8: man/%.xml + $(XSLTPROC_COMMAND_MAN) + +man/%.html: man/%.xml man/custom-html.xsl + $(XSLTPROC_COMMAND_HTML) + +# ------------------------------------------------------------------------------ + +substitutions = \ + '|PACKAGE_NAME=$(PACKAGE_NAME)|' \ + '|PACKAGE_URL=$(PACKAGE_URL)|' \ + '|PACKAGE_VERSION=$(PACKAGE_VERSION)|' \ + '|prefix=$(prefix)|' \ + '|exec_prefix=$(exec_prefix)|' \ + '|sbindir=$(sbindir)|' \ + '|networkdir=$(networkdir)|' + +SED_PROCESS = \ + $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ + $(SED) $(subst '|,-e 's|@,$(subst =,\@|,$(subst |',|g',$(substitutions)))) \ + < $< > $@ + +src/functions/functions: src/functions/functions.in Makefile + $(SED_PROCESS) + +src/ppp/ip-updown: src/ppp/ip-updown.in Makefile + $(SED_PROCESS) + +src/systemd/%: src/systemd/%.in Makefile + $(SED_PROCESS) + +src/%.pc: src/%.pc.in Makefile + $(SED_PROCESS) + +INSTALL_DIRS += \ + $(sbindir) + +install-exec-hook: $(INSTALL_EXEC_HOOKS) + +uninstall-hook: $(UNINSTALL_EXEC_HOOKS) + +# - testsuite ------------------------------------------------------------------ + +TESTS_ENVIRONMENT = \ + topdir="$(shell pwd)" \ + networkdir="$(top_srcdir)/src/functions" + +dist_check_SCRIPTS = \ + test/load-library + +TESTS = \ + test/load-library diff --git a/autogen.sh b/autogen.sh new file mode 100755 index 00000000..c08fadf9 --- /dev/null +++ b/autogen.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +autoreconf --force --install --symlink diff --git a/configure.ac b/configure.ac new file mode 100644 index 00000000..f3dd33b4 --- /dev/null +++ b/configure.ac @@ -0,0 +1,82 @@ +############################################################################### +# # +# Pakfire - The IPFire package management system # +# Copyright (C) 2013 IPFire Network Development Team # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +# # +############################################################################### + +AC_PREREQ([2.64]) + +AC_INIT([network], + [006], + [info@ipfire.org], + [network], + [http://www.ipfire.org/]) + +AC_CONFIG_AUX_DIR([build-aux]) + +AC_PREFIX_DEFAULT([/usr]) + +AM_INIT_AUTOMAKE([ + foreign + 1.11 + -Wall + -Wno-portability + silent-rules + tar-pax + subdir-objects +]) +AM_SILENT_RULES([yes]) + +AC_PROG_LN_S +AC_PROG_MKDIR_P +AC_PROG_SED + +AC_PATH_PROG([XSLTPROC], [xsltproc]) + +# pkg-config +PKG_PROG_PKG_CONFIG +# This makes sure pkg.m4 is available. +m4_pattern_forbid([^_?PKG_[A-Z_]+$],[*** pkg.m4 missing, please install pkg-config]) + +# ------------------------------------------------------------------------------ +AC_ARG_WITH([systemdsystemunitdir], + AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]), + [], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)]) +AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) +AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir"]) + +# ------------------------------------------------------------------------------ +AC_ARG_WITH([udevdir], + AS_HELP_STRING([--with-udevdir=DIR], [Directory for udev files]), + [], [with_udevdir=$($PKG_CONFIG --variable=udevdir udev)]) +AC_SUBST([udevdir], [$with_udevdir]) +AM_CONDITIONAL(HAVE_UDEV, [test -n "$with_udevdir"]) + +# ------------------------------------------------------------------------------ +AC_CONFIG_FILES([ + Makefile +]) + +AC_OUTPUT +AC_MSG_RESULT([ + $PACKAGE_NAME $VERSION + + prefix: $prefix + + systemdsystemunitdir: $systemdsystemunitdir + udevdir: $udevdir +]) diff --git a/man/.gitignore b/man/.gitignore new file mode 100644 index 00000000..237049a5 --- /dev/null +++ b/man/.gitignore @@ -0,0 +1,2 @@ +/*.[13578] +/*.html diff --git a/dhclient-helper b/src/dhclient-helper similarity index 100% rename from dhclient-helper rename to src/dhclient-helper diff --git a/dhclient-script b/src/dhclient-script similarity index 100% rename from dhclient-script rename to src/dhclient-script diff --git a/firewall-config b/src/firewall-config similarity index 100% rename from firewall-config rename to src/firewall-config diff --git a/firewall4 b/src/firewall4 similarity index 100% rename from firewall4 rename to src/firewall4 diff --git a/firewall6 b/src/firewall6 similarity index 100% rename from firewall6 rename to src/firewall6 diff --git a/functions.aiccu b/src/functions/functions.aiccu similarity index 100% rename from functions.aiccu rename to src/functions/functions.aiccu diff --git a/functions.at b/src/functions/functions.at similarity index 100% rename from functions.at rename to src/functions/functions.at diff --git a/functions.auth b/src/functions/functions.auth similarity index 100% rename from functions.auth rename to src/functions/functions.auth diff --git a/functions.batman-adv b/src/functions/functions.batman-adv similarity index 100% rename from functions.batman-adv rename to src/functions/functions.batman-adv diff --git a/functions.bonding b/src/functions/functions.bonding similarity index 100% rename from functions.bonding rename to src/functions/functions.bonding diff --git a/functions.bridge b/src/functions/functions.bridge similarity index 100% rename from functions.bridge rename to src/functions/functions.bridge diff --git a/functions.cli b/src/functions/functions.cli similarity index 100% rename from functions.cli rename to src/functions/functions.cli diff --git a/functions.cli.firewall b/src/functions/functions.cli.firewall old mode 100755 new mode 100644 similarity index 100% rename from functions.cli.firewall rename to src/functions/functions.cli.firewall diff --git a/functions.colors b/src/functions/functions.colors similarity index 100% rename from functions.colors rename to src/functions/functions.colors diff --git a/functions.config b/src/functions/functions.config similarity index 100% rename from functions.config rename to src/functions/functions.config diff --git a/functions.conntrack b/src/functions/functions.conntrack similarity index 100% rename from functions.conntrack rename to src/functions/functions.conntrack diff --git a/functions.constants b/src/functions/functions.constants similarity index 100% rename from functions.constants rename to src/functions/functions.constants diff --git a/functions.constants-firewall b/src/functions/functions.constants-firewall similarity index 100% rename from functions.constants-firewall rename to src/functions/functions.constants-firewall diff --git a/functions.db b/src/functions/functions.db similarity index 100% rename from functions.db rename to src/functions/functions.db diff --git a/functions.device b/src/functions/functions.device similarity index 100% rename from functions.device rename to src/functions/functions.device diff --git a/functions.dhclient b/src/functions/functions.dhclient similarity index 100% rename from functions.dhclient rename to src/functions/functions.dhclient diff --git a/functions.dhcpd b/src/functions/functions.dhcpd similarity index 100% rename from functions.dhcpd rename to src/functions/functions.dhcpd diff --git a/functions.distro b/src/functions/functions.distro similarity index 100% rename from functions.distro rename to src/functions/functions.distro diff --git a/functions.dns b/src/functions/functions.dns similarity index 100% rename from functions.dns rename to src/functions/functions.dns diff --git a/functions.dummy b/src/functions/functions.dummy similarity index 100% rename from functions.dummy rename to src/functions/functions.dummy diff --git a/functions.ethernet b/src/functions/functions.ethernet similarity index 100% rename from functions.ethernet rename to src/functions/functions.ethernet diff --git a/functions.firewall b/src/functions/functions.firewall similarity index 100% rename from functions.firewall rename to src/functions/functions.firewall diff --git a/functions.firewall-policy b/src/functions/functions.firewall-policy similarity index 100% rename from functions.firewall-policy rename to src/functions/functions.firewall-policy diff --git a/functions.firewall-zones b/src/functions/functions.firewall-zones similarity index 100% rename from functions.firewall-zones rename to src/functions/functions.firewall-zones diff --git a/functions.he b/src/functions/functions.he similarity index 100% rename from functions.he rename to src/functions/functions.he diff --git a/functions.hook b/src/functions/functions.hook similarity index 100% rename from functions.hook rename to src/functions/functions.hook diff --git a/functions.hostapd b/src/functions/functions.hostapd similarity index 100% rename from functions.hostapd rename to src/functions/functions.hostapd diff --git a/functions.http b/src/functions/functions.http similarity index 100% rename from functions.http rename to src/functions/functions.http diff --git a/functions b/src/functions/functions.in similarity index 91% rename from functions rename to src/functions/functions.in index 2f6cfdf4..61327d58 100644 --- a/functions +++ b/src/functions/functions.in @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2012 IPFire Network Development Team # +# Copyright (C) 2012-2013 IPFire Network Development Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -36,9 +36,9 @@ function init_run() { done } -# Include version information. -. /usr/lib/network/version +VERSION="@PACKAGE_VERSION@" +NETWORK_VERSION="${VERSION}" -for file in /usr/lib/network/functions.*; do +for file in @networkdir@/functions.*; do . ${file} done diff --git a/functions.ip b/src/functions/functions.ip similarity index 100% rename from functions.ip rename to src/functions/functions.ip diff --git a/functions.ip-tunnel b/src/functions/functions.ip-tunnel similarity index 100% rename from functions.ip-tunnel rename to src/functions/functions.ip-tunnel diff --git a/functions.iptables b/src/functions/functions.iptables similarity index 100% rename from functions.iptables rename to src/functions/functions.iptables diff --git a/functions.ipv4 b/src/functions/functions.ipv4 similarity index 100% rename from functions.ipv4 rename to src/functions/functions.ipv4 diff --git a/functions.ipv6 b/src/functions/functions.ipv6 similarity index 100% rename from functions.ipv6 rename to src/functions/functions.ipv6 diff --git a/functions.isdn b/src/functions/functions.isdn similarity index 100% rename from functions.isdn rename to src/functions/functions.isdn diff --git a/functions.list b/src/functions/functions.list similarity index 100% rename from functions.list rename to src/functions/functions.list diff --git a/functions.lock b/src/functions/functions.lock similarity index 100% rename from functions.lock rename to src/functions/functions.lock diff --git a/functions.logging b/src/functions/functions.logging similarity index 100% rename from functions.logging rename to src/functions/functions.logging diff --git a/functions.macros b/src/functions/functions.macros similarity index 100% rename from functions.macros rename to src/functions/functions.macros diff --git a/functions.macvlan b/src/functions/functions.macvlan similarity index 100% rename from functions.macvlan rename to src/functions/functions.macvlan diff --git a/functions.modem b/src/functions/functions.modem similarity index 100% rename from functions.modem rename to src/functions/functions.modem diff --git a/functions.phy b/src/functions/functions.phy similarity index 100% rename from functions.phy rename to src/functions/functions.phy diff --git a/functions.ports b/src/functions/functions.ports similarity index 100% rename from functions.ports rename to src/functions/functions.ports diff --git a/functions.ppp b/src/functions/functions.ppp similarity index 100% rename from functions.ppp rename to src/functions/functions.ppp diff --git a/functions.pppoe-server b/src/functions/functions.pppoe-server similarity index 100% rename from functions.pppoe-server rename to src/functions/functions.pppoe-server diff --git a/functions.radvd b/src/functions/functions.radvd similarity index 100% rename from functions.radvd rename to src/functions/functions.radvd diff --git a/functions.red b/src/functions/functions.red similarity index 100% rename from functions.red rename to src/functions/functions.red diff --git a/functions.route b/src/functions/functions.route similarity index 100% rename from functions.route rename to src/functions/functions.route diff --git a/functions.routing b/src/functions/functions.routing similarity index 100% rename from functions.routing rename to src/functions/functions.routing diff --git a/functions.serial b/src/functions/functions.serial similarity index 100% rename from functions.serial rename to src/functions/functions.serial diff --git a/functions.service b/src/functions/functions.service similarity index 100% rename from functions.service rename to src/functions/functions.service diff --git a/functions.stp b/src/functions/functions.stp similarity index 100% rename from functions.stp rename to src/functions/functions.stp diff --git a/functions.switch b/src/functions/functions.switch similarity index 100% rename from functions.switch rename to src/functions/functions.switch diff --git a/functions.sysctl b/src/functions/functions.sysctl similarity index 100% rename from functions.sysctl rename to src/functions/functions.sysctl diff --git a/functions.teredo b/src/functions/functions.teredo similarity index 100% rename from functions.teredo rename to src/functions/functions.teredo diff --git a/functions.usb b/src/functions/functions.usb similarity index 100% rename from functions.usb rename to src/functions/functions.usb diff --git a/functions.util b/src/functions/functions.util similarity index 100% rename from functions.util rename to src/functions/functions.util diff --git a/functions.vlan b/src/functions/functions.vlan similarity index 100% rename from functions.vlan rename to src/functions/functions.vlan diff --git a/functions.wireless b/src/functions/functions.wireless similarity index 100% rename from functions.wireless rename to src/functions/functions.wireless diff --git a/functions.wpa_supplicant b/src/functions/functions.wpa_supplicant similarity index 100% rename from functions.wpa_supplicant rename to src/functions/functions.wpa_supplicant diff --git a/functions.zone b/src/functions/functions.zone similarity index 100% rename from functions.zone rename to src/functions/functions.zone diff --git a/header-config b/src/header-config similarity index 100% rename from header-config rename to src/header-config diff --git a/header-port b/src/header-port similarity index 100% rename from header-port rename to src/header-port diff --git a/header-zone b/src/header-zone similarity index 100% rename from header-zone rename to src/header-zone diff --git a/helpers/aiccu-config-helper b/src/helpers/aiccu-config-helper similarity index 100% rename from helpers/aiccu-config-helper rename to src/helpers/aiccu-config-helper diff --git a/helpers/bridge-stp b/src/helpers/bridge-stp similarity index 100% rename from helpers/bridge-stp rename to src/helpers/bridge-stp diff --git a/helpers/dhcpd-config-helper b/src/helpers/dhcpd-config-helper similarity index 100% rename from helpers/dhcpd-config-helper rename to src/helpers/dhcpd-config-helper diff --git a/helpers/firewall-kernel-init b/src/helpers/firewall-kernel-init similarity index 100% rename from helpers/firewall-kernel-init rename to src/helpers/firewall-kernel-init diff --git a/helpers/hostapd-config-helper b/src/helpers/hostapd-config-helper similarity index 100% rename from helpers/hostapd-config-helper rename to src/helpers/hostapd-config-helper diff --git a/helpers/miredo-config-helper b/src/helpers/miredo-config-helper similarity index 100% rename from helpers/miredo-config-helper rename to src/helpers/miredo-config-helper diff --git a/helpers/miredo-helper b/src/helpers/miredo-helper similarity index 100% rename from helpers/miredo-helper rename to src/helpers/miredo-helper diff --git a/helpers/pppd-angel b/src/helpers/pppd-angel similarity index 100% rename from helpers/pppd-angel rename to src/helpers/pppd-angel diff --git a/helpers/wpa_supplicant b/src/helpers/wpa_supplicant similarity index 100% rename from helpers/wpa_supplicant rename to src/helpers/wpa_supplicant diff --git a/helpers/wpa_supplicant-config-helper b/src/helpers/wpa_supplicant-config-helper similarity index 100% rename from helpers/wpa_supplicant-config-helper rename to src/helpers/wpa_supplicant-config-helper diff --git a/hooks/ports/batman-adv b/src/hooks/ports/batman-adv similarity index 100% rename from hooks/ports/batman-adv rename to src/hooks/ports/batman-adv diff --git a/hooks/ports/batman-adv-port b/src/hooks/ports/batman-adv-port similarity index 100% rename from hooks/ports/batman-adv-port rename to src/hooks/ports/batman-adv-port diff --git a/hooks/ports/bonding b/src/hooks/ports/bonding similarity index 100% rename from hooks/ports/bonding rename to src/hooks/ports/bonding diff --git a/hooks/ports/dummy b/src/hooks/ports/dummy similarity index 100% rename from hooks/ports/dummy rename to src/hooks/ports/dummy diff --git a/hooks/ports/ethernet b/src/hooks/ports/ethernet similarity index 100% rename from hooks/ports/ethernet rename to src/hooks/ports/ethernet diff --git a/hooks/ports/macvlan b/src/hooks/ports/macvlan similarity index 100% rename from hooks/ports/macvlan rename to src/hooks/ports/macvlan diff --git a/hooks/ports/vlan b/src/hooks/ports/vlan similarity index 100% rename from hooks/ports/vlan rename to src/hooks/ports/vlan diff --git a/hooks/ports/wireless-ap b/src/hooks/ports/wireless-ap similarity index 100% rename from hooks/ports/wireless-ap rename to src/hooks/ports/wireless-ap diff --git a/hooks/zones/6rd b/src/hooks/zones/6rd similarity index 100% rename from hooks/zones/6rd rename to src/hooks/zones/6rd diff --git a/hooks/zones/6to4-tunnel b/src/hooks/zones/6to4-tunnel similarity index 100% rename from hooks/zones/6to4-tunnel rename to src/hooks/zones/6to4-tunnel diff --git a/hooks/zones/aiccu b/src/hooks/zones/aiccu similarity index 100% rename from hooks/zones/aiccu rename to src/hooks/zones/aiccu diff --git a/hooks/zones/bridge b/src/hooks/zones/bridge similarity index 100% rename from hooks/zones/bridge rename to src/hooks/zones/bridge diff --git a/hooks/zones/bridge.configs/ipv4-dhcp b/src/hooks/zones/bridge.configs/ipv4-dhcp similarity index 100% rename from hooks/zones/bridge.configs/ipv4-dhcp rename to src/hooks/zones/bridge.configs/ipv4-dhcp diff --git a/hooks/zones/bridge.configs/ipv4-static b/src/hooks/zones/bridge.configs/ipv4-static similarity index 100% rename from hooks/zones/bridge.configs/ipv4-static rename to src/hooks/zones/bridge.configs/ipv4-static diff --git a/hooks/zones/bridge.configs/ipv6-static b/src/hooks/zones/bridge.configs/ipv6-static similarity index 100% rename from hooks/zones/bridge.configs/ipv6-static rename to src/hooks/zones/bridge.configs/ipv6-static diff --git a/hooks/zones/bridge.configs/pppoe-server b/src/hooks/zones/bridge.configs/pppoe-server similarity index 100% rename from hooks/zones/bridge.configs/pppoe-server rename to src/hooks/zones/bridge.configs/pppoe-server diff --git a/hooks/zones/bridge.ports/batman-adv b/src/hooks/zones/bridge.ports/batman-adv similarity index 100% rename from hooks/zones/bridge.ports/batman-adv rename to src/hooks/zones/bridge.ports/batman-adv diff --git a/hooks/zones/bridge.ports/bonding b/src/hooks/zones/bridge.ports/bonding similarity index 100% rename from hooks/zones/bridge.ports/bonding rename to src/hooks/zones/bridge.ports/bonding diff --git a/hooks/zones/bridge.ports/dummy b/src/hooks/zones/bridge.ports/dummy similarity index 100% rename from hooks/zones/bridge.ports/dummy rename to src/hooks/zones/bridge.ports/dummy diff --git a/hooks/zones/bridge.ports/ethernet b/src/hooks/zones/bridge.ports/ethernet similarity index 100% rename from hooks/zones/bridge.ports/ethernet rename to src/hooks/zones/bridge.ports/ethernet diff --git a/hooks/zones/bridge.ports/macvlan b/src/hooks/zones/bridge.ports/macvlan similarity index 100% rename from hooks/zones/bridge.ports/macvlan rename to src/hooks/zones/bridge.ports/macvlan diff --git a/hooks/zones/bridge.ports/vlan b/src/hooks/zones/bridge.ports/vlan similarity index 100% rename from hooks/zones/bridge.ports/vlan rename to src/hooks/zones/bridge.ports/vlan diff --git a/hooks/zones/bridge.ports/wireless-ap b/src/hooks/zones/bridge.ports/wireless-ap similarity index 100% rename from hooks/zones/bridge.ports/wireless-ap rename to src/hooks/zones/bridge.ports/wireless-ap diff --git a/hooks/zones/isdn b/src/hooks/zones/isdn similarity index 100% rename from hooks/zones/isdn rename to src/hooks/zones/isdn diff --git a/hooks/zones/isdn-server b/src/hooks/zones/isdn-server similarity index 100% rename from hooks/zones/isdn-server rename to src/hooks/zones/isdn-server diff --git a/hooks/zones/modem b/src/hooks/zones/modem similarity index 100% rename from hooks/zones/modem rename to src/hooks/zones/modem diff --git a/hooks/zones/pppoe b/src/hooks/zones/pppoe similarity index 100% rename from hooks/zones/pppoe rename to src/hooks/zones/pppoe diff --git a/hooks/zones/pptp b/src/hooks/zones/pptp similarity index 100% rename from hooks/zones/pptp rename to src/hooks/zones/pptp diff --git a/hooks/zones/switch b/src/hooks/zones/switch similarity index 100% rename from hooks/zones/switch rename to src/hooks/zones/switch diff --git a/hooks/zones/teredo b/src/hooks/zones/teredo similarity index 100% rename from hooks/zones/teredo rename to src/hooks/zones/teredo diff --git a/hooks/zones/wireless b/src/hooks/zones/wireless similarity index 100% rename from hooks/zones/wireless rename to src/hooks/zones/wireless diff --git a/hooks/zones/wireless.configs/ipv4-dhcp b/src/hooks/zones/wireless.configs/ipv4-dhcp similarity index 100% rename from hooks/zones/wireless.configs/ipv4-dhcp rename to src/hooks/zones/wireless.configs/ipv4-dhcp diff --git a/hooks/zones/wireless.configs/ipv4-static b/src/hooks/zones/wireless.configs/ipv4-static similarity index 100% rename from hooks/zones/wireless.configs/ipv4-static rename to src/hooks/zones/wireless.configs/ipv4-static diff --git a/hooks/zones/wireless.configs/ipv6-static b/src/hooks/zones/wireless.configs/ipv6-static similarity index 100% rename from hooks/zones/wireless.configs/ipv6-static rename to src/hooks/zones/wireless.configs/ipv6-static diff --git a/macros/DHCP b/src/macros/DHCP similarity index 100% rename from macros/DHCP rename to src/macros/DHCP diff --git a/macros/HTTP b/src/macros/HTTP similarity index 100% rename from macros/HTTP rename to src/macros/HTTP diff --git a/macros/HTTPS b/src/macros/HTTPS similarity index 100% rename from macros/HTTPS rename to src/macros/HTTPS diff --git a/macros/WWW b/src/macros/WWW similarity index 100% rename from macros/WWW rename to src/macros/WWW diff --git a/network b/src/network similarity index 100% rename from network rename to src/network diff --git a/network-radvd-config b/src/network-radvd-config similarity index 100% rename from network-radvd-config rename to src/network-radvd-config diff --git a/src/network.pc.in b/src/network.pc.in new file mode 100644 index 00000000..fd3af833 --- /dev/null +++ b/src/network.pc.in @@ -0,0 +1,28 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2013 IPFire Network Development Team # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +# # +############################################################################### + +prefix=@prefix@ +exec_prefix=@exec_prefix@ +networkdir=@networkdir@ + +Name: network +Description: Network configuration tools for IPFire +URL: @PACKAGE_URL@ +Version: @PACKAGE_VERSION@ diff --git a/ppp/dialer b/src/ppp/dialer similarity index 100% rename from ppp/dialer rename to src/ppp/dialer diff --git a/ppp/ip-updown b/src/ppp/ip-updown.in old mode 100755 new mode 100644 similarity index 98% rename from ppp/ip-updown rename to src/ppp/ip-updown.in index 9c1ac7e1..70fce9d9 --- a/ppp/ip-updown +++ b/src/ppp/ip-updown.in @@ -31,7 +31,7 @@ for i in ${PPP_VARIABLES}; do unset ${i} done -. /usr/lib/network/functions +. @networkdir@/functions log DEBUG "Called." for i in ${PPP_VARIABLES}; do diff --git a/ppp/pppoe-server b/src/ppp/pppoe-server similarity index 100% rename from ppp/pppoe-server rename to src/ppp/pppoe-server diff --git a/sysctl.d/network.conf b/src/sysctl/network.conf similarity index 100% rename from sysctl.d/network.conf rename to src/sysctl/network.conf diff --git a/systemd/firewall-init.service b/src/systemd/firewall-init.service.in similarity index 70% rename from systemd/firewall-init.service rename to src/systemd/firewall-init.service.in index 5e06bb6c..24497e93 100644 --- a/systemd/firewall-init.service +++ b/src/systemd/firewall-init.service.in @@ -5,4 +5,4 @@ Before=network.target [Service] Type=oneshot RemainAfterExit=yes -ExecStart=/usr/lib/network/helpers/firewall-kernel-init +ExecStart=@helpersdir@/firewall-kernel-init diff --git a/systemd/firewall4.service b/src/systemd/firewall4.service.in similarity index 74% rename from systemd/firewall4.service rename to src/systemd/firewall4.service.in index 45d20b2c..568f5e78 100644 --- a/systemd/firewall4.service +++ b/src/systemd/firewall4.service.in @@ -7,8 +7,8 @@ Requires=firewall-init.service [Service] Type=oneshot RemainAfterExit=yes -ExecStart=/usr/sbin/firewall4 start -ExecStop=/usr/sbin/firewall4 stop +ExecStart=@sbindir@/firewall4 start +ExecStop=@sbindir@/firewall4 stop [Install] WantedBy=multi-user.target diff --git a/systemd/firewall6.service b/src/systemd/firewall6.service.in similarity index 74% rename from systemd/firewall6.service rename to src/systemd/firewall6.service.in index eedeea4e..873bfe69 100644 --- a/systemd/firewall6.service +++ b/src/systemd/firewall6.service.in @@ -7,8 +7,8 @@ Requires=firewall-init.service [Service] Type=oneshot RemainAfterExit=yes -ExecStart=/usr/sbin/firewall6 start -ExecStop=/usr/sbin/firewall6 stop +ExecStart=@sbindir@/firewall6 start +ExecStop=@sbindir@/firewall6 stop [Install] WantedBy=multi-user.target diff --git a/systemd/network-init.service b/src/systemd/network-init.service.in similarity index 87% rename from systemd/network-init.service rename to src/systemd/network-init.service.in index 8e192448..1292fe6a 100644 --- a/systemd/network-init.service +++ b/src/systemd/network-init.service.in @@ -7,7 +7,7 @@ Requires=firewall-init.service [Service] Type=oneshot -ExecStart=/usr/sbin/network init +ExecStart=@sbindir@/network init [Install] WantedBy=multi-user.target diff --git a/systemd/network@.service b/src/systemd/network@.service.in similarity index 80% rename from systemd/network@.service rename to src/systemd/network@.service.in index 592e9feb..14da23df 100644 --- a/systemd/network@.service +++ b/src/systemd/network@.service.in @@ -8,8 +8,8 @@ Before=network.target [Service] Type=oneshot RemainAfterExit=yes -ExecStart=/usr/sbin/network zone %I up -ExecStop=/usr/sbin/network zone %I down +ExecStart=@sbindir@/network zone %I up +ExecStop=@sbindir@/network zone %I down [Install] WantedBy=network.target diff --git a/network.tmpfiles b/src/tmpfiles/network similarity index 100% rename from network.tmpfiles rename to src/tmpfiles/network diff --git a/udev/network-hotplug b/src/udev/network-hotplug similarity index 100% rename from udev/network-hotplug rename to src/udev/network-hotplug diff --git a/udev/network-hotplug-rename b/src/udev/network-hotplug-rename similarity index 100% rename from udev/network-hotplug-rename rename to src/udev/network-hotplug-rename diff --git a/udev/network-hotplug-serial b/src/udev/network-hotplug-serial similarity index 100% rename from udev/network-hotplug-serial rename to src/udev/network-hotplug-serial diff --git a/udev/rules.d/50-serial-whitelist.rules b/src/udev/rules.d/50-serial-whitelist.rules similarity index 100% rename from udev/rules.d/50-serial-whitelist.rules rename to src/udev/rules.d/50-serial-whitelist.rules diff --git a/udev/rules.d/60-net.rules b/src/udev/rules.d/60-net.rules similarity index 100% rename from udev/rules.d/60-net.rules rename to src/udev/rules.d/60-net.rules diff --git a/test/load-library b/test/load-library new file mode 100755 index 00000000..16f1d95b --- /dev/null +++ b/test/load-library @@ -0,0 +1,9 @@ +#!/bin/bash + +. ${networkdir}/functions + +if [ -n "${NETWORK_VERSION}" ]; then + exit 0 +fi + +exit 1