From a830ea00a29e2cdc7edf99622621ea96bbdf0d15 Mon Sep 17 00:00:00 2001
From: Kevin Kim <hckim@invesume.com>
Date: Sat, 17 Apr 2021 14:36:39 +0900
Subject: [PATCH] Add DEBUG message

---
 debug.log                 | 14 ++++++++++++++
 lang/systemback_ko_KR.ts  |  8 ++++++++
 systemback/systemback.cpp | 12 ++++++++++--
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/debug.log b/debug.log
index 0809e3d..cc3fd17 100644
--- a/debug.log
+++ b/debug.log
@@ -59,3 +59,17 @@ blacklist {
 
 # ll /dev/disk/by-id/ | grep sda
 lrwxrwxrwx 1 root root  9 Sep  9 14:47 scsi-3600508b1001c75ccf265ebc995aab8f4 -> ../../sda
+
+> TRY #1
+sudo systemctl stop  multipath-tools.service
+
+sudo apt purge multipath-tools
+
+--
+쓰는 도중에 확인한 마운트 정보
+
+hamonikr@hamonikr-jin:/.sblivesystemwrite$ cat /etc/mtab 
+
+/dev/sdc1 /.sblivesystemwrite/sblive vfat rw,noatime,fmask=0000,dmask=0000,allow_utime=0022,codepage=437,iocharset=iso8859-1,shortname=mixed,errors=remount-ro 0 0
+/dev/sdc2 /.sblivesystemwrite/sbroot ext4 rw,noatime 0 0
+
diff --git a/lang/systemback_ko_KR.ts b/lang/systemback_ko_KR.ts
index 2a2c283..2ba7f55 100644
--- a/lang/systemback_ko_KR.ts
+++ b/lang/systemback_ko_KR.ts
@@ -839,6 +839,14 @@
         <source>An error occurred while unpacking the Live system files.</source>
         <translation>라이브 시스템 파일을 해제하는 동안 오류가 발생하였습니다.</translation>
     </message>
+    <message>
+        <source>An error occurred while writing SBLIVE partition.</source>
+        <translation>SBLIVE 파티션을 작성하는 중 오류가 발생하였습니다.</translation>
+    </message>
+    <message>
+        <source>An error occurred while writing SBROOT partition.</source>
+        <translation>SBROOT 파티션을 작성하는 중 오류가 발생하였습니다.</translation>
+    </message>    
     <message>
         <source>The Live conversion is aborted!</source>
         <translation>라이브 시스템 변환이 중단되었습니다.</translation>
diff --git a/systemback/systemback.cpp b/systemback/systemback.cpp
index 33f0302..7ba1372 100644
--- a/systemback/systemback.cpp
+++ b/systemback/systemback.cpp
@@ -2676,8 +2676,12 @@ void systemback::livewrite()
     {
         if(sb::exec("tar -xf \"" % sb::sdir[2] % "\"/" % sb::left(ui->livelist->currentItem()->text(), sb::instr(ui->livelist->currentItem()->text(), " ") - 1) % ".sblive -C /.sblivesystemwrite/sblive --no-same-owner --no-same-permissions", sb::Prgrss)) return err(323);
     }
-    else if(sb::exec("tar -xf \"" % sb::sdir[2] % "\"/" % sb::left(ui->livelist->currentItem()->text(), sb::instr(ui->livelist->currentItem()->text(), " ") - 1) % ".sblive -C /.sblivesystemwrite/sblive --exclude=casper/filesystem.squashfs --exclude=live/filesystem.squashfs --no-same-owner --no-same-permissions") || sb::exec("tar -xf \"" % sb::sdir[2] % "\"/" % sb::left(ui->livelist->currentItem()->text(), sb::instr(ui->livelist->currentItem()->text(), " ") - 1) % ".sblive -C /.sblivesystemwrite/sbroot --exclude=.disk --exclude=boot --exclude=EFI --exclude=syslinux --exclude=casper/initrd.gz --exclude=casper/vmlinuz --exclude=live/initrd.gz --exclude=live/vmlinuz --no-same-owner --no-same-permissions", sb::Prgrss))
-        return err(323);
+    else 
+    {
+        if(sb::exec("tar -xf \"" % sb::sdir[2] % "\"/" % sb::left(ui->livelist->currentItem()->text(), sb::instr(ui->livelist->currentItem()->text(), " ") - 1) % ".sblive -C /.sblivesystemwrite/sblive --exclude=casper/filesystem.squashfs --exclude=live/filesystem.squashfs --no-same-owner --no-same-permissions", sb::Prgrss)) return err(400);
+
+        if(sb::exec("tar -xf \"" % sb::sdir[2] % "\"/" % sb::left(ui->livelist->currentItem()->text(), sb::instr(ui->livelist->currentItem()->text(), " ") - 1) % ".sblive -C /.sblivesystemwrite/sbroot --exclude=.disk --exclude=boot --exclude=EFI --exclude=syslinux --exclude=casper/initrd.gz --exclude=casper/vmlinuz --exclude=live/initrd.gz --exclude=live/vmlinuz --no-same-owner --no-same-permissions", sb::Prgrss)) return err(401);        
+    }
 
     pset(1);
     if(sb::exec("syslinux -ifd syslinux " % ldev % (ismmc ? "p" : nullptr) % '1')) return err();
@@ -2904,6 +2908,10 @@ void systemback::dialogopen(ushort dlg, cbstr &dev)
                         return tr("The Live write is aborted!") % "<p>" % tr("The specified partition could not be formatted (in use or unavailable).") % "<p><b>" % dev.data;
                     case 339:
                         return tr("The system restoration is aborted!") % "<p>" % tr("There is not enough free space.");
+                    case 400:
+                        return tr("The Live write is aborted!") % "<p>" % tr("An error occurred while writing SBLIVE partition.");
+                    case 401:
+                        return tr("The Live write is aborted!") % "<p>" % tr("An error occurred while writing SBROOT partition.");                        
                     default:
                         return tr("The system repair is aborted!") % "<p>" % tr("There is not enough free space.");
                     }