From a9eedd3cf7ded2789c70a00432e797c4e6eb8a64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 30 Oct 2019 11:21:41 +0100 Subject: network: install wifi-adhoc.network by default, make wifi-{ap,station} examples I think 80-wifi-adhoc.network is safe enough, since it just enables the link-local addressing. But the other two enable DHCP in client or server modes, and we should not do this by default. --- network/80-wifi-ap.network | 8 -------- network/80-wifi-ap.network.example | 8 ++++++++ network/80-wifi-station.network | 6 ------ network/80-wifi-station.network.example | 6 ++++++ network/meson.build | 3 +++ 5 files changed, 17 insertions(+), 14 deletions(-) delete mode 100644 network/80-wifi-ap.network create mode 100644 network/80-wifi-ap.network.example delete mode 100644 network/80-wifi-station.network create mode 100644 network/80-wifi-station.network.example (limited to 'network') diff --git a/network/80-wifi-ap.network b/network/80-wifi-ap.network deleted file mode 100644 index 6644c7e765..0000000000 --- a/network/80-wifi-ap.network +++ /dev/null @@ -1,8 +0,0 @@ -[Match] -Type=wifi -WLANInterfaceType=ap - -[Network] -Address=0.0.0.0/24 -DHCPServer=yes -IPMasquerade=yes diff --git a/network/80-wifi-ap.network.example b/network/80-wifi-ap.network.example new file mode 100644 index 0000000000..6644c7e765 --- /dev/null +++ b/network/80-wifi-ap.network.example @@ -0,0 +1,8 @@ +[Match] +Type=wifi +WLANInterfaceType=ap + +[Network] +Address=0.0.0.0/24 +DHCPServer=yes +IPMasquerade=yes diff --git a/network/80-wifi-station.network b/network/80-wifi-station.network deleted file mode 100644 index 9268eb68dd..0000000000 --- a/network/80-wifi-station.network +++ /dev/null @@ -1,6 +0,0 @@ -[Match] -Type=wifi -WLANInterfaceType=station - -[Network] -DHCP=yes diff --git a/network/80-wifi-station.network.example b/network/80-wifi-station.network.example new file mode 100644 index 0000000000..9268eb68dd --- /dev/null +++ b/network/80-wifi-station.network.example @@ -0,0 +1,6 @@ +[Match] +Type=wifi +WLANInterfaceType=station + +[Network] +DHCP=yes diff --git a/network/meson.build b/network/meson.build index 59d4be1a17..544dcf4387 100644 --- a/network/meson.build +++ b/network/meson.build @@ -4,6 +4,9 @@ if conf.get('ENABLE_NETWORKD') == 1 install_data('80-container-host0.network', '80-container-ve.network', '80-container-vz.network', + '80-wifi-adhoc.network', + '80-wifi-ap.network.example', + '80-wifi-station.network.example', install_dir : networkdir) meson.add_install_script('sh', '-c', -- cgit v1.2.1