From 566842b8b385a5b526b2e9c26d6c3db62aad2683 Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Jul 09 2022 11:04:11 +0000
Subject: Inline networkd regex again in split-files.py and sync with rawhide


---

diff --git a/split-files.py b/split-files.py
index eaed4c2..f7444f2 100644
--- a/split-files.py
+++ b/split-files.py
@@ -5,21 +5,6 @@ release = sys.argv[2]
 known_files = sys.stdin.read().splitlines()
 known_files = {line.split()[-1]:line for line in known_files}
 
-networkd_regex = r'''
-    /usr/lib/systemd/network/80-|
-    networkd|
-    networkctl|
-    org\.freedesktop\.network1|
-    systemd\.network|
-    systemd-network\.conf|
-    systemd\.netdev
-'''
-
-if release == "8":
-    networkd_regex += r'''|
-        systemd-network-generator
-    '''
-
 def files(root):
     os.chdir(root)
     todo = collections.deque(['.'])
@@ -93,7 +78,15 @@ for file in files(buildroot):
                        org.freedesktop.(import|machine)1
     ''', n, re.X):
         o = o_container
-    elif re.search(networkd_regex, n, re.X):
+    elif re.search(r'''/usr/lib/systemd/network/80-|
+                       networkd|
+                       networkctl|
+                       org.freedesktop.network1|
+                       sysusers\.d/systemd-network.conf|
+                       tmpfiles\.d/systemd-network.conf|
+                       systemd\.network|
+                       systemd\.netdev
+    ''' + r'|systemd-network-generator' if release == "8" else r'', n, re.X):
         o = o_networkd
     elif '.so.' in n:
         o = o_libs