16 files changed, 63 insertions, 5 deletions
diff --git a/units/check-mount.service b/units/check-mount.service.m4
index 9eede2a..c8b8589 100644
--- a/units/check-mount.service
+++ b/units/check-mount.service.m4
@@ -7,8 +7,11 @@ Before=tizen-system.target
 
 [Service]
 Type=oneshot
-ExecStart=/bin/sh -c 'while [ "z`/bin/grep /opt/usr /proc/mounts`" == "z" ]; do /bin/sleep 0.5; done'
+ExecStart=/usr/bin/check-mount.sh
 ExecStartPost=/bin/sleep 3
+m4_ifdef(`SMACK_LABEL',
+SmackProcessLabel=system-plugin-common::script
+)m4_dnl
 
 [Install]
 WantedBy=tizen-system.target
diff --git a/units/cleanup-storage.service b/units/cleanup-storage.service.m4
index 426a02d..1f908bd 100644
--- a/units/cleanup-storage.service
+++ b/units/cleanup-storage.service.m4
@@ -5,6 +5,9 @@ DefaultDependencies=no
 [Service]
 Type=oneshot
 ExecStart=/usr/bin/cleanup-storage.sh
+m4_ifdef(`SMACK_LABEL',
+SmackProcessLabel=system-plugin-common::script
+)m4_dnl
 
 [Install]
 WantedBy=basic.target
diff --git a/units/init-conf.service b/units/init-conf.service.m4
index b62d0d6..0723574 100644
--- a/units/init-conf.service
+++ b/units/init-conf.service.m4
@@ -9,6 +9,9 @@ ConditionFileNotEmpty=/etc/init.%H.conf
 [Service]
 Type=oneshot
 ExecStart=/bin/bash -c '/etc/init.%H.conf'
+m4_ifdef(`SMACK_LABEL',
+SmackProcessLabel=system-plugin-common::script
+)m4_dnl
 
 [Install]
 WantedBy=sysinit.target
diff --git a/units/remount-rootfs.service.m4 b/units/remount-rootfs.service.m4
new file mode 100644
index 0000000..2a41337
--- /dev/null
+++ b/units/remount-rootfs.service.m4
@@ -0,0 +1,17 @@
+[Unit]
+Description=Remount rootfs
+After=-.mount
+Wants=-.mount
+ConditionKernelCommandLine=ro
+DefaultDependencies=no
+
+[Service]
+Type=oneshot
+ExecStart=/bin/bash -c "/usr/bin/change-booting-mode.sh --update"
+ExecStartPost=/bin/touch /run/.root_rw_complete
+m4_ifdef(`SMACK_LABEL',
+SmackProcessLabel=system-plugin-common::script
+)m4_dnl
+
+[Install]
+WantedBy=local-fs.target
diff --git a/units/tizen-fstrim-user.service b/units/tizen-fstrim-user.service.m4
index a0cfe33..abbefc7 100644
--- a/units/tizen-fstrim-user.service
+++ b/units/tizen-fstrim-user.service.m4
@@ -7,3 +7,6 @@ Type=oneshot
 ExecStart=/usr/bin/tizen-fstrim-on-charge.sh /opt/usr
 StandardOutput=journal
 StandardError=inherit
+m4_ifdef(`SMACK_LABEL',
+SmackProcessLabel=system-plugin-common::script
+)m4_dnl
diff --git a/units/tizen-generate-env.service b/units/tizen-generate-env.service.m4
index ae5bc98..da78852 100644
--- a/units/tizen-generate-env.service
+++ b/units/tizen-generate-env.service.m4
@@ -7,6 +7,10 @@ Before=basic.target
 [Service]
 Type=oneshot
 ExecStart=/usr/bin/env -i sh -c 'source /etc/profile; env | /bin/egrep -v "^(HOME|PWD|SHLVL|_)=" > /run/tizen-mobile-env'
+ExecStartPost=/usr/bin/chsmack -a "_" /run/tizen-mobile-env
+m4_ifdef(`SMACK_LABEL',
+SmackProcessLabel=system-plugin-common::script
+)m4_dnl
 
 [Install]
 WantedBy=basic.target
diff --git a/units/tizen-init-check.service.in b/units/tizen-init-check.service.m4.in
index 31ec3ca..e57ae88 100644
--- a/units/tizen-init-check.service.in
+++ b/units/tizen-init-check.service.m4.in
@@ -9,3 +9,7 @@ RefuseManualStart=yes
 
 [Service]
 ExecStart=/usr/bin/systemctl start tizen-init.target
+m4_ifdef(`SMACK_LABEL',
+SmackProcessLabel=system-plugin-common::script
+)m4_dnl
+
diff --git a/units/tizen-init-done.service.in b/units/tizen-init-done.service.m4.in
index df4c5c1..a2535c8 100644
--- a/units/tizen-init-done.service.in
+++ b/units/tizen-init-done.service.m4.in
@@ -6,6 +6,9 @@ RefuseManualStart=yes
 
 [Service]
 ExecStart=/bin/touch @INITIALIZE_DONE@
+m4_ifdef(`SMACK_LABEL',
+SmackProcessLabel=system-plugin-common::script
+)m4_dnl
 
 [Install]
 WantedBy=tizen-init.target
diff --git a/units/tizen-initial-boot-done.service.in b/units/tizen-initial-boot-done.service.m4.in
index 7e8ae55..bba3f6f 100644
--- a/units/tizen-initial-boot-done.service.in
+++ b/units/tizen-initial-boot-done.service.m4.in
@@ -6,6 +6,9 @@ RefuseManualStart=yes
 
 [Service]
 ExecStart=/bin/touch @INITAILBOOT_DONE@
+m4_ifdef(`SMACK_LABEL',
+SmackProcessLabel=system-plugin-common::script
+)m4_dnl
 
 [Install]
 WantedBy=default.target
diff --git a/units/tizen-journal-flush.service b/units/tizen-journal-flush.service.m4
index 9a2d2ee..aa5a95f 100644
--- a/units/tizen-journal-flush.service
+++ b/units/tizen-journal-flush.service.m4
@@ -9,3 +9,6 @@ After=systemd-journald.service default.target
 [Service]
 ExecStart=/usr/bin/systemctl kill --kill-who=main --signal=SIGUSR1 systemd-journald.service
 Type=oneshot
+m4_ifdef(`SMACK_LABEL',
+SmackProcessLabel=system-plugin-common::script
+)m4_dnl
diff --git a/units/tizen-readahead-collect-stop.service b/units/tizen-readahead-collect-stop.service.m4
index 9d4aeaa..bd5f49f 100644
--- a/units/tizen-readahead-collect-stop.service
+++ b/units/tizen-readahead-collect-stop.service.m4
@@ -9,6 +9,9 @@ ConditionVirtualization=no
 [Service]
 Type=oneshot
 ExecStart=/usr/bin/systemd-notify --readahead=done
+m4_ifdef(`SMACK_LABEL',
+SmackProcessLabel=system-plugin-common::script
+)m4_dnl
 
 [Install]
 Also=tizen-readahead-collect.service
diff --git a/units/tizen-readahead-collect.service.in b/units/tizen-readahead-collect.service.m4.in
index 8b0c5c3..93465f8 100644
--- a/units/tizen-readahead-collect.service.in
+++ b/units/tizen-readahead-collect.service.m4.in
@@ -15,6 +15,9 @@ Type=notify
 ExecStart=@rootlibexecdir@/systemd-readahead collect --savedir=@READAHEAD_DIR@
 RemainAfterExit=yes
 StandardOutput=null
+m4_ifdef(`SMACK_LABEL',
+SmackProcessLabel=system-plugin-common::script
+)m4_dnl
 
 [Install]
 WantedBy=tizen-init.target
diff --git a/units/tizen-readahead-replay.service.in b/units/tizen-readahead-replay.service.m4.in
index 22f00dd..1440829 100644
--- a/units/tizen-readahead-replay.service.in
+++ b/units/tizen-readahead-replay.service.m4.in
@@ -14,6 +14,9 @@ ExecStart=@rootlibexecdir@/systemd-readahead replay --savedir=@READAHEAD_DIR@
 RemainAfterExit=yes
 StandardOutput=null
 OOMScoreAdjust=1000
+m4_ifdef(`SMACK_LABEL',
+SmackProcessLabel=system-plugin-common::script
+)m4_dnl
 
 [Install]
 WantedBy=graphical.target
diff --git a/units/tizen-runtime.target b/units/tizen-runtime.target
index b1bc216..2988127 100644
--- a/units/tizen-runtime.target
+++ b/units/tizen-runtime.target
@@ -1,6 +1,6 @@
 [Unit]
 Description=Tizen Runtime
-Requires=basic.target tizen-boot.target tizen-system.target
+Requires=tizen-system.target
 Conflicts=rescue.service rescue.target
-After=basic.target tizen-boot.target tizen-system.target rescue.service rescue.target
+After=tizen-system.target rescue.service rescue.target
 Before=multi-user.target
diff --git a/units/tizen-system.target b/units/tizen-system.target
index 4240819..e8c8e36 100644
--- a/units/tizen-system.target
+++ b/units/tizen-system.target
@@ -1,6 +1,6 @@
 [Unit]
 Description=Tizen System
-Requires=basic.target tizen-boot.target
+Requires=tizen-boot.target
 Conflicts=rescue.service rescue.target
-After=basic.target tizen-boot.target rescue.service rescue.target
+After=tizen-boot.target rescue.service rescue.target
 Before=multi-user.target
diff --git a/units/wm_ready.service b/units/wm_ready.service.m4
index e3f260b..014e1c2 100644
--- a/units/wm_ready.service
+++ b/units/wm_ready.service.m4
@@ -7,6 +7,9 @@ Before=tizen-boot.target
 Type=oneshot
 ExecStart=/bin/sh -c 'while [ ! -e /tmp/.wm_ready ]; do sleep 0.1 ; done'
 TimeoutSec=10s
+m4_ifdef(`SMACK_LABEL',
+SmackProcessLabel=system-plugin-common::script
+)m4_dnl
 
 [Install]
 WantedBy=tizen-boot.target