SVN: PLDLiveInstaller/trunk/PLDLiveInstaller.cpp

[shadzik]

Author: shadzik
Date: Wed Jan 19 15:49:17 2011
New Revision: 12058

Modified:
   PLDLiveInstaller/trunk/PLDLiveInstaller.cpp
Log:
- fix args
- add debug output
- seems to work


Modified: PLDLiveInstaller/trunk/PLDLiveInstaller.cpp
==============================================================================
--- PLDLiveInstaller/trunk/PLDLiveInstaller.cpp	(original)
+++ PLDLiveInstaller/trunk/PLDLiveInstaller.cpp	Wed Jan 19 15:49:17 2011
@@ -267,11 +267,19 @@
 void PLDLiveInstaller::destroyPartitionTable(QString device)
 {
   qDebug() << "Destroying Partition Table on" << device;
-  QStringList args;
-  args.append("if=/dev/zero bs=512 count=1");
+  QStringList args,status;
+  args.append("if=/dev/zero");
   args.append("of=" + device);
+  args.append("bs=512");
+  args.append("count=1");
+  qDebug() << args;
   QProcess * dd = new QProcess(this);
   dd->start("dd", args);
+  while(dd->waitForReadyRead(-1))
+  {
+	  status = QString::fromLatin1(dd->readAll()).split("\n");
+	  qDebug() << status;
+  }
   dd->waitForFinished();
   dd->deleteLater();
 }
@@ -284,12 +292,19 @@
   "Creating default partition table scheme"
   "</p></html>");
   QApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
-  QStringList args;
-  args.append("-q -uM");
+  QStringList args, status;
+  args.append("-qf");
+  args.append("-uM");
   args.append(device);
   args.append("< /usr/share/pldliveinstaller/default.table");
+  qDebug() << args;
   QProcess * sfdisk = new QProcess(this);
   sfdisk->start("sfdisk", args);
+  while(sfdisk->waitForReadyRead(-1))
+  {
+	  status = QString::fromLatin1(sfdisk->readAll()).split("\n");
+	  qDebug() << status;
+  }
   sfdisk->waitForFinished();
   updateProgressBar();
   sfdisk->deleteLater();
@@ -1704,28 +1719,35 @@
       "Installing PLD Linux on the disk " + selectedDisk->text() + ""
       "</p></html>"
     );
-    qDebug() << "IsMounted:" << isMounted(destPartition);
-    if(isMounted(destPartition))
-      umountDev(destPartition);
     
     if(entireDisk->isChecked())
     {
+	    qDebug() << "starting partitioning";
       installBootLoader = false;
       selFS="ext4";
       doFormat=true;
+	    qDebug() << "initialiying solid";
+
       Solid::Device partitions[2];
       int i = 0;
       QString tmpDev = selectedBlockDev.as<Solid::Block>()->device();
+	    qDebug() << "destrozing pt";
       destroyPartitionTable(tmpDev);
+	    qDebug() << "creating pt";
       createPartitionTable(tmpDev);
       foreach (Solid::Device partDev, Solid::Device::listFromType(Solid::DeviceInterface::Block, selectedBlockDev.udi() ))
       {
 	partitions[i++]=partDev;
       }
-      destPartition=partitions[1];
-      destSwap=partitions[0];
+      destPartition=partitions[0];
+      destSwap=partitions[1];
+	    //qDebug() << "rootpart" << destPartition << "swpapart" << destSwap;
     }
     
+    qDebug() << "IsMounted:" << isMounted(destPartition);
+    if(isMounted(destPartition))
+      umountDev(destPartition);
+    
     if(doFormat) {
       if(cont && !makeFS(destPartition)) {
 	cont = false;