T671: sysctl: move file to vyos-1x

vyos · Jan 17, 2021 · 84d7940 · 84d7940
1 parent 2e70f4b
commit 84d7940
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 102 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -63,7 +63,6 @@ sysconf_DATA += sysconf/issue.net
 sysconf_DATA += sysconf/motd.tail
 sysconf_DATA += sysconf/rsyslog.conf
 sysconf_DATA += sysconf/securetty
-sysconf_DATA += sysconf/vyatta-sysctl.conf
 sysconf_DATA += sysconf/level
 sysconf_DATA += sysconf/filecaps
 sysconf_DATA += sysconf/capability.conf

diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in
@@ -65,9 +65,7 @@ if [ "$sysconfdir" != "/etc" ]; then
         fi
     done
 
-    cp $sysconfdir/vyatta-sysctl.conf /etc/sysctl.d/30-vyatta-router.conf
-
-     # Set file capabilities
+    # Set file capabilities
     sed -r -e '/^#/d' -e '/^[[:blank:]]*$/d' < $sysconfdir/filecaps | \
     while read capability path; do
        touch -c $path

diff --git a/sysconf/vyatta-sysctl.conf b/sysconf/vyatta-sysctl.conf