systemd: Remove udev rules for "predictable" network device names

[people/ms/ipfire-3.x.git] / initscripts / initscripts.nm

diff --git a/initscripts/initscripts.nm b/initscripts/initscripts.nm
index a7bcb8d788ca8c014ec122b15de1c2c515afee15..a8ad505dc188b995260b7350d1d56ea6cf2c9229 100644 (file)
--- a/initscripts/initscripts.nm
+++ b/initscripts/initscripts.nm
@@ -6,7 +6,7 @@
 name       = initscripts
 epoch      = 1
 version    = 2.99
-release    = 12
+release    = 19
 
 groups     = System/Boot
 url        =
@@ -14,7 +14,7 @@ license    = GPLv3+
 summary    = The set of scripts that initalize the system.
 
 description
-       The initscripts package contains the basic system scripts used to boot \
+       The initscripts package contains the basic system scripts used to boot
        your system and shut the system down cleanly.
 end
 
@@ -25,6 +25,8 @@ build
        requires
                glib2-devel
                popt-devel
+               shadow-utils
+               systemd-units
        end
 
        DIR_APP = %{DIR_SOURCE}
@@ -45,11 +47,12 @@ build
                cd src && make install clean DESTDIR=%{BUILDROOT}
 
                # Install rc.local
-               install -v -m 755 %{DIR_SOURCE}/rc.local %{BUILDROT}/etc/rc.local
+               mkdir -pv %{BUILDROOT}%{sysconfdir}
+               install -v -m 755 %{DIR_SOURCE}/rc.local %{BUILDROOT}%{sysconfdir}/rc.local
 
                # Install udev rules
-               mkdir -pv %{BUILDROOT}/lib/udev/rules.d/
-               cp -vf %{DIR_SOURCE}/udev/* %{BUILDROOT}/lib/udev/rules.d/
+               mkdir -pv %{BUILDROOT}%{prefix}/lib/udev/rules.d/
+               cp -vf %{DIR_SOURCE}/udev/* %{BUILDROOT}%{prefix}/lib/udev/rules.d/
        end
 end
 
@@ -71,11 +74,22 @@ packages
                        util-linux
                end
 
-               configfiles
+               provides
+                       /bin/ipcalc
+               end
+
+               conflicts
+                       filesystem  < 002
+               end
+
+               datafiles
                        /etc/rc.local
                end
 
-               prerequires = coreutils shadow-utils
+               prerequires
+                       coreutils
+                       shadow-utils
+               end
 
                script prein
                        groupadd -g 22 -r -f utmp