Remove obsolete systemd smack-default-labeling.service

Smack rules are now set directly by systemd. This service
is no longer required.

Change-Id: I7e5b1852efbe1170b4deee8ba411b087c7272af0
Signed-off-by: Casey Schaufler <casey.schaufler@intel.com>

diff --git a/packaging/libprivilege-control.spec b/packaging/libprivilege-control.spec
index 8969cad..d6c7d82 100644 (file)
--- a/packaging/libprivilege-control.spec
+++ b/packaging/libprivilege-control.spec
@@ -5,7 +5,6 @@ Release:    1
 Group:      Security/Access Control
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
-Source2:    smack-default-labeling.service
 Source1001:    %{name}.manifest
 BuildRequires: cmake
 BuildRequires: pkgconfig(libsmack)
@@ -41,9 +40,6 @@ make %{?jobs:-j%jobs}
 
 %install
 %make_install
-mkdir -p %{buildroot}/usr/lib/systemd/system/basic.target.wants
-install -m 644 %{SOURCE2} %{buildroot}/usr/lib/systemd/system/
-ln -s ../smack-default-labeling.service %{buildroot}/usr/lib/systemd/system/basic.target.wants/
 mkdir -p %{buildroot}/usr/share/privilege-control/
 
 %post -p /sbin/ldconfig
@@ -62,8 +58,6 @@ mkdir -p %{buildroot}/usr/share/privilege-control/
 %files conf
 %manifest %{name}.manifest
 /opt/etc/smack/*
-/usr/lib/systemd/system/smack-default-labeling.service
-/usr/lib/systemd/system/basic.target.wants/smack-default-labeling.service
 /opt/dbspace/.privilege_control*.db
 
 %files devel

diff --git a/packaging/smack-default-labeling.service b/packaging/smack-default-labeling.service
deleted file mode 100644 (file)
index ffdd25e..0000000
--- a/packaging/smack-default-labeling.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Default SMACK labeling
-DefaultDependencies=no
-Requires=smack.service local-fs.target
-After=smack.mount local-fs.target
-Before=basic.target
-
-[Service]
-Type=oneshot
-ExecStart=/etc/rc.d/init.d/smack_default_labeling ; /etc/rc.d/init.d/smack_rules
-
-[Install]
-WantedBy=basic.target