Merge pull request #40 from saveriomiroddi/sm-remove_4.14_apparmor_concept

Remove references to 4.14 AppArmor patching
This commit is contained in:
Jake Day 2017-11-19 08:00:22 -05:00 committed by GitHub
commit a9be2a9406
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 50 deletions

View file

@ -67,9 +67,6 @@ For the ipts_firmware files, please select the version for your device.
### NOTES
If your network won't connect on the 4.14.x series, you need to apply the apparmor-fix-4.14.patch file in /etc/:
* $ cd /etc/ && sudo patch -p1 < /path/to/apparmor-fix-4.14.patch
If you are getting stuck at boot when loading the ramdisk, you need to install the Processor Microcode Firmware for Intel CPUs (usually found under Additional Drivers in Software and Updates).
### Donations Appreciated!

View file

@ -1,47 +0,0 @@
diff --git a/apparmor.d/abstractions/nameservice b/apparmor.d/abstractions/nameservice
index 12ea151..a26c10d 100644
--- a/apparmor.d/abstractions/nameservice
+++ b/apparmor.d/abstractions/nameservice
@@ -94,6 +94,12 @@
network inet dgram,
network inet6 dgram,
+ # TODO: replace with more specific "unix" rules once support for them
+ # arrives in the Linux kernel (probably in 4.15) and gives us detailed
+ # log messages
+ network unix dgram,
+ network unix stream,
+
# TODO: adjust when support finer-grained netlink rules
# Netlink raw needed for nscd
network netlink raw,
diff --git a/apparmor.d/sbin.dhclient b/apparmor.d/sbin.dhclient
index 1064e25..f432bf3 100644
--- a/apparmor.d/sbin.dhclient
+++ b/apparmor.d/sbin.dhclient
@@ -17,6 +17,9 @@
network packet,
network raw,
+ network unix dgram,
+ network unix stream,
+
@{PROC}/[0-9]*/net/ r,
@{PROC}/[0-9]*/net/** r,
@@ -90,12 +93,15 @@
/run/NetworkManager/private-dhcp rw,
signal (send) peer=/sbin/dhclient,
+ signal (send) peer=dhclient,
/var/lib/NetworkManager/*lease r,
signal (receive) peer=/usr/sbin/NetworkManager,
ptrace (readby) peer=/usr/sbin/NetworkManager,
network inet dgram,
network inet6 dgram,
+
+ network unix stream,
}
/usr/lib/connman/scripts/dhclient-script {