Revert "Add get_reboot_mode() for silent reboot"

This reverts commit 9769f82f1456e217cf17e883b9063398579cf6d1.

Now there is HAL that is in charge of bootmode. Therefore, revert this
patch.

Change-Id: I176cea46668bd39840f478d82ea723321b016d94
(cherry picked from commit f46f0711fc62a6d888815cfdd59e29ae49b8104e)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a043ab3..e339888 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,3 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 3.9.4)
 
 ADD_SUBDIRECTORY(src/session-bind)
-ADD_SUBDIRECTORY(src/libsysplugin)

diff --git a/packaging/system-plugin.spec b/packaging/system-plugin.spec
index 566dc60..705526a 100644 (file)
--- a/packaging/system-plugin.spec
+++ b/packaging/system-plugin.spec
@@ -66,12 +66,6 @@ Requires: %{name} = %{version}-%{release}
 %description feature-session-bind
 This package provides a mount utils for user sessions.
 
-%package feature-bootmode
-Summary:  Support bootmode state by reading /proc/cmdline
-
-%description feature-bootmode
-This package provides function that gets bootmode
-
 %package feature-container-adaptor
 Summary:  Plugin files for supporting container-based Tizen guest OS
 
@@ -297,11 +291,6 @@ rm -f %{_sbindir}/e4crypt
 %{_userunitdir}/session-bind.service
 %{_userunitdir}/basic.target.wants/session-bind.service
 
-%files feature-bootmode
-%manifest %{name}.manifest
-%license LICENSE.Apache-2.0
-/usr/lib/deviced/bootmode.so
-
 %post feature-session-bind
 echo ""
 echo "------------------------------------------------------------------------"

diff --git a/src/libsysplugin/CMakeLists.txt b/src/libsysplugin/CMakeLists.txt
deleted file mode 100644 (file)
index dbac7d4..0000000
--- a/src/libsysplugin/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-PROJECT(libsysplugin C)
-
-SET(LIBSYSPLUGIN_SRCS
-       reboot_mode.c)
-
-ADD_LIBRARY(${PROJECT_NAME} SHARED ${LIBSYSPLUGIN_SRCS})
-SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES PREFIX "")
-SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES OUTPUT_NAME bootmode)
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /usr/lib/deviced COMPONENT RuntimeLibraries)

diff --git a/src/libsysplugin/reboot_mode.c b/src/libsysplugin/reboot_mode.c
deleted file mode 100644 (file)
index 4fe4b98..0000000
--- a/src/libsysplugin/reboot_mode.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the License);
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#define KEY_SILENT_REBOOT      "silent_reboot="
-
-int get_reboot_mode(void)
-{
-       FILE *fp;
-       char *line = NULL;
-       char *key, *val;
-       size_t n;
-       int ret = 0;
-
-       fp = fopen("/proc/cmdline", "r");
-       if (!fp)
-               return ret;
-
-       if (getline(&line, &n, fp)) {
-               key = strstr(line, KEY_SILENT_REBOOT);
-               if (key) {
-                       val = key + strlen(KEY_SILENT_REBOOT);
-                       if (*val == '1')
-                               ret = 1;
-               }
-       }
-
-       fclose(fp);
-       free(line);
-
-       return ret;
-}