Revert "units: add 'smackfsroot=*' option into tmp.mount when SMACK is enabled"

This reverts commit 409c2a13fd.

It breaks the bootup of systems which enable smack at compile time, but have no
smack enabled in the kernel. This needs a different solution.

Makefile.am

@@ -616,8 +616,7 @@ EXTRA_DIST += \
 	units/initrd-udevadm-cleanup-db.service.in \
 	units/initrd-switch-root.service.in \
 	units/systemd-nspawn@.service.in \
-	units/systemd-update-done.service.in \
-	units/tmp.mount.m4
+	units/systemd-update-done.service.in
 
 if HAVE_SYSV_COMPAT
 nodist_systemunit_DATA += \

units/tmp.mount

@@ -18,6 +18,4 @@ Before=local-fs.target umount.target
 What=tmpfs
 Where=/tmp
 Type=tmpfs
-m4_ifdef(`HAVE_SMACK',
-`Options=mode=1777,strictatime,smackfsroot=*',
-`Options=mode=1777,strictatime')
+Options=mode=1777,strictatime