Author: M0...@gm...
Date: Thu Dec 4 08:55:00 2008
New Revision: 364
Modified:
branches/iVL/.lang/FMain.pot
branches/iVL/FMain.class
Log:
Fixed error where it was getting stuck @ root passwd
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Thu Dec 4 08:55:00 2008
@@ -94,27 +94,27 @@
msgid "Skipping lilo setup"
msgstr ""
-#: FMain.class:491
+#: FMain.class:495
msgid "Setup has detected existing directories in the partition you
selected for /home."
msgstr ""
-#: FMain.class:491
+#: FMain.class:495
msgid "Would you like to import these user accounts into your new
Operating System"
msgstr ""
-#: FMain.class:816
+#: FMain.class:820
msgid "Back"
msgstr ""
-#: FMain.class:827
+#: FMain.class:831
msgid "Exit Installation"
msgstr ""
-#: FMain.class:838
+#: FMain.class:842
msgid "Next"
msgstr ""
-#: FMain.class:852
+#: FMain.class:856
msgid "Button1"
msgstr ""
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Thu Dec 4 08:55:00 2008
@@ -486,6 +486,10 @@
FrmRootPass.Button1_Click()
' Scan home partition for user home dirs
+ IF NOT ClsPartSel.sHome OR ClsPartSel.sHome = ClsPartSel.sRoot
OR ClsPartSel.sHome = "" THEN
+ frmNext = FrmUserAdd
+ ELSE
+
IF Len(MdlSetup.SCAN_HOME_DIRS(ClsGlobal.sTargetMnt
&/ "home")) > 0 THEN
SELECT CASE Message.Question(("Setup has detected existing
directories in the partition you selected for /home.") & "<br>" &
("Would you like to import these user accounts into your
new Operating System"), ("Yes"), ("No"))
@@ -495,7 +499,7 @@
frmNext = FrmUserAdd
END SELECT
END IF
-
+ END IF
CASE "FrmUserAdd"
|
