Drop dead code

Commit f2a1870dd ("Parse configuration file") moved configuration
to files. This commit removes leftover unused code & defines.

Change-Id: Id5663185df0f9144be4822fd193f053cb5c29251

diff --git a/src/system-recovery/recovery-main.c b/src/system-recovery/recovery-main.c
index 8e12dd0..d721fbd 100644 (file)
--- a/src/system-recovery/recovery-main.c
+++ b/src/system-recovery/recovery-main.c
@@ -55,45 +55,6 @@ void sys_power_reboot(void)
        reboot(RB_AUTOBOOT);
 }
 
-void boot_safe_mode(void)
-{
-       int fd;
-
-       if ((fd = creat(SAFE_MODE_FILE, 0664)) < 0) {
-               LOGD("Can't enable safe mode.\n");
-               return; /* TODO: Display error message! */
-       }
-
-       LOGD("Safe-mode enabled.\n");
-       close(fd);
-       running = false;
-}
-
-void run_factory_reset(void)
-{
-       /* int r UNUSED; */
-       /* char *argv[2] = { FACTORY_RESET, NULL }; */
-
-       /* if (pivot_root(ROOT_MOUNT_DIR, INITRD_MOUNT_DIR)) { */
-       /*         perror("pivot_root() failed"); */
-       /*         return; /\* TODO: Display error message! *\/ */
-       /* } */
-
-       /* r = chdir("/"); */
-       /* process_exec(PROCESS_NON_WAIT, argv); */
-
-       /* creat(INITRD_MOUNT_DIR "/opt/.factoryreset-test", 0644); */
-       int fd;
-
-       if ((fd = creat("/opt/.factoryreset", 0644)) < 0) {
-               LOGD("Can't factory reset.\n");
-               return;
-       }
-       sync();
-       close(fd);
-       reboot(RB_AUTOBOOT);
-}
-
 #ifndef RECOVERY_GUI
 static char *get_action_from_config(config_t *cfg)
 {

diff --git a/src/system-recovery/system-recovery.h b/src/system-recovery/system-recovery.h
index e267e0d..ea8699e 100644 (file)
--- a/src/system-recovery/system-recovery.h
+++ b/src/system-recovery/system-recovery.h
@@ -31,10 +31,8 @@ extern "C" {
 #define LOGD                    printf
 #define FILE_IO_BUF_SIZE        128
 
-#define SAFE_MODE_FILE          "/opt/etc/.safeboot"
 #define ROOT_MOUNT_DIR          "/system"
 #define INITRD_MOUNT_DIR        "/system/mnt/initrd-recovery"
-#define FACTORY_RESET           "/usr/bin/factory-reset"
 
 typedef enum {
        RECOVERY_RUI_SCREEN_MAIN,
@@ -58,9 +56,6 @@ typedef enum {
 int pivot_root(const char *new_root, const char *put_old);
 
 void sys_power_reboot(void);
-void boot_safe_mode(void);
-void run_factory_reset(void);
-void sd_restore(void);
 
 bool recovery_rui_init(config_t *cfg);
 void recovery_rui_exit(void);