From: SeokYeon Hwang Date: Fri, 29 Mar 2013 08:01:22 +0000 (+0900) Subject: Remove sdbd specified jobs from proxy_setting.sh X-Git-Tag: submit/tizen_common/20140529.181337~11^2~11^2~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=392b504bb6b6d9853e9fe1ec207c16ebce9bbf93;p=platform%2Fadaptation%2Femulator%2Fsystem-plugin-emulator.git Remove sdbd specified jobs from proxy_setting.sh It is moved to sdbd.service Change-Id: I991dbf22e59bf82885eaaaea463d91d863685d00 Signed-off-by: SeokYeon Hwang --- diff --git a/filesystem/etc/profile.d/proxy_setting.sh b/filesystem/etc/profile.d/proxy_setting.sh index 19ac8dd..00a6787 100755 --- a/filesystem/etc/profile.d/proxy_setting.sh +++ b/filesystem/etc/profile.d/proxy_setting.sh @@ -1,26 +1,17 @@ #!/bin/sh if grep -q "http_proxy=" /proc/cmdline ; then __proxy=`sed 's/^.*http_proxy=\([^, ]*\).*$/\1/g' /proc/cmdline` - echo -e "[Export environment variable: http_proxy=${__proxy}]" export "http_proxy=${__proxy}" fi if grep -q "https_proxy=" /proc/cmdline ; then __proxy=`sed 's/^.*https_proxy=\([^, ]*\).*$/\1/g' /proc/cmdline` - echo -e "[Export environment variable: https_proxy=${__proxy}]" export "https_proxy=${__proxy}" fi if grep -q "ftp_proxy=" /proc/cmdline ; then __proxy=`sed 's/^.*ftp_proxy=\([^, ]*\).*$/\1/g' /proc/cmdline` - echo -e "[Export environment variable: ftp_proxy=${__proxy}]" export "ftp_proxy=${__proxy}" fi if grep -q "socks_proxy=" /proc/cmdline ; then __proxy=`sed 's/^.*socks_proxy=\([^, ]*\).*$/\1/g' /proc/cmdline` - echo -e "[Export environment variable: socks_proxy=${__proxy}]" export "socks_proxy=${__proxy}" fi -if grep -q "sdb_port=" /proc/cmdline ; then - __sdb_port=`sed 's/^.*sdb_port=\([^, ]*\).*$/\1/g' /proc/cmdline` - rm -rf /opt/home/sdb_port.txt - echo "${__sdb_port}" >> /opt/home/sdb_port.txt -fi diff --git a/filesystem/usr/lib/systemd/system/sdbd.service b/filesystem/usr/lib/systemd/system/sdbd.service index e740b97..0432676 100644 --- a/filesystem/usr/lib/systemd/system/sdbd.service +++ b/filesystem/usr/lib/systemd/system/sdbd.service @@ -7,6 +7,7 @@ Type=forking Environment=DISPLAY=:0 PIDFile=/tmp/.sdbd.pid RemainAfterExit=yes +ExecStartPre=/bin/bash -c "/bin/echo `/bin/sed 's/^.*sdb_port=\([^, ]*\).*$/\1/g' /proc/cmdline` > /opt/home/sdb_port.txt" ExecStart=/usr/sbin/sdbd [Install]