carbon-config

commit b24d282175976b1aeeebb3c2830bce044bc1dcd9
parent f6cfc873628b4641e724757f0e6e099c278db504
Author: ccx <root@dorje.wpr.cz>
Date:   Fri, 16 Sep 2022 13:23:41 +0200

Remove duplicate net-all bundle

Diffstat:
M
s6-rc.aat
 | 
12
+++---------
M
s6-rc.fileset
 | 
11
+++--------

2 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/s6-rc.aat b/s6-rc.aat
@@ -46,14 +46,6 @@ m644
 |#add_to_bundle("ok-all-but-tty", "mount-tmp-X11")
 
 |add_to_bundle("ok-all-but-tty", "net-all")
-/net-all	d	m755
-/net-all/type	cN	bundle	m644
-/net-all/contents
-CN	unbound
-	loopback
-	dhcpcd
-	wpa_supplicant
-m644
 
 /ok-sysinit	d	m755
 /ok-sysinit/type	cN	bundle	m644
@@ -104,7 +96,7 @@ CN	ip route del dev {<i.iface>} {<i.spec>}
 m755
 @endfor
 
-|#add_to_bundle("net-all", "dhcpcd")
+|add_to_bundle("net-all", "dhcpcd")
 /dhcpcd	d	m755
 /dhcpcd/type	cN	longrun	m644
 /dhcpcd/dependencies
@@ -524,6 +516,8 @@ CN	#!/command/execlineb -P
 	syncthing -logflags 0
 m750
 /syncthing/type	cN	longrun	m640
+
+|add_to_bundle("net-all", "wpa_supplicant")
 /wpa_supplicant	d	m750
 /wpa_supplicant/dependencies
 CN	modules
diff --git a/s6-rc.fileset b/s6-rc.fileset
@@ -237,14 +237,6 @@ CN	ok-all-but-tty
 m644
 
 
-/net-all	d	m755
-/net-all/type	cN	bundle	m644
-/net-all/contents
-CN	unbound
-	loopback
-	dhcpcd
-	wpa_supplicant
-m644
 
 /ok-sysinit	d	m755
 /ok-sysinit/type	cN	bundle	m644
@@ -761,6 +753,7 @@ CN	#!/command/execlineb -P
 	syncthing -logflags 0
 m750
 /syncthing/type	cN	longrun	m640
+
 /wpa_supplicant	d	m750
 /wpa_supplicant/dependencies
 CN	modules
@@ -918,7 +911,9 @@ m644
 /net-all/type	cN	bundle	m644
 /net-all/contents
 C	loopback
+	dhcpcd
 	unbound
+	wpa_supplicant
 	
 m644