no sfs add

diff --git a/system/cpp-src/mkalteriso/command_collection.cpp b/system/cpp-src/mkalteriso/command_collection.cpp
index 6e2b0c6..cfab52c 100644 (file)
--- a/system/cpp-src/mkalteriso/command_collection.cpp
+++ b/system/cpp-src/mkalteriso/command_collection.cpp
@@ -2,10 +2,11 @@
 
 command_collection::command_collection(QObject *parent) : QObject(parent)
 {
-
+umount_kun=false;
 }
 void command_collection::set_build_setting(build_setting* bss){
     bskun=bss;
+
 }
 int command_collection::command_init(){
     _show_config(INIT);
@@ -114,11 +115,81 @@ int command_collection::_mkairootfs_sfs(){
     _msg_success("Done!");
     return 0;
 }
+void command_collection::_mount_airootfs(){
+    umount_kun=true;
+    QDir workkun(bskun->get_work_dir());
+    if(!workkun.exists("mnt/airootfs")){
+        workkun.mkpath("mnt/airootfs");
+    }
+    _msg_info("Mounting '" + bskun->get_work_dir() + "/airootfs.img' on '" + bskun->get_work_dir() + "/mnt/airootfs'");
+    QString mount_cmd="mount \"" + bskun->get_work_dir() + "/airootfs.img\" \"" + bskun->get_work_dir() + "/mnt/airootfs\"";
+    _msg_info(mount_cmd);
+    system(mount_cmd.toUtf8().data());
+    _msg_success("Done!");
+
+}
+void command_collection::_umount_airootfs(){
+    _msg_info("Unmounting '" + bskun->get_work_dir() + "/mnt/airootfs'");
+    QString umount_cmdrun="umount -d \"" + bskun->get_work_dir() + "/mnt/airootfs\"";
+    _msg_info(umount_cmdrun);
+    system(umount_cmdrun.toUtf8().data());
+    _msg_success("Done!");
+    QString rmdirkun="rmdir \"" + bskun->get_work_dir() + "/mnt/airootfs\"";
+    _msg_info(rmdirkun);
+    system(rmdirkun.toUtf8().data());
+
+}
+void command_collection::force_umount(){
+    if(umount_kun){
+        _umount_airootfs();
+    }
+}
+int command_collection::_mkairootfs_img(){
+    QDir workdirkun(bskun->get_work_dir());
+    if(!workdirkun.exists("airootfs")){
+        _msg_err("The path '" + bskun->get_work_dir() + "/airootfs' does not exist");
+        return 1;
+    }
+    _msg_info("Creating ext4 image of 32GiB...");
+    QString truncate_cmdstr="truncate -s 32GB \"" + bskun->get_work_dir() + "/airootfs.img\"";
+    _msg_info(truncate_cmdstr);
+    system(truncate_cmdstr.toUtf8().data());
+    QString mkfs_ext4_cmdstr="mkfs.ext4 -O ^has_journal,^resize_inode -E lazy_itable_init=0 -m 0 -F \"" + bskun->get_work_dir() + "/airootfs.img\"";
+    _msg_info(mkfs_ext4_cmdstr);
+    system(mkfs_ext4_cmdstr.toUtf8().data());
+    QString tune2fs_cmdstr="tune2fs -c 0 -i 0 \"" + bskun->get_work_dir() + "/airootfs.img\"";
+    _msg_info(tune2fs_cmdstr);
+    system(tune2fs_cmdstr.toUtf8().data());
+    _msg_success("Done!");
+    _mount_airootfs();
+    QString workdirstr=bskun->get_work_dir();
+    _msg_info("Copying '" + workdirstr + "/airootfs/' to '" + workdirstr + "/mnt/airootfs/'...");
+    QString cp_kun="cp -aT \"" + workdirstr + "/airootfs/\" \"" + workdirstr + "/mnt/airootfs/\"";
+    _msg_info(cp_kun);
+    system(cp_kun.toUtf8().data());
+    QString chownkun="chown root:root \"" + workdirstr + "/mnt/airootfs/\"";
+    _msg_info(chownkun);
+    system(chownkun.toUtf8().data());
+    _msg_success("Done!");
+    _umount_airootfs();
+    workdirkun.mkpath("iso/" + bskun->get_install_dir() + "/" + bskun->get_architecture());
+    _msg_info("Creating SquashFS image, this may take some time...");
+    QString mksquashfskun="mksquashfs \"" + workdirstr + "/airootfs.img\" \"" + workdirstr + "/iso/" + bskun->get_install_dir() + "/" + bskun->get_architecture()
+            + "/airootfs.sfs\" -noappend -comp \"" + bskun->get_sfs_comp() + "\" " + bskun->get_sfs_comp_opt();
+    _msg_info(mksquashfskun);
+    system(mksquashfskun.toUtf8().data());
+    _msg_success("Done!");
+    workdirkun.remove("airootfs.img");
+    return 0;
+
+}
 int command_collection::command_prepare(){
     _show_config(PREPARE);
     _cleanup();
     if(bskun->get_sfs_mode() == "sfs"){
         _mkairootfs_sfs();
+    }else{
+        _mkairootfs_img();
     }
     _mkchecksum();
     return 0;

diff --git a/system/cpp-src/mkalteriso/command_collection.h b/system/cpp-src/mkalteriso/command_collection.h
index 8f1762f..4d092d1 100644 (file)
--- a/system/cpp-src/mkalteriso/command_collection.h
+++ b/system/cpp-src/mkalteriso/command_collection.h
@@ -18,9 +18,10 @@ public:
     int command_prepare();
     int command_pkglist();
     int command_iso(QString);
+    void force_umount();
 private:
     build_setting* bskun;
-
+    bool umount_kun;
     enum show_config_type{
         INIT=0,
         INSTALL=1,
@@ -40,6 +41,10 @@ private:
     void _mkchecksum();
     void _mksignature();
     void _mkisochecksum() ;
+    int _mkairootfs_img();
+    void _mount_airootfs();
+
+    void _umount_airootfs();
     QString img_name;
 signals:
 

diff --git a/system/cpp-src/mkalteriso/main.cpp b/system/cpp-src/mkalteriso/main.cpp
index 4f94df8..bb7a9fe 100644 (file)
--- a/system/cpp-src/mkalteriso/main.cpp
+++ b/system/cpp-src/mkalteriso/main.cpp
@@ -5,7 +5,9 @@ int main(int argc, char *argv[])
     QCoreApplication a(argc, argv);
     AppMain m(0,&a);
     QTimer::singleShot(0,&m,SLOT(run()));
-    return a.exec();
+    int retkun= a.exec();
+    m.cmd_collect.force_umount();
+    return retkun;
 }
 bool isroot(){
     uid_t uid  = {0};

diff --git a/system/cpp-src/mkalteriso/main.h b/system/cpp-src/mkalteriso/main.h
index 3362b52..f9eeea7 100644 (file)
--- a/system/cpp-src/mkalteriso/main.h
+++ b/system/cpp-src/mkalteriso/main.h
@@ -21,12 +21,13 @@ class AppMain : public QObject
 public:
   AppMain(QObject *parent, QCoreApplication* coreApp);
   build_setting build_setting_obj;
+
+  command_collection cmd_collect;
 public slots:
   void run();
 
 private:
   QCoreApplication* app;
-  command_collection cmd_collect;
   struct utsname uname_strkun;
 };