SVN: PLDLiveInstaller/trunk: PLDLiveInstaller.cpp PLDLiveInstaller.h Version.h

Tue Dec 14 18:29:28 CET 2010

Author: shadzik
Date: Tue Dec 14 18:29:28 2010
New Revision: 11986

Modified:
   PLDLiveInstaller/trunk/PLDLiveInstaller.cpp
   PLDLiveInstaller/trunk/PLDLiveInstaller.h
   PLDLiveInstaller/trunk/Version.h
Log:
- disable:
  live-block-devices
  live-xorg-autoconf
  on destination system


Modified: PLDLiveInstaller/trunk/PLDLiveInstaller.cpp
==============================================================================

--- PLDLiveInstaller/trunk/PLDLiveInstaller.cpp	(original)
+++ PLDLiveInstaller/trunk/PLDLiveInstaller.cpp	Tue Dec 14 18:29:28 2010
@@ -1332,6 +1332,29 @@
   remjunk->deleteLater();
 }
 
+void PLDLiveInstaller::toggleService(QString service, bool action)
+{
+  QApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
+  installationText->setText("<html><p align=\"left\">"
+    "Disabling service " + service +
+    "</p></html>"
+  );
+  qDebug() << "Disabling service: " << service;
+  QStringList args;
+  args.append(DESTINATION);
+  args.append("chkconfig");
+  if(action)
+    args.append("--del");
+  else
+    args.append("--add");
+  args.append(service);
+  QProcess * chkconfig = new QProcess(this);
+  chkconfig->start("chroot", args);
+  chkconfig->waitForFinished();
+  updateProgressBar();
+  chkconfig->deleteLater();
+}
+
 char * PLDLiveInstaller::genPasswd()
 {
   QApplication::processEvents(QEventLoop::ExcludeUserInputEvents, -1);
@@ -1672,6 +1695,8 @@
      removeJunk("/var/tmp/kdecache-plduser","-rf");
      removeJunk("/usr/sbin/pldliveinstaller", "-f");
      removeJunk("/home/users/" + selUser + "/.kde/share/config/dolphinrc", "-f");
+     toggleService("live-block-devices", true);
+     toggleService("live-xorg-autoconf", true);
     }
 
     if(cont && !mountProcSysDev()) {

Modified: PLDLiveInstaller/trunk/PLDLiveInstaller.h
==============================================================================
--- PLDLiveInstaller/trunk/PLDLiveInstaller.h	(original)
+++ PLDLiveInstaller/trunk/PLDLiveInstaller.h	Tue Dec 14 18:29:28 2010
@@ -70,6 +70,7 @@
     int effectivePasswordLength(const QString& password);
     void removeJunk(QString filedir, QString argstorm);
     void substr(QString file, QString string1, QString string2);
+    void toggleService(QString service, bool action);
     
 public:
     PLDLiveInstaller( QWidget * parent = 0 );

Modified: PLDLiveInstaller/trunk/Version.h
==============================================================================
--- PLDLiveInstaller/trunk/Version.h	(original)
+++ PLDLiveInstaller/trunk/Version.h	Tue Dec 14 18:29:28 2010
@@ -1,3 +1,3 @@
-#define	VERSION "0.22"
+#define	VERSION "0.23"
 #define VERSION_STR "Version " VERSION
 #define KDEVER "4.5"
