From: Taeyoung Kim Date: Mon, 7 Mar 2016 05:07:49 +0000 (+0900) Subject: service: change tizen-generate-env.service to tizen-system-env.service X-Git-Tag: submit/tizen/20160308.014336^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f2b18ed3a77b9cd05dfc94c7547ecfafc7390c1c;p=platform%2Fadaptation%2Femulator%2Fsystem-plugin-emulator.git service: change tizen-generate-env.service to tizen-system-env.service - tizen-generate-env.service for Emulator and tizen-system-env.service for Target are same file, but the names are different. Thus the name of Emulator is changed. Change-Id: I09af5d13c1f126b1b265fb815239cc3d6b4a4a6b Signed-off-by: Taeyoung Kim --- diff --git a/filesystem/usr/lib/systemd/system/tizen-generate-env.service b/filesystem/usr/lib/systemd/system/tizen-generate-env.service deleted file mode 100644 index 2ffaf12..0000000 --- a/filesystem/usr/lib/systemd/system/tizen-generate-env.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Generate environment from /etc/profile.d -DefaultDependencies=no -After=opt.mount -Before=basic.target - -[Service] -Type=oneshot -ExecStart=/usr/bin/env -i sh -c 'source /etc/profile; env | /bin/egrep -v "^(HOME|PWD|SHLVL|_|USER|MAIL|LOGNAME|XDG_RUNTIME_DIR)=" > /run/tizen-system-env' -ExecStart=/usr/bin/env -i sh -c 'source /etc/profile; env | /bin/egrep -e "XDG_RUNTIME_DIR=" > /run/xdg-root-env' - -[Install] -WantedBy=basic.target diff --git a/filesystem/usr/lib/systemd/system/tizen-system-env.service b/filesystem/usr/lib/systemd/system/tizen-system-env.service new file mode 100644 index 0000000..2ffaf12 --- /dev/null +++ b/filesystem/usr/lib/systemd/system/tizen-system-env.service @@ -0,0 +1,13 @@ +[Unit] +Description=Generate environment from /etc/profile.d +DefaultDependencies=no +After=opt.mount +Before=basic.target + +[Service] +Type=oneshot +ExecStart=/usr/bin/env -i sh -c 'source /etc/profile; env | /bin/egrep -v "^(HOME|PWD|SHLVL|_|USER|MAIL|LOGNAME|XDG_RUNTIME_DIR)=" > /run/tizen-system-env' +ExecStart=/usr/bin/env -i sh -c 'source /etc/profile; env | /bin/egrep -e "XDG_RUNTIME_DIR=" > /run/xdg-root-env' + +[Install] +WantedBy=basic.target diff --git a/packaging/system-plugin-emulator.spec b/packaging/system-plugin-emulator.spec index ef1119b..627d87b 100644 --- a/packaging/system-plugin-emulator.spec +++ b/packaging/system-plugin-emulator.spec @@ -33,7 +33,7 @@ cp -arf filesystem/* %{buildroot} %install_service emulator_preinit.target.wants emul-common-preinit.service %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 +%install_service basic.target.wants tizen-system-env.service # include license mkdir -p %{buildroot}/usr/share/license @@ -57,7 +57,7 @@ cp LICENSE %{buildroot}/usr/share/license/%{name} %{_unitdir}/emulator_preinit.target %{_unitdir}/emulator.target %{_unitdir}/basic.target.wants/emulator_preinit.target -%{_unitdir}/basic.target.wants/tizen-generate-env.service +%{_unitdir}/basic.target.wants/tizen-system-env.service %{_unitdir}/multi-user.target.wants/emulator.target %{_unitdir}/emul-setup-audio-volume.service %{_unitdir}/emul-common-preinit.service @@ -65,7 +65,7 @@ cp LICENSE %{buildroot}/usr/share/license/%{name} %{_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 -%{_unitdir}/tizen-generate-env.service +%{_unitdir}/tizen-system-env.service %{_prefix}/lib/udev/rules.d/51-tizen-udev-default.rules %{_prefix}/lib/udev/rules.d/95-tizen-emulator.rules /usr/share/license/%{name}