summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorINSUN PYO <insun.pyo@samsung.com>2019-03-13 18:52:51 +0900
committerINSUN PYO <insun.pyo@samsung.com>2019-03-13 18:54:39 +0900
commit871412d654cc82f0c0a9c01627f0c1b24b8135de (patch)
treeb3104837ff58e56b459de516224768663915ae6e
parentc6151c9fe770a29e67713330263828d445d641a1 (diff)
downloadsystem-plugin-871412d654cc82f0c0a9c01627f0c1b24b8135de.tar.gz
system-plugin-871412d654cc82f0c0a9c01627f0c1b24b8135de.tar.bz2
system-plugin-871412d654cc82f0c0a9c01627f0c1b24b8135de.zip
Remove opt-usr-fsck.service
All fsck runs in inird. Change-Id: Ie3166eaaa36877a11ea86402d9c0116be4acba8e
-rw-r--r--packaging/system-plugin.spec2
-rw-r--r--units/opt-usr-fsck.service17
-rw-r--r--units/opt-usr.mount4
3 files changed, 2 insertions, 21 deletions
diff --git a/packaging/system-plugin.spec b/packaging/system-plugin.spec
index 1480b2e..c91c3d5 100644
--- a/packaging/system-plugin.spec
+++ b/packaging/system-plugin.spec
@@ -209,7 +209,6 @@ mkdir -p %{buildroot}%{_unitdir}/wait-mount@opt-usr.service.d
mkdir -p %{buildroot}%{_userunitdir}/basic.target.wants
mkdir -p %{buildroot}%{_userunitdir}/wait-mount@opt-usr.service.d
install -m 644 units/opt-usr.mount %{buildroot}%{_unitdir}
-install -m 644 units/opt-usr-fsck.service %{buildroot}%{_unitdir}
install -m 644 units/wait-mount@.service %{buildroot}%{_unitdir}
install -m 644 units/wait-mount-session@.service %{buildroot}%{_userunitdir}/wait-mount@.service
install -m 644 units/no-wait.conf %{buildroot}%{_unitdir}/wait-mount@opt-usr.service.d
@@ -380,7 +379,6 @@ mv %{_sysconfdir}/fstab_3parts %{_sysconfdir}/fstab
%license LICENSE.Apache-2.0
%{_sysconfdir}/fstab_2parts
%{_unitdir}/opt-usr.mount
-%{_unitdir}/opt-usr-fsck.service
%{_unitdir}/wait-mount@.service
%{_unitdir}/local-fs.target.wants/opt-usr.mount
%{_userunitdir}/wait-mount@.service
diff --git a/units/opt-usr-fsck.service b/units/opt-usr-fsck.service
deleted file mode 100644
index 49888de..0000000
--- a/units/opt-usr-fsck.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=File System Check on /opt/usr
-DefaultDependencies=no
-ConditionPathExists=!/opt/etc/.odeprogress
-BindsTo=dev-disk-by\x2dpartlabel-user.device
-After=dev-disk-by\x2dpartlabel-user.device
-Before=shutdown.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-User=system_fw
-Group=disk
-SmackProcessLabel=System
-ExecStart=/sbin/fsck -T -M -f -y /dev/disk/by-partlabel/user
-SuccessExitStatus=0 1 8
-TimeoutSec=0
diff --git a/units/opt-usr.mount b/units/opt-usr.mount
index f2fe168..e7c845a 100644
--- a/units/opt-usr.mount
+++ b/units/opt-usr.mount
@@ -1,8 +1,8 @@
[Unit]
DefaultDependencies=no
ConditionPathExists=!/opt/etc/.odeprogress
-Wants=opt-usr-fsck.service wait-mount@opt-usr.service
-After=local-fs-pre.target opt-usr-fsck.service
+Wants=wait-mount@opt-usr.service
+After=local-fs-pre.target
Before=local-fs.target wait-mount@opt-usr.service
[Mount]