From c0982f95773d12b9ee7a991afd83e2f8cad32390 Mon Sep 17 00:00:00 2001 From: SeokYeon Hwang Date: Mon, 8 Jun 2015 13:51:04 +0900 Subject: [PATCH] swap: changed the way to enable swap 1. Changed swap enabling method to systemd style. 2. Detected swap device by "disk label" to avoid fixing device node. Change-Id: I499accbfcda622d391ca05a3e5481d38c84e087b Signed-off-by: SeokYeon Hwang (cherry picked from commit d094496fd41e80b28fcab4de61d902012d2ec609) Signed-off-by: Sooyoung Ha --- .../system/dev-disk-by\\x2dlabel-emulator\\x2dswap.swap" | 2 +- packaging/system-plugin-emulator.spec | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) rename filesystem/usr/lib/systemd/system/dev-vdb.swap => "filesystem/usr/lib/systemd/system/dev-disk-by\\x2dlabel-emulator\\x2dswap.swap" (69%) diff --git a/filesystem/usr/lib/systemd/system/dev-vdb.swap "b/filesystem/usr/lib/systemd/system/dev-disk-by\\x2dlabel-emulator\\x2dswap.swap" similarity index 69% rename from filesystem/usr/lib/systemd/system/dev-vdb.swap rename to "filesystem/usr/lib/systemd/system/dev-disk-by\\x2dlabel-emulator\\x2dswap.swap" index 86ea802..d4d5f12 100644 --- a/filesystem/usr/lib/systemd/system/dev-vdb.swap +++ "b/filesystem/usr/lib/systemd/system/dev-disk-by\\x2dlabel-emulator\\x2dswap.swap" @@ -2,7 +2,7 @@ Description=Swap on emulator [Swap] -What=/dev/vdb +What=/dev/disk/by-label/emulator-swap [Install] WantedBy=emulator_preinit.target diff --git a/packaging/system-plugin-emulator.spec b/packaging/system-plugin-emulator.spec index 6c7bf9f..ef1119b 100644 --- a/packaging/system-plugin-emulator.spec +++ b/packaging/system-plugin-emulator.spec @@ -31,7 +31,7 @@ cp -arf filesystem/* %{buildroot} %install_service basic.target.wants emulator_preinit.target %install_service emulator_preinit.target.wants emul-setup-audio-volume.service %install_service emulator_preinit.target.wants emul-common-preinit.service -%install_service emulator_preinit.target.wants dev-vdb.swap +%install_service emulator_preinit.target.wants dev-disk-by\\x2dlabel-emulator\\x2dswap.swap %install_service multi-user.target.wants emulator.target %install_service basic.target.wants tizen-generate-env.service @@ -61,10 +61,10 @@ cp LICENSE %{buildroot}/usr/share/license/%{name} %{_unitdir}/multi-user.target.wants/emulator.target %{_unitdir}/emul-setup-audio-volume.service %{_unitdir}/emul-common-preinit.service -%{_unitdir}/dev-vdb.swap +%{_unitdir}/dev-disk-by\x2dlabel-emulator\x2dswap.swap %{_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-vdb.swap +%{_unitdir}/emulator_preinit.target.wants/dev-disk-by\x2dlabel-emulator\x2dswap.swap %{_unitdir}/tizen-generate-env.service %{_prefix}/lib/udev/rules.d/51-tizen-udev-default.rules %{_prefix}/lib/udev/rules.d/95-tizen-emulator.rules -- 2.34.1