Remove opt-usr-fsck.service

All fsck runs in inird.

Change-Id: Ie3166eaaa36877a11ea86402d9c0116be4acba8e

diff --git a/packaging/system-plugin.spec b/packaging/system-plugin.spec
index 1480b2e..c91c3d5 100644 (file)
--- 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 (file)
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 (file)
--- 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]