systemd: remove deviced-pre.service 61/85961/1
authortaeyoung <ty317.kim@samsung.com>
Tue, 30 Aug 2016 02:05:40 +0000 (11:05 +0900)
committertaeyoung <ty317.kim@samsung.com>
Tue, 30 Aug 2016 02:05:40 +0000 (11:05 +0900)
- device-pre.service is not used anymore.
  Thus it needs to be removed

Change-Id: I566ca70d8074357482a27de495c83363be1b6606
Signed-off-by: taeyoung <ty317.kim@samsung.com>
CMakeLists.txt
packaging/deviced.spec
scripts/deviced-pre.sh [deleted file]
systemd/deviced-pre.service [deleted file]
systemd/deviced.service

index 837d4c8..4c7b27b 100755 (executable)
@@ -251,7 +251,6 @@ IF(${USB_MODULE} STREQUAL on)
        ENDIF(${SDB_PRESTART} STREQUAL on)
 ENDIF()
 
-INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/scripts/deviced-pre.sh DESTINATION bin)
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/scripts/deviced.conf DESTINATION /etc/dbus-1/system.d)
 
 CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY)
index 34d2f97..7b5715f 100644 (file)
@@ -248,7 +248,6 @@ systemctl daemon-reload
 %manifest %{name}.manifest
 %license LICENSE
 %config %{_sysconfdir}/dbus-1/system.d/deviced.conf
-%{_bindir}/deviced-pre.sh
 %{_bindir}/deviced
 %{_unitdir}/multi-user.target.wants/deviced.service
 %if %{?haptic_module} == on
@@ -261,7 +260,6 @@ systemctl daemon-reload
 %{_unitdir}/graphical.target.wants/zbooting-done.service
 %{_unitdir}/deviced.service
 %{_unitdir}/deviced.socket
-%{_unitdir}/deviced-pre.service
 %{_unitdir}/zbooting-done.service
 %if %{?battery_module} == on
 %config %{_sysconfdir}/deviced/battery.conf
diff --git a/scripts/deviced-pre.sh b/scripts/deviced-pre.sh
deleted file mode 100755 (executable)
index 6cf9f42..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-
-DEVICED_ENV_F=/run/deviced/deviced_env
-[ -e $DEVICED_ENV_F ] && /bin/rm -f $DEVICED_ENV_F
-[ -d ${DEVICED_ENV_F%/*} ] || /bin/mkdir -p ${DEVICED_ENV_F%/*}
-
-echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib" >> $DEVICED_ENV_F
-
-TOUCHSCREEN=400
-TOUCHKEY=200
-
-for file in /sys/class/input/event*; do
-        if [ -e $file ]; then
-                dev_keytype=`/bin/cat ${file}/device/capabilities/key`
-                if [ "$dev_keytype" != 0 ]; then
-                        var=${dev_keytype%%' '*}
-                        if [ $var == $TOUCHSCREEN  ]; then
-                                DEV_TOUCHSCREEN=/sys/class/input/${file#/sys/class/input/}/device/enabled
-                                echo ${var} ${file#/sys/class/input/}
-                        fi
-                        if [ $var == $TOUCHKEY ]; then
-                                dev_ledtype=`/bin/cat ${file}/device/capabilities/led`
-                                if [ "$dev_ledtype" != 0 ]; then
-                                        DEV_TOUCHKEY=/sys/class/input/${file#/sys/class/input/}/device/enabled
-                                        echo ${var} ${file#/sys/class/input/}
-                                fi
-                        fi
-                fi
-        fi
-done
-
-echo "PM_TOUCHSCREEN=$DEV_TOUCHSCREEN" >> $DEVICED_ENV_F
-echo "PM_TOUCHKEY=$DEV_TOUCHKEY" >> $DEVICED_ENV_F
-echo "PM_SYS_DIMBRT=0" >> $DEVICED_ENV_F
-
diff --git a/systemd/deviced-pre.service b/systemd/deviced-pre.service
deleted file mode 100644 (file)
index 2dbaabb..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=prepare device daemon
-DefaultDependencies=no
-Before=deviced.service
-
-[Service]
-Type=oneshot
-SmackProcessLabel=System
-ExecStart=/usr/bin/deviced-pre.sh
-User=system_fw
-Group=system_fw
index 3cf62e0..ec30d82 100644 (file)
@@ -1,10 +1,7 @@
 [Unit]
 Description=System device daemon
-After=deviced-pre.service
-Requires=deviced-pre.service
 
 [Service]
-EnvironmentFile=/run/deviced/deviced_env
 SmackProcessLabel=System::Privileged
 ExecStart=/usr/bin/deviced
 Restart=always