- Arch-projects - lists.archlinux.org

[arch-projects] [netctl] [GIT] Network control utility based on systemd annotated tag 1.22 created. 1.22
by Jouke Witteveen 17 Apr '20

17 Apr '20

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Network control utility based on systemd". The annotated tag, 1.22 has been created at a1a426557e75ec1ac12fbccc0e333c209647fded (tag) tagging 3bebcd7c2b8e18e737e3df9b18945f28f7662ea7 (commit) replaces 1.21 tagged by Jouke Witteveen on Fri Apr 17 20:16:18 2020 +0200 - Log ----------------------------------------------------------------- Release 1.22 -----BEGIN PGP SIGNATURE----- iQFKBAABCAA0FiEEbql9KtO+F66lkufaVrYfv4JJLBUFAl6Z8ngWHGoud2l0dGV2 ZWVuQGdtYWlsLmNvbQAKCRBWth+/gkksFXvHCACqv9wgX+OZZVGQjfakRCEix4OJ ZdO8to3OXM5b03aQwzkLiWFumouL0tLvxSFfTdYxuvs0lv6dCh4sJuyVwlIgFQSW 4h6n8kto1wRSL2NhWsHGflbM1pV4hdXmaJrlOqE6Ap925IbILC1UJmT590DCFfM4 dlrj1EO+PdmXU0zFYtOxbRbFYnRffL61UgjICP45t0UnIjwJuTSUQ9wOTvjhG50m 2JE95y8pC2PCDa3YVqPXBDVf/gOhK+mUq/vjUn0hehUoVFyLX4EB/Q6coQAduhSq 3vkoLbGLbgNutF1oeax9ZEprTizZUFLjhgVwdN51POE4wn4kYZWvCeCpv6xk =1uxI -----END PGP SIGNATURE----- Jan Hohmann (1): Support rfkill for mobile_ppp connections Jouke Witteveen (4): Bring connections into a uniform code style Mention wireguard support in the README Improve active interface finding in netctl-auto 1,22 release updates ----------------------------------------------------------------------- hooks/post-receive -- Network control utility based on systemd

1 0

[arch-projects] [netctl] [GIT] Network control utility based on systemd branch master updated. 1.21-5-g3bebcd7
by Jouke Witteveen 17 Apr '20

17 Apr '20

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Network control utility based on systemd". The branch, master has been updated via 3bebcd7c2b8e18e737e3df9b18945f28f7662ea7 (commit) via 83525a5f843012699437268e5d4ec9b5e843da8b (commit) via 1d95b20b778fe9ff8709dc9f743d85e48f19da2b (commit) from 4d424c7b00e1ce7ae443381f4d2dcfb30178e518 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 3bebcd7c2b8e18e737e3df9b18945f28f7662ea7 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Fri Apr 17 20:15:57 2020 +0200 1,22 release updates commit 83525a5f843012699437268e5d4ec9b5e843da8b Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Fri Apr 17 12:14:36 2020 +0200 Improve active interface finding in netctl-auto commit 1d95b20b778fe9ff8709dc9f743d85e48f19da2b Author: Jan Hohmann <github(a)jnhmn.de> Date: Sat Apr 11 22:54:47 2020 +0200 Support rfkill for mobile_ppp connections ----------------------------------------------------------------------- Summary of changes: Makefile | 2 +- NEWS | 4 ++++ docs/netctl.profile.5.txt | 5 +++++ src/lib/connections/mobile_ppp | 9 +++++++++ src/netctl-auto | 7 ++++--- 5 files changed, 23 insertions(+), 4 deletions(-) hooks/post-receive -- Network control utility based on systemd

1 0

[arch-projects] [namcap] [PATCH] Don't report missing-vcs-makedeps when it is in depends
by Felix Yan 11 Apr '20

11 Apr '20

Currently a PKGBUILD warning is shown when the package depends on git instead of makedepends on it. Since we also have the redundant_makedepends rule we should not write it again in makedepends. This patch checkes depends array too so this warning could be suppressed. --- Namcap/rules/makedepends.py | 2 ++ Namcap/tests/pkgbuild/test_makedepends.py | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/Namcap/rules/makedepends.py b/Namcap/rules/makedepends.py index 53676c2..8b938a0 100644 --- a/Namcap/rules/makedepends.py +++ b/Namcap/rules/makedepends.py @@ -68,6 +68,8 @@ class VCSMakedepends(PkgbuildRule): for v in protocols: d = vcs[v] + if 'depends' in pkginfo and d in pkginfo["depends"]: + continue if 'makedepends' not in pkginfo: missing.append(d) continue diff --git a/Namcap/tests/pkgbuild/test_makedepends.py b/Namcap/tests/pkgbuild/test_makedepends.py index d443b2b..73a3ba2 100644 --- a/Namcap/tests/pkgbuild/test_makedepends.py +++ b/Namcap/tests/pkgbuild/test_makedepends.py @@ -111,4 +111,12 @@ package() { self.assertEqual(r.warnings, []) self.assertEqual(r.infos, []) + def test_example3(self): + # Example 3 + r = self.run_on_pkg(self.pkgbuild1 + 'depends=(bzr git mercurial)') + self.assertEqual(r.errors, []) + self.assertEqual(r.warnings, + [("missing-vcs-makedeps %s", 'subversion')]) + self.assertEqual(r.infos, []) + # vim: set ts=4 sw=4 noet: -- 2.25.1

2 1

[arch-projects] [netctl] [GIT] Network control utility based on systemd branch master updated. 1.21-2-g4d424c7
by Jouke Witteveen 10 Apr '20

10 Apr '20

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Network control utility based on systemd". The branch, master has been updated via 4d424c7b00e1ce7ae443381f4d2dcfb30178e518 (commit) via 543accab65aa7d78c346a21b1c4ed8ebab602bad (commit) from 8e5d89ade8a99c12517095af33c0e5d3198ddc32 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 4d424c7b00e1ce7ae443381f4d2dcfb30178e518 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Fri Apr 10 15:08:58 2020 +0200 Mention wireguard support in the README commit 543accab65aa7d78c346a21b1c4ed8ebab602bad Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Fri Apr 10 14:52:50 2020 +0200 Bring connections into a uniform code style Also, make sure that netctl does not wait for the interface of a wireguard connection, since that interface will be created by netctl itself. ----------------------------------------------------------------------- Summary of changes: README | 1 + src/lib/connections/bond | 2 +- src/lib/connections/bridge | 2 +- src/lib/connections/dummy | 2 +- src/lib/connections/macvlan | 6 +++--- src/lib/connections/ppp | 3 +++ src/lib/connections/tunnel | 1 + src/lib/connections/vlan | 5 ++--- src/lib/connections/wireguard | 11 ++++++----- 9 files changed, 19 insertions(+), 14 deletions(-) hooks/post-receive -- Network control utility based on systemd

1 0

[arch-projects] [devtools] [GIT] The official devtools repository annotated tag 20200407 created. 20200407
by Levente Polyak 07 Apr '20

07 Apr '20

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official devtools repository". The annotated tag, 20200407 has been created at 87c3cb377d5dcb12adb29be9c29cae0d8b580e7c (tag) tagging aff81d34fd072e978925a0ad5d04ea0978ce42ed (commit) replaces 20200213 tagged by Levente Polyak on Tue Apr 7 19:46:15 2020 +0200 - Log ----------------------------------------------------------------- Version 20200407 -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEE4kC1fixGMLp2ji8m/BtUfI2BcsgFAl6MvGcACgkQ/BtUfI2B csiE0w//RRr7wP2HUWFY+jgg3UG17+Q5cois54aiL10o+E89vA3CA4tsySQ+GRq3 vopFebV7XM1EMQvg9Mfpn342fmy0LpQJNyToqpddznzZAjeAwGpAlJf8ylWD8oPt UFeDQ3WtzTp/luo2Vau/xBoblXDFxCumZjRffq77OBfxjYIp/+RuzmapgjTyR263 KN5hM2oJSceoDj30MSbA0Ne2Yskt1lvnu0ynwykBLIMiSyuCzaPhJDp2iKa6KCOc nBOg6fb8UIzK46G6wgdWhxTPXW+ZbpBhq88qSdtIWP2DAR0qdeJuhtzABre1wQBI KYtIJvsE2dcrqNbMaCevai5m+9UFoLCNcuFSpP50HatVQa/ztI2O8N8OOOWfn427 C5hxIVkDNjk18ZBJVQ9Ae1fbCvKp54S39gCOOgj5Mj0IOpm3N4zYe/AIeDG32jx5 HkWUbC/YZZ1sKWND0D4kAcJ8j1JAPeh+1vAZCViRNZSYyQqKJMuCEnzKBZmMfZhj 31vWncHkme+3CtkJ7geir9nogE1opxmK/kLoaCfXO+7cTfoM869AAAEC1zfbvn7R XoDRi2I2GkNzM4PavLInj6QGxepm+RypE3LZTcMvr0/e2lnEkOAPXwmJpdDDVZow MNqkvSxta8wfCmcFCWz0/GggNgnRjW+ARbifIxeo9DSy1+FuZRI= =FA7l -----END PGP SIGNATURE----- Eli Schwartz (7): makerepropkg: fix wonky indent makerepropkg: add support to check unreproducible packages using diffoscope makerepropkg: support checking multiple split packages zsh-completion: update for new makerepropkg options checkpkg: fix support for http:// url comparisons makechrootpkg: use the chroot database to find checkpkg packages arch-nspawn: fix up host_mirrors cachedir handling Levente Polyak (3): makerepropkg: prioritize downloading .zst packages over legacy format offload-build: retrieve the PKGBUILD in case makepkg changes it via pkgver Version 20200407 ----------------------------------------------------------------------- hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [devtools] [GIT] The official devtools repository branch master updated. 20200213-10-gaff81d3
by Levente Polyak 07 Apr '20

07 Apr '20

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official devtools repository". The branch, master has been updated via aff81d34fd072e978925a0ad5d04ea0978ce42ed (commit) from 5b1123e11f2b1de97196138ccfd63824955e30d8 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit aff81d34fd072e978925a0ad5d04ea0978ce42ed Author: Levente Polyak <anthraxx(a)archlinux.org> Date: Tue Apr 7 19:46:10 2020 +0200 Version 20200407 ----------------------------------------------------------------------- Summary of changes: Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [namcap] [PATCH] Warn on unquoted pkgdir and srcdir
by Michael Straube 07 Apr '20

07 Apr '20

Unqouted $pkgdir and $srcdir can lead to errors if the directory name contains spaces. Not quoting these variables is a common mistake. For example, it is often seen in PKGBUILDs that are submitted for review. Add a rule that warns on unquoted $pkgdir and $srcdir. Signed-off-by: Michael Straube <michael.straube(a)posteo.de> --- Namcap/rules/__init__.py | 3 +- Namcap/rules/unquoteddirvars.py | 39 ++++++++++++ Namcap/tests/pkgbuild/test_unquoteddirvars.py | 63 +++++++++++++++++++ namcap-tags | 1 + 4 files changed, 105 insertions(+), 1 deletion(-) create mode 100644 Namcap/rules/unquoteddirvars.py create mode 100644 Namcap/tests/pkgbuild/test_unquoteddirvars.py diff --git a/Namcap/rules/__init__.py b/Namcap/rules/__init__.py index 5ca6551..bd348b4 100644 --- a/Namcap/rules/__init__.py +++ b/Namcap/rules/__init__.py @@ -67,7 +67,8 @@ from . import ( pkginfo, pkgnameindesc, sfurl, - splitpkgbuild + splitpkgbuild, + unquoteddirvars ) all_rules = {} diff --git a/Namcap/rules/unquoteddirvars.py b/Namcap/rules/unquoteddirvars.py new file mode 100644 index 0000000..63de0c1 --- /dev/null +++ b/Namcap/rules/unquoteddirvars.py @@ -0,0 +1,39 @@ +# +# namcap rules - unquoteddirvars +# Copyright (C) 2020 Michael Straube <michael.straube(a)posteo.de> +# +# 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 2 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, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# + +import re +from Namcap.ruleclass import * + +class package(PkgbuildRule): + name = "unquoteddirvars" + description = "Looks for unquoted $pkgdir and $srcdir" + def analyze(self, pkginfo, pkgbuild): + needles = ['$pkgdir', '${pkgdir}', '$srcdir', '${srcdir}'] + hits = set() + for line in pkginfo.pkgbuild: + if not any(n in line for n in needles): + continue + double_quoted_strings = re.findall('"([^"]*)"', line) + for n in needles: + if line.count(n) != sum(n in s for s in double_quoted_strings): + hits.add(n) + for i in hits: + self.warnings.append(("unquoted-dirvar %s", i)) + +# vim: set ts=4 sw=4 noet: diff --git a/Namcap/tests/pkgbuild/test_unquoteddirvars.py b/Namcap/tests/pkgbuild/test_unquoteddirvars.py new file mode 100644 index 0000000..7a420bd --- /dev/null +++ b/Namcap/tests/pkgbuild/test_unquoteddirvars.py @@ -0,0 +1,63 @@ +# +# namcap tests - unquoteddirvars +# Copyright (C) 2020 Michael Straube <michael.straube(a)posteo.de> +# +# 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 2 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, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# + +from Namcap.tests.pkgbuild_test import PkgbuildTest +import Namcap.rules + +class NamcapUnqoutedDirVarsTest(PkgbuildTest): + pkgbuild = """ +# Maintainer: Arch Linux <archlinux at example.com> +# Contributor: Arch Linux <archlinux at example.com> + +pkgname=mypackage +pkgver=1.0 +pkgrel=1 +pkgdesc="A package" +url="http://www.example.com/" +arch=('x86_64') +depends=('glibc') +license=('GPL') +options=('!libtool') +source=(ftp://ftp.example.com/pub/mypackage-0.1.tar.gz) +md5sums=('abcdefabcdef12345678901234567890') + +build() { + cd $srcdir/$pkgname-$pkgver +} + +package() { + make install DESTDIR=$pkgdir/ + install -Dm644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname} + install -Dm644 "${srcdir}/example.desktop" "$pkgdir"/usr/share/applications +} +""" + test_valid = PkgbuildTest.valid_tests + + def preSetUp(self): + self.rule = Namcap.rules.unquoteddirvars.package + + def test_example(self): + needles = ['$pkgdir', '${pkgdir}', '$srcdir', '${srcdir}'] + r = self.run_on_pkg(self.pkgbuild) + self.assertEqual(r.errors, []) + self.assertEqual(set(r.warnings), + set(("unquoted-dirvar %s", i) for i in needles)) + self.assertEqual(r.infos, []) + +# vim: set ts=4 sw=4 noet: diff --git a/namcap-tags b/namcap-tags index 1f7bc69..e48f8fe 100644 --- a/namcap-tags +++ b/namcap-tags @@ -85,6 +85,7 @@ specific-sourceforge-mirror :: Attempting to use specific sourceforge mirror, us symlink-found %s points to %s :: Symlink (%s) found that points to %s systemd-location %s :: File %s should be in /usr/lib/systemd/system/ too-many-checksums %s %i needed :: Too many %s: %i needed +unquoted-dirvar %s :: Variable %s is not quoted. unused-sodepend %s %s :: Unused shared library '%s' by file ('%s') use-pkgdir :: Use $pkgdir instead of $startdir/pkg use-srcdir :: Use $srcdir instead of $startdir/src -- 2.26.0

1 0

[arch-projects] [netctl] [GIT] Network control utility based on systemd annotated tag 1.21 created. 1.21
by Jouke Witteveen 28 Mar '20

28 Mar '20

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Network control utility based on systemd". The annotated tag, 1.21 has been created at 08c9209f2e9e57761c946f91668bb0ead721c853 (tag) tagging 8e5d89ade8a99c12517095af33c0e5d3198ddc32 (commit) replaces 1.20 tagged by Jouke Witteveen on Sat Mar 28 12:23:05 2020 +0100 - Log ----------------------------------------------------------------- Release 1.21 -----BEGIN PGP SIGNATURE----- iQFKBAABCAA0FiEEbql9KtO+F66lkufaVrYfv4JJLBUFAl5/M6UWHGoud2l0dGV2 ZWVuQGdtYWlsLmNvbQAKCRBWth+/gkksFZ71CACLrrd/GKie/CE+YIehi2yox3qw Vzw3woB4TVa+ciQ5dJlZHQkYo0Ek5iqRWxBgC/Sd84vBmmQkPRm5d7jNnlwDIEdX +np6xYvNUMfnoKLCD2dwc2C/la1UjLTmRjC8O5VhA6eXafSRbxo7ZygPgg14DeuE zlflgarS8CNybLHUqdKf9/2A2EybEAubnjOVoYQ2AharBzf9Lwr/DjKFBzGWSI0J ZkbdkqvKzwmOgqDVs+cXSSMBwBDaU6Q2vS8xqV5Uq4MQU0/vZ2CeIDi6Ugr5BLOw NAg86eUTwmNGJ0JXz7M6ZH+XZr5e/XO1kCDtQyzY3rCXtTY6HpXICFcNozCK =CFWd -----END PGP SIGNATURE----- Antonio Rojas (1): PKGBUILD: use https for the url Christian Hesse (1): base group removal Jouke Witteveen (4): Support custom MAC address on new interfaces (FS#64766) Add a connection type for WireGuard interfaces Makefile: more compact use of `install` 1.21 release updates ----------------------------------------------------------------------- hooks/post-receive -- Network control utility based on systemd

1 0

[arch-projects] [netctl] [GIT] Network control utility based on systemd branch master updated. 1.20-6-g8e5d89a
by Jouke Witteveen 28 Mar '20

28 Mar '20

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Network control utility based on systemd". The branch, master has been updated via 8e5d89ade8a99c12517095af33c0e5d3198ddc32 (commit) via 4918a821f521e8a02c125c202c007feb8cc58079 (commit) via f80b73865494e9dda2e7f5a13e7c703c4069910c (commit) via b5335f4350015d7c8b0cc66349d1290b7251bd9d (commit) from c0196798dde620566146867e59d52d3120e9b4f1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 8e5d89ade8a99c12517095af33c0e5d3198ddc32 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Sat Mar 28 12:22:39 2020 +0100 1.21 release updates commit 4918a821f521e8a02c125c202c007feb8cc58079 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Sat Mar 28 12:19:58 2020 +0100 Makefile: more compact use of `install` commit f80b73865494e9dda2e7f5a13e7c703c4069910c Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Sat Mar 28 12:01:21 2020 +0100 Add a connection type for WireGuard interfaces Contributed by Thibaut Sautereau <thibaut(a)sautereau.fr> commit b5335f4350015d7c8b0cc66349d1290b7251bd9d Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Fri Mar 20 15:34:31 2020 +0100 Support custom MAC address on new interfaces (FS#64766) Connection types bond, bridge, dummy, vlan, and macvlan create their own interface. Previously, only macvlan offered control over the MAC address of the created interface. Now, this functionality is available to all these connection types. Thanks to: Javier <j.e.vasquez.v(a)gmail.com> and David Hummel <hummeltech(a)dhummel.net> ----------------------------------------------------------------------- Summary of changes: Makefile | 12 +++++------- NEWS | 4 ++++ contrib/PKGBUILD.in | 1 + docs/examples/bridge | 2 ++ docs/examples/macvlan-static | 2 +- docs/examples/wireguard | 11 +++++++++++ docs/netctl.profile.5.txt | 20 ++++++++++++++++++-- src/lib/connections/bond | 2 +- src/lib/connections/bridge | 5 ++++- src/lib/connections/dummy | 2 +- src/lib/connections/macvlan | 5 +---- src/lib/connections/vlan | 2 +- src/lib/connections/wireguard | 26 ++++++++++++++++++++++++++ src/lib/interface | 12 ++++++++---- 14 files changed, 84 insertions(+), 22 deletions(-) create mode 100644 docs/examples/wireguard create mode 100644 src/lib/connections/wireguard hooks/post-receive -- Network control utility based on systemd

1 0

[arch-projects] [netctl][PATCH] Support custom MAC address on new interfaces
by Jouke Witteveen 20 Mar '20

20 Mar '20

Connection types bond, bridge, dummy, vlan, and macvlan create their own interface. Previously, only macvlan offered control over the MAC address of the created interface. Now, this functionality is available to all these connection types. --- docs/netctl.profile.5.txt | 9 ++++++--- src/lib/connections/bond | 2 +- src/lib/connections/bridge | 5 ++++- src/lib/connections/dummy | 2 +- src/lib/connections/macvlan | 5 +---- src/lib/connections/vlan | 2 +- src/lib/interface | 12 ++++++++---- 7 files changed, 22 insertions(+), 15 deletions(-) diff --git a/docs/netctl.profile.5.txt b/docs/netctl.profile.5.txt index 0662a67..839bb9a 100644 --- a/docs/netctl.profile.5.txt +++ b/docs/netctl.profile.5.txt @@ -83,6 +83,12 @@ GENERAL OPTIONS profile. If this variable is not specified, it defaults to the value of 'Interface='. +'MACAddress=':: + Optional MAC address for newly created interfaces. When set to the + name of an existing interface, the address of that interface is used. + The connection types that create an interface and are able to set a + MAC address are +bond+, +bridge+, +dummy+, +vlan+, and +macvlan+. + 'After=()':: An array of profile names that should be started before this profile is started. This is only an ordering dependency and is not intended @@ -544,9 +550,6 @@ following are understood for connections of the `macvlan' type: Either `bridge', `vepa', `private', or `passthru'. See *ip*(8) for details. -'MACAddress=':: - Optional static MAC address for the `macvlan' type link. - SPECIAL QUOTING RULES --------------------- diff --git a/src/lib/connections/bond b/src/lib/connections/bond index 64b0285..3f7daf4 100644 --- a/src/lib/connections/bond +++ b/src/lib/connections/bond @@ -11,7 +11,7 @@ bond_up() { return 1 fi - interface_add bond "$Interface" "" ${Mode:+mode "$Mode"} + interface_add bond "$Interface" "$MACAddress" "" ${Mode:+mode "$Mode"} bring_interface_up "$Interface" for slave in "${BindsToInterfaces[@]}"; do ip link set dev "$slave" master "$Interface" diff --git a/src/lib/connections/bridge b/src/lib/connections/bridge index 7d05576..7f922fa 100644 --- a/src/lib/connections/bridge +++ b/src/lib/connections/bridge @@ -11,8 +11,11 @@ bridge_up() { report_error "Interface '$Interface' already exists and is not a bridge" return 1 fi + if [[ "$MACAddress" ]]; then + report_error "Setting a MAC address on existing bridge interface '$Interface' is unsupported" + fi else - interface_add bridge "$Interface" + interface_add bridge "$Interface" "$MACAddress" fi for member in "${BindsToInterfaces[@]}"; do diff --git a/src/lib/connections/dummy b/src/lib/connections/dummy index 8726d86..7dd8e88 100644 --- a/src/lib/connections/dummy +++ b/src/lib/connections/dummy @@ -11,7 +11,7 @@ dummy_up() { return 1 fi - interface_add dummy "$Interface" + interface_add dummy "$Interface" "$MACAddress" bring_interface_up "$Interface" ip_set } diff --git a/src/lib/connections/macvlan b/src/lib/connections/macvlan index 25a97fb..eadb477 100644 --- a/src/lib/connections/macvlan +++ b/src/lib/connections/macvlan @@ -15,10 +15,7 @@ macvlan_up() { return 1 else bring_interface_up "$BindsToInterfaces" - interface_add macvlan "$Interface" "$BindsToInterfaces" mode "$Mode" - if [[ $MACAddress ]]; then - ip link set dev "$Interface" address "$MACAddress" || return 1 - fi + interface_add macvlan "$Interface" "$MACAddress" "$BindsToInterfaces" mode "$Mode" || return 1 fi ethernet_up } diff --git a/src/lib/connections/vlan b/src/lib/connections/vlan index 037c971..20251ec 100644 --- a/src/lib/connections/vlan +++ b/src/lib/connections/vlan @@ -15,7 +15,7 @@ vlan_up() { return 1 else bring_interface_up "$BindsToInterfaces" - interface_add vlan "$Interface" "$BindsToInterfaces" id "$VLANID" + interface_add vlan "$Interface" "$MACAddress" "$BindsToInterfaces" id "$VLANID" fi ethernet_up diff --git a/src/lib/interface b/src/lib/interface index 2ebf81e..1a51c07 100644 --- a/src/lib/interface +++ b/src/lib/interface @@ -20,11 +20,15 @@ is_interface() { ## Add an interface # $1: interface type # $2: interface name -# $3: interface link (optional) -# $4...: additional arguments +# $3: interface MAC address (optional) +# $4: interface link (optional) +# $5...: additional type related arguments interface_add() { - local type="$1" name="$2" link="$3" - do_debug ip link add ${link:+link "$link"} name "$name" type "$type" "${@:4}" $LinkOptions || return + local type="$1" name="$2" address="$3" link="$4" + if [[ -e "/sys/class/net/$address/address" ]]; then + address=$(< "/sys/class/net/$address/address") + fi + do_debug ip link add ${link:+link "$link"} name "$name" ${address:+address "$address"} type "$type" "${@:5}" $LinkOptions || return load_interface_config "$name" } -- 2.25.1

1 0