Add wait-mount@opt-usr.service

This service is reached when /opt/usr partition is mounted.

Change-Id: If1e2d1f4377f956bf0ff16724adef65da00af56c

diff --git a/filesystem/usr/lib/systemd/system/wait-mount@opt-usr.service b/filesystem/usr/lib/systemd/system/wait-mount@opt-usr.service
new file mode 100644 (file)
index 0000000..8c28587
--- /dev/null
+++ b/filesystem/usr/lib/systemd/system/wait-mount@opt-usr.service
@@ -0,0 +1,9 @@
+[Unit]
+Description= Wait for /opt/usr partition
+DefaultDependencies=no
+
+[Service]
+Type=oneshot
+RemainAfterExit=true
+SmackProcessLabel=System
+ExecStart=/usr/bin/true

diff --git a/filesystem/usr/lib/systemd/user/wait-mount@opt-usr.service b/filesystem/usr/lib/systemd/user/wait-mount@opt-usr.service
new file mode 100644 (file)
index 0000000..4ffdf50
--- /dev/null
+++ b/filesystem/usr/lib/systemd/user/wait-mount@opt-usr.service
@@ -0,0 +1,9 @@
+[Unit]
+Description= Wait for /opt/usr partition
+DefaultDependencies=no
+Before=basic.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=true
+ExecStart=/usr/bin/true

diff --git a/packaging/system-plugin-emulator.spec b/packaging/system-plugin-emulator.spec
index 7b9e3af1109ed941049c8606b2b1631263ebe4c6..284429fb8177a526273328e74d8ac802b4667283 100644 (file)
--- a/packaging/system-plugin-emulator.spec
+++ b/packaging/system-plugin-emulator.spec
@@ -10,6 +10,7 @@ Requires: sysvinit
 Requires: alsa-utils
 Requires(post): setup
 Requires(post): coreutils
+BuildRequires: pkgconfig(systemd)
 Source0: %{name}-%{version}.tar.gz
 Source1001: packaging/%{name}.manifest
 ExclusiveArch: %{ix86} x86_64
@@ -37,6 +38,9 @@ mkdir -p %{buildroot}/opt/mnt
 %install_service emulator_preinit.target.wants dev-disk-by\\x2dlabel-emulator\\x2dswap.swap
 %install_service emulator_preinit.target.wants mnt.mount
 %install_service multi-user.target.wants emulator.target
+%install_service local-fs.target.wants wait-mount@opt-usr.service
+mkdir -p %{buildroot}%{_userunitdir}/basic.target.wants
+ln -s ../wait-mount@opt-usr.service %{buildroot}%{_userunitdir}/basic.target.wants/wait-mount@opt-usr.service
 
 %posttrans
 #run emulator_ns.preinit script after all packages have been installed.
@@ -61,6 +65,10 @@ mkdir -p %{buildroot}/opt/mnt
 %{_unitdir}/emul-common-preinit.service
 %{_unitdir}/dev-disk-by\x2dlabel-emulator\x2dswap.swap
 %{_unitdir}/mnt.mount
+%{_unitdir}/wait-mount@opt-usr.service
+%{_unitdir}/local-fs.target.wants/wait-mount@opt-usr.service
+%{_userunitdir}/wait-mount@opt-usr.service
+%{_userunitdir}/basic.target.wants/wait-mount@opt-usr.service
 %{_unitdir}/emulator_preinit.target.wants/emul-setup-audio-volume.service
 %{_unitdir}/emulator_preinit.target.wants/emul-common-preinit.service
 %{_unitdir}/emulator_preinit.target.wants/dev-disk-by\x2dlabel-emulator\x2dswap.swap