Changeset 2681

Timestamp:

09/02/08 12:34:50 (3 months ago)

Author:

kris

Message:

Fixed installer to accept any type of user / root passwords the user wants to install with

Location:

pcbsd/trunk/PCInstall

Files:

• pcinstall.cpp (modified) (5 diffs)
• pcinstall.ui (modified) (3 diffs)

pcbsd/trunk/PCInstall/pcinstall.cpp

@@ -500 +500 @@
     }
     
-    //Check username password contains only letters and numbers
-    if ((! passwordRegExp.exactMatch(linePassword->text())) && (linePassword->text() != "")) {
-        textAcctNotify->setText(tr("Warning: Root password may normally only use letters and numbers!"));
-        linePassword->setPaletteBackgroundColor(colourRed);
-        ok = 1;
-    }
     if ((linePassword->text() != linePassword2->text()) || linePassword->text().isEmpty())
     {
@@ -1512 +1506 @@
         
         
-    
-    
+   // Save the root password
+   QFile filePassRoot( "/mnt/tmp/setPass-Root" );
+    if ( filePassRoot.open( IO_WriteOnly ) ) {
+        QTextStream streamPassRoot( &filePassRoot );
+        streamPassRoot << linePassword->text();
+        filePassRoot.close();
+    }
+    
+   // Set our variables for the user passwords
+   QFile filePassUser; 
+   QString fileNameUser, tmp;
+
    QFile file( "/mnt/tmp/setPass" );
     if ( file.open( IO_WriteOnly ) ) {
         QTextStream stream( &file );
-        stream << "echo '" << linePassword->text().replace("\'","\\\'") << "' | pw usermod root -h 0\n" ;
+        stream << "cat /tmp/setPass-Root | pw usermod root -h 0\n" ;
+        stream << "rm /tmp/setPass-Root\n" ;
         while ( i < 100)
         {
@@ -1525 +1530 @@
                 break;   
             }
+   
+            // Save the password text to file
+            fileNameUser = "/mnt/tmp/setPass-User" + tmp.setNum(i);
+            filePassUser.setFileName( fileNameUser );
+            if ( filePassUser.open( IO_WriteOnly ) ) {
+                QTextStream streamPassUser( &filePassUser );
+                streamPassUser << AddPassword[i];
+                filePassUser.close();
+            }
+    
                 
-            stream << "echo '" << AddPassword[i].replace("\'","\\\'") << "' | pw useradd -n " << AddUserName[i] << " -G wheel,operator -h 0 -s " + AddShell[i] + " -d /home/" << AddUserName[i] << " -m -c \"" << AddRealName[i] << "\"\n";
+            stream << "cat /tmp/setPass-User" + tmp.setNum(i) + " | pw useradd -n " << AddUserName[i] << " -G wheel,operator -h 0 -s " + AddShell[i] + " -d /home/" << AddUserName[i] << " -m -c \"" << AddRealName[i] << "\"\n";
+            stream << "rm /tmp/setPass-User" + tmp.setNum(i) + "\n";
         
             stream << "chown -R " << AddUserName[i] << " /home/" << AddUserName[i] << "\n";
@@ -2313 +2329 @@
     
     
-        //Check username contains only letters and numbers
+    //Check username contains only letters and numbers
     if ((! passwordRegExp.exactMatch(lineUserName->text())) && (lineUserName->text() != "")) {
         textAcctNotify->setText(tr("Username may contain only letters and numbers!"));
@@ -2319 +2335 @@
         ok = FALSE;
     }
-    
-    //Check password contains only letters and numbers
-    if ((! passwordRegExp.exactMatch(lineUserPassword->text())) && (lineUserPassword->text() != "")) {
-        textAcctNotify->setText(tr("User password may contain only letters and numbers!"));
-        lineUserPassword->setPaletteBackgroundColor(colourRed);
-        ok = FALSE;
-    }
-    
-
     
     

pcbsd/trunk/PCInstall/pcinstall.ui

@@ -29 +29 @@
   </property>
   <widget class="QWidget" name="WizardPage" >
-   <property name="geometry" >
-    <rect>
-     <x>6</x>
-     <y>34</y>
-     <width>988</width>
-     <height>651</height>
-    </rect>
-   </property>
    <attribute name="title" >
     <string>Select Language and Keyboard</string>
@@ -431 +423 @@
      </property>
      <property name="text" >
-      <string>Version 7-Alpha</string>
+      <string>Version 7</string>
      </property>
      <property name="alignment" >
@@ -5571 +5563 @@
   </widget>
   <widget class="QWidget" name="WizardPage" >
+   <property name="geometry" >
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>100</width>
+     <height>30</height>
+    </rect>
+   </property>
    <attribute name="title" >
     <string>Installing PC-BSD</string>