summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--aports/ifupdown-ng/APKBUILD5
-rw-r--r--aports/ifupdown-ng/interfaces6
-rw-r--r--etc/interfaces.conf.sample14
-rw-r--r--man/wifibox-alpine.520
4 files changed, 21 insertions, 24 deletions
diff --git a/aports/ifupdown-ng/APKBUILD b/aports/ifupdown-ng/APKBUILD
index dfbbbe0..e8c7f3f 100644
--- a/aports/ifupdown-ng/APKBUILD
+++ b/aports/ifupdown-ng/APKBUILD
@@ -2,7 +2,7 @@
pkgname=ifupdown-ng
pkgver=0.11.3
-pkgrel=0
+pkgrel=1
pkgdesc="tools for managing network configuration"
url="https://github.com/ifupdown-ng/ifupdown-ng"
arch="all"
@@ -32,11 +32,10 @@ package() {
install -D -m755 "$builddir"/dist/openrc/networking.initd "$pkgdir"/etc/init.d/networking
install -D -m644 "$builddir"/dist/openrc/networking.confd "$pkgdir"/etc/conf.d/networking
install -D -m644 "$srcdir"/interfaces "$pkgdir"/etc/network/interfaces
- ln -s /media/etc/interfaces.conf "$pkgdir"/etc/network/interfaces.conf
}
sha512sums="
7339d8d14bc881968093fa4a92c84850d99b5469847858be5423b98c5ed25776198fe1065686c22b6823cf7ace17845e96d7932782c111207264f8e3a52cbbb7 ifupdown-ng-0.11.3.tar.xz
e261fd3f185372bf8f2075216b9dd3e2d8090e978654ee742122ee7869017d309eac54b1415e79878015f312a39fa8fdd4b0d8c2bed8515e5a94c15da1b7b844 no-examples.patch
-372debdf3cdbcff247f8d757a4325ae49157bab1bc6f2fc9c621d1f21864321231856a719c00f5d2b77e0715ad44c5928cb856d97b52b659584d76f08326e28c interfaces
+cde5422ed19c79f970b24fde267f9bef34f069f806e7ed671fb443df6ff169e81791baaeebbe02595218f30224add65dabfd0337f9984d2387965001872a1038 interfaces
"
diff --git a/aports/ifupdown-ng/interfaces b/aports/ifupdown-ng/interfaces
index f1c5139..2146208 100644
--- a/aports/ifupdown-ng/interfaces
+++ b/aports/ifupdown-ng/interfaces
@@ -2,8 +2,6 @@ auto lo
iface lo inet loopback
auto eth0
-
-source /etc/network/interfaces.conf
-
auto wlan0
-iface wlan0 dhcp
+
+source /media/etc/interfaces.conf
diff --git a/etc/interfaces.conf.sample b/etc/interfaces.conf.sample
index d4f5636..f1c2f2c 100644
--- a/etc/interfaces.conf.sample
+++ b/etc/interfaces.conf.sample
@@ -2,11 +2,17 @@
# defaults. Consult http://manpages.org/etc-network-interfaces/5 for
# more.
#
-# The purpose is to bring up an interface on the guest which would be
-# the default gateway for the host. Here, `eth0` is the networking
-# interface of the virtual Ethernet card. Change these values only if
-# the 10.0.0.0/24 network is not suitable.
+# The `eth0` networking interface represents the virtual Ethernet card
+# of the guest, which would be the default gateway for the host.
+# Change these values only if the 10.0.0.0/24 network is not suitable.
iface eth0 inet static
address 10.0.0.1
netmask 255.255.255.0
+
+# The `wlan0` networking interface is associated with the wireless
+# networking card as it is exposed by the driver. By this default
+# configuration, the corresponding IP address is obtained through the
+# use of DHCP. This should just work for most of the cases.
+
+iface wlan0 dhcp
diff --git a/man/wifibox-alpine.5 b/man/wifibox-alpine.5
index e4b66d1..635b69d 100644
--- a/man/wifibox-alpine.5
+++ b/man/wifibox-alpine.5
@@ -1,4 +1,4 @@
-.Dd May 14, 2022
+.Dd May 17, 2022
.Dt WIFIBOX-ALPINE 5
.Os
.Sh NAME
@@ -87,10 +87,10 @@ work with the
.Pa interfaces.conf
file to associate the internal network interfaces with IP addresses:
.Sy wlan0
-is the wireless device which is automatically configured through DHCP,
+is the wireless device and
.Sy eth0
-is the virtual Ethernet device which is configured according to the
-contents of the configuration file.
+is the virtual Ethernet device towards the host which are configured
+according to the contents of the configuration file.
.It
.Sy iptables
works with the
@@ -140,9 +140,7 @@ are hooked up in the system in the following ways.
.Bl -bullet
.It
.Pa /media/etc/interfaces.conf
-is mapped to
-.Pa /etc/network/interfaces.conf
-which is included as part of
+is directly included as part of
.Pa /etc/network/interfaces
when managed by
.Sy ifup
@@ -150,9 +148,7 @@ and
.Sy ifdown .
.It
.Pa /media/etc/iptables
-is not mapped to anywhere under
-.Pa /etc ,
-it is used directly from this location by
+is used directly from this location by
.Sy iptables .
.It
.Pa /media/etc/udhcpd.conf
@@ -163,9 +159,7 @@ where
will read its contents.
.It
.Pa /media/etc/wpa_ctrl.conf
-is not mapped to anywhere under
-.Pa /etc ,
-it is used directly from there by
+is used directly from this location by
.Sy wpa_passthru .
.El
.Pp