wip

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>

diff --git a/packaging/systemd.spec b/packaging/systemd.spec
index 073ff31..ba41ddb 100644 (file)
--- a/packaging/systemd.spec
+++ b/packaging/systemd.spec
@@ -182,6 +182,7 @@ cp %{SOURCE8} .
 %define _vpath_builddir %{build_dir}
 %meson \
        -Dkdbus=true \
+       -Dsmack=false \
 %if ! 0%{?WITH_VIRT}
        -Dvirt=false \
 %endif
@@ -228,7 +229,6 @@ cp %{SOURCE8} .
        -Drpmmacrosdir=%{_sysconfdir}/rpm/ \
        -Dsysvinit-path="" \
        -Dsysvrcnd-path="" \
-       -Dsmack-run-label=System::Privileged \
        -Dinstall-tests=true \
        -Ddefault-hierarchy=legacy \
        -Db_pie=true

diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
index 7e15211..5e526a7 100644 (file)
--- a/src/core/mount-setup.c
+++ b/src/core/mount-setup.c
@@ -64,7 +64,7 @@ static const MountPoint mount_table[] = {
           NULL,          MNT_FATAL|MNT_IN_CONTAINER },
         { "proc",        "/proc",                     "proc",       NULL,                      MS_NOSUID|MS_NOEXEC|MS_NODEV,
           NULL,          MNT_FATAL|MNT_IN_CONTAINER },
-        { "devtmpfs",    "/dev",                      "devtmpfs",   "mode=755,smackfsdef=*",   MS_NOSUID|MS_STRICTATIME,
+        { "tmpfs",    "/dev",                      "tmpfs",   "mode=755,smackfsdef=*",   MS_NOSUID|MS_STRICTATIME,
           NULL,          MNT_FATAL|MNT_IN_CONTAINER },
         { "securityfs",  "/sys/kernel/security",      "securityfs", NULL,                      MS_NOSUID|MS_NOEXEC|MS_NODEV,
           NULL,          MNT_NONE                   },