kernel: Disable support for 6RD

[ipfire-3.x.git] / setup / setup.nm

diff --git a/setup/setup.nm b/setup/setup.nm
index a62230088a75c019b983feabac4900b4a69c6307..78d1a5df342daf817f3d42249a158fd5b993805f 100644 (file)
--- a/setup/setup.nm
+++ b/setup/setup.nm
@@ -5,7 +5,7 @@
 
 name       = setup
 version    = 3.0
-release    = 6
+release    = 10
 arch       = noarch
 
 groups     = Base Build System/Base
@@ -24,6 +24,10 @@ sources    =
 build
        DIR_APP = %{DIR_SOURCE}
 
+       requires
+               perl
+       end
+
        build
                ./shadowconvert.sh
        end
@@ -37,23 +41,35 @@ build
 
                for i in aliases bashrc exports filesystems group gshadow host.conf \
                        hosts hosts.allow hosts.deny inputrc motd passwd printcap \
-                       profile securetty shadow shells; do \
+                       profile protocols securetty services shadow shells; do \
                        cp -vf %{DIR_APP}/${i} %{BUILDROOT}/etc || exit 1; \
                done
 
-               touch %{BUILDROOT}/etc/{environment,fstab}
-               chmod -v 0400 %{BUILDROOT}/etc/{,g}shadow
+               touch %{BUILDROOT}%{sysconfdir}/{environment,fstab}
+               chmod -v 0400 %{BUILDROOT}%{sysconfdir}/{,g}shadow
+
+               mkdir -pv %{BUILDROOT}%{sysconfdir}/sysctl.d
+               install -m 644 %{DIR_APP}/sysctl/printk.conf \
+                       %{BUILDROOT}%{sysconfdir}/sysctl.d/printk.conf
+               install -m 644 %{DIR_APP}/sysctl/swappiness.conf \
+                       %{BUILDROOT}%{sysconfdir}/sysctl.d/swappiness.conf
        end
 end
 
 packages
        package %{name}
-               requires = iana-etc
-
                conflicts
                        filesystem < 002
                end
 
+               obsoletes
+                       iana-etc <= 2.30
+               end
+
+               provides
+                       iana-etc = 2.31
+               end
+
                configfiles
                        /etc/aliases
                        /etc/exports
@@ -67,6 +83,8 @@ packages
                        /etc/motd
                        /etc/passwd
                        /etc/printcap
+                       /etc/protocols
+                       /etc/services
                        /etc/shadow
                        /etc/shells
                end