Merge pull request 'Ignore system drives as live image' (#71) from bugfix/systemdrive_live into master

Reviewed-on: #71

README.md

@@ -9,7 +9,7 @@
 * process multiple drives at once
 
 ## Download USB Image ##
-[2.5GB image v1.0.0](https://schuttercloud.com/s/ggxGH9sA326aRfK)   (`wget` is your friend)
+See reHDD-Bootable how the live image created: https://git.mosad.xyz/localhorst/reHDD-Bootable
 
 Use [Etcher](https://www.balena.io/etcher/#download) or `dd` to create an bootable USB drive .
 

include/drive.h

@@ -34,6 +34,7 @@ public:
     } sShredSpeed;
 
     bool bWasShredded = false; // all shred iterations done
+    bool bWasShredStarted = false; // shred was atleast once started
     bool bWasChecked = false;  // all shred iterations and optional checking done
     bool bWasDeleted = false;
     bool bIsOffline = false;

include/reHDD.h

@@ -8,7 +8,7 @@
 #ifndef REHDD_H_
 #define REHDD_H_
 
-#define REHDD_VERSION "V1.1.2"
+#define REHDD_VERSION "V1.1.3"
 
 // Drive handling Settings
 #define WORSE_HOURS 19200    // mark drive if at this limit or beyond

src/delete.cpp

@@ -32,11 +32,15 @@ void Delete::deleteDrive(Drive *drive)
     const char *cpComand = sCMD.c_str();
     // cout << "delete: " << cpComand << endl;
 
-    FILE *deleteCmdOutput = popen(cpComand, "r");
-
-    while ((getline(&cLine, &len, deleteCmdOutput)) != -1)
+    if (drive->bWasShredStarted == false)
     {
-        // wipefs running
+        //only start delete if the drive was not shredded before
+        FILE *deleteCmdOutput = popen(cpComand, "r");
+
+        while ((getline(&cLine, &len, deleteCmdOutput)) != -1)
+        {
+            // wipefs running
+        }
+        pclose(deleteCmdOutput);
     }
-    pclose(deleteCmdOutput);
 }

src/reHDD.cpp

@@ -665,6 +665,12 @@ bool reHDD::getSystemDrive(string &systemDrive)
             break;
         }
 
+        if (currentLine.ends_with(" /run/overlay/live\n"s))
+        {
+            systemDriveFound = true;
+            break;
+        }
+
         if (currentLine.ends_with(" /\n"s))
         {
             systemDriveFound = true;

src/shred.cpp

@@ -36,6 +36,7 @@ int Shred::shredDrive(Drive *drive, int *ipSignalFd)
     ostringstream address;
     address << (void const *)&(*drive);
     Logger::logThis()->info("Shred-Task started - Drive: " + drive->getModelName() + "-" + drive->getSerial() + " @" + address.str());
+    drive->bWasShredStarted = true; //Mark drive as partly shredded
 
 #ifdef DRYRUN
     for (int i = 0; i <= 500; i++)
@@ -48,6 +49,7 @@ int Shred::shredDrive(Drive *drive, int *ipSignalFd)
         write(*ipSignalFd, "A", 1);
         usleep(20000);
     }
+    drive->bWasShredded = true;
 #endif
 
 #ifndef DRYRUN

src/tui.cpp

@@ -613,6 +613,7 @@ void TUI::vTruncateText(string *psText, uint16_t u16MaxLenght)
 void TUI::displaySelectedDrive(Drive drive, int stdscrX, int stdscrY)
 {
     struct MenuState menustate;
+    static bool dialogIsActive;
     menustate.bAbort = false;
     menustate.bConfirmDelete = false;
     menustate.bConfirmShred = false;
@@ -659,15 +660,21 @@ void TUI::displaySelectedDrive(Drive drive, int stdscrX, int stdscrY)
     {
         dialog = createDialog(40, 10, ((stdscrX) - (int)(stdscrX / 3) - 7) - (int)((stdscrX / 3) + 5) / 2, (int)(stdscrY / 2) - 5, "Confirm SHRED", "Press ENTER for SHRED", "Press ESC for cancel");
         wrefresh(dialog);
+        dialogIsActive = true;
     }
     else if (menustate.bConfirmDelete == true)
     {
         dialog = createDialog(40, 10, ((stdscrX) - (int)(stdscrX / 3) - 7) - (int)((stdscrX / 3) + 5) / 2, (int)(stdscrY / 2) - 5, "Confirm DELETE", "Press ENTER for DELETE", "Press ESC for cancel");
         wrefresh(dialog);
+        dialogIsActive = true;
     }
     else
     {
-        delwin(dialog);
+        if (dialogIsActive)
+        {
+            delwin(dialog);
+            dialogIsActive = false;
+        }
     }
 }