Backup/restore ACL attributes

procount · Nov 8, 2021 · cf71502 · cf71502
1 parent 507460f
commit cf71502
Show file tree

Hide file tree

Showing 20 changed files with 1,522 additions and 1,512 deletions.
diff --git a/recovery/backupthread.cpp b/recovery/backupthread.cpp
@@ -170,13 +170,16 @@ bool BackupThread::processImage(const QVariantMap & entry)
         //#442 - remove useless socket files that prevent tar working
         readexec(1, "mount -o rw "+dev+" /tmp/src", error);
         readexec(1, "find /tmp/src -type s -exec rm {} \\;", error);
+        // Store extended ACL attributes
+        readexec(1, "sh -c \"cd /tmp/src; getfacl -s -R . >/tmp/src/acl_permissions.pinn\"", error);
         readexec(1, "umount /tmp/src", error);
 
         //   Mount it
         QProcess::execute("mount -o ro "+dev+" /tmp/src");
         emit newDrive(dev, ePM_READSTATS);
         QString cmd;
 
+
         emit startAccounting();
         if (fstype=="raw")
         {

diff --git a/recovery/multiimagewritethread.cpp b/recovery/multiimagewritethread.cpp
@@ -1547,8 +1547,15 @@ QMessageBox::ButtonRole  MultiImageWriteThread::untar(const QString &tarball, co
         //S    emit error(tr("Error downloading or extracting tarball")+"\n"+msg);
         return QMessageBox::RejectRole ;
     }
+
+    if (QFile::exists("/mnt2/acl_permissions.pinn"))
+    {
+        int error;
+        readexec(1, "sh -c\"cd /mnt2; setfacl --restore=acl_permissions.pinn\"", error);
+    }
     qDebug() << "finished writing filesystem in" << (t1.elapsed()/1000.0) << "seconds";
 
+
     return QMessageBox::AcceptRole;
 }
 

diff --git a/recovery/translation_ca.ts b/recovery/translation_ca.ts
diff --git a/recovery/translation_de.ts b/recovery/translation_de.ts
diff --git a/recovery/translation_en.ts b/recovery/translation_en.ts
diff --git a/recovery/translation_es.ts b/recovery/translation_es.ts
diff --git a/recovery/translation_eu.ts b/recovery/translation_eu.ts
diff --git a/recovery/translation_fi.ts b/recovery/translation_fi.ts
diff --git a/recovery/translation_fr.ts b/recovery/translation_fr.ts
diff --git a/recovery/translation_hu.ts b/recovery/translation_hu.ts
diff --git a/recovery/translation_it.ts b/recovery/translation_it.ts
diff --git a/recovery/translation_ja.ts b/recovery/translation_ja.ts
diff --git a/recovery/translation_ko.ts b/recovery/translation_ko.ts
diff --git a/recovery/translation_nl.ts b/recovery/translation_nl.ts
diff --git a/recovery/translation_no.ts b/recovery/translation_no.ts
diff --git a/recovery/translation_pl.ts b/recovery/translation_pl.ts
diff --git a/recovery/translation_pt.ts b/recovery/translation_pt.ts
diff --git a/recovery/translation_ru.ts b/recovery/translation_ru.ts
diff --git a/recovery/translation_sv.ts b/recovery/translation_sv.ts
diff --git a/recovery/translation_tr.ts b/recovery/translation_tr.ts