[Vectorlinux-devel] [vinstall-ng commit] r160 - branches/iVL

[<cod...@go...>]

Author: uelsk8s
Date: Mon Sep  1 11:12:29 2008
New Revision: 160

Modified:
    branches/iVL/FrmLilo.class
    branches/iVL/FrmRootPass.form
    branches/iVL/FrmUserAdd.class
    branches/iVL/MdlConfLilo.module
    branches/iVL/installer.gambas

Log:
small bugfixes, ready for testing

Modified: branches/iVL/FrmLilo.class
==============================================================================
--- branches/iVL/FrmLilo.class	(original)
+++ branches/iVL/FrmLilo.class	Mon Sep  1 11:12:29 2008
@@ -19,7 +19,7 @@
  PUBLIC sLiloTrgt AS String

  PUBLIC SUB Form_Open()
-
+    DIM sOut AS String

  'ClsPartSel.sRoot = "/dev/sdb1" '
   FMain.FrmCurr = ME
@@ -34,8 +34,19 @@
  "for each one of them by clicking on each tab. To proceed with the default  
pre-set values, simply click \'" & FMain.btnext.text & "\'"
  ME.tlList.Adjust
  ME.TabStrip1.Index = MdlLiloOsList.iVltag
-MdlLiloOsList.bVlCliOption = FALSE
+MdlLiloOsList.bVlCliOption = TRUE

+SHELL "mount -o bind /dev " & ClsGlobal.sTargetMnt &/ "dev" WAIT
+SHELL "mount -o bind /proc " & ClsGlobal.sTargetMnt &/ "proc" WAIT
+
+SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "var/log/setup/init" WAIT
+SHELL "chmod 700 " & ClsGlobal.sTargetMnt &/ "var/log/setup/init" WAIT
+  'SHELL "touch " & ClsGlobal.sTargetMnt  
&/ "var/log/setup/init/config-stage2"
+sOut = "#!/bin/bash \n" &
+"/sbin/config-stage1 gui-installer"
+File.Save(ClsGlobal.sTargetMnt &/ "var/log/setup/init/config-stage2", sOut)
+'SHELL "echo \"" & sOut & "\" >" & ClsGlobal.sTargetMnt  
&/ "var/log/setup/init/config-stage2"
+SHELL "chmod +x " & ClsGlobal.sTargetMnt  
&/ "var/log/setup/init/config-stage2"


  'ME.Maximized = TRUE

Modified: branches/iVL/FrmRootPass.form
==============================================================================
--- branches/iVL/FrmRootPass.form	(original)
+++ branches/iVL/FrmRootPass.form	Mon Sep  1 11:12:29 2008
@@ -4,33 +4,32 @@
    MoveScaled(0,0,64,64)
    Text = ("")
    { Frame1 Frame
-    MoveScaled(1,1,62,30)
+    MoveScaled(1,1,62,31)
      Text = ("Set Root Password")
+    { TextLabel2 TextLabel
+      MoveScaled(35,3,12,2)
+      Text = ("Enter Password")
+    }
      { TextLabel1 TextLabel
-      MoveScaled(3,3,29,11)
+      MoveScaled(1,4,29,11)
        Text = ("Choose a password for the root account. You must enter the  
Root Password twice to ensure accuracy.")
      }
+    { TextLabel3 TextLabel
+      MoveScaled(35,11,14,2)
+      Text = ("Re-Enter Password")
+    }
      { tbPasswd1 TextBox
        MoveScaled(35,6,21,2)
        Text = ("")
        Password = True
      }
-    { TextLabel2 TextLabel
-      MoveScaled(35,3,12,2)
-      Text = ("Enter Password")
+    { tbPasswd2 TextBox
+      MoveScaled(35,14,21,2)
+      Text = ("")
      }
      { Button1 Button
-      MoveScaled(46,18,11,2)
+      MoveScaled(44,22,11,2)
        Text = ("Set Password")
      }
-  }
-  { tbPasswd2 TextBox
-    MoveScaled(36,14,21,2)
-    Text = ("")
-    Password = True
-  }
-  { TextLabel3 TextLabel
-    MoveScaled(36,11,15,2)
-    Text = ("ReEnter Password")
    }
  }

Modified: branches/iVL/FrmUserAdd.class
==============================================================================
--- branches/iVL/FrmUserAdd.class	(original)
+++ branches/iVL/FrmUserAdd.class	Mon Sep  1 11:12:29 2008
@@ -32,7 +32,8 @@
        ELSE
          IF ME.tbPasswd1.Text = ME.tbPasswd2.Text THEN
            IF IsDir(sPicdir) THEN
-            SHELL "ln -s " & sPicdir & "/default3.png " & sPicdir &/  
ME.tbUsername.Text & ".face.icon"
+            SHELL "cd " & sPicdir & " && ln -s root1.png root.face.icon"
+            SHELL "cd " & sPicdir & " && ln -s default3.png " &  
ME.tbUsername.Text & ".face.icon"
            ENDIF
            SHELL "chroot /mnt/target groupdel " & ME.tbUsername.Text WAIT
            SHELL "chroot /mnt/target groupadd -g " & iUID & Space(1) &  
ME.tbUsername.Text WAIT
@@ -53,5 +54,9 @@
        ENDIF
      ENDIF
    ENDIF
+  SHELL "umount " & ClsGlobal.sTargetMnt &/ "dev" WAIT
+  SHELL "umount " & ClsGlobal.sTargetMnt &/ "proc" WAIT
+  Message("Vectorlinux has been installed click OK to reboot")
+  SHELL "reboot"
  END


Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module	(original)
+++ branches/iVL/MdlConfLilo.module	Mon Sep  1 11:12:29 2008
@@ -89,8 +89,7 @@
    DIM sOut AS String
    DIM sDump AS String

-  SHELL "mount -o bind /dev " & ClsGlobal.sTargetMnt &/ "dev" WAIT
-  SHELL "mount -o bind /proc " & ClsGlobal.sTargetMnt &/ "proc" WAIT
+
    SHELL "chroot " & ClsGlobal.sTargetMnt & " /sbin/lilo || echo  
\'FAILED\'" TO sDump
      IF InStr(sDump, "FAILED") > 0 THEN
        Message.Error("Lilo returned an error. Please see below" &  
gb.NewLine & sDump)
@@ -99,14 +98,6 @@
      END IF
    'SHELL "umount " & ClsGlobal.sTargetMnt &/ "dev" WAIT
    'SHELL "umount " & ClsGlobal.sTargetMnt &/ "proc" WAIT
-  SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "var/log/setup/init" WAIT
-  SHELL "chmod 700 " & ClsGlobal.sTargetMnt &/ "var/log/setup/init" WAIT
-  'SHELL "touch " & ClsGlobal.sTargetMnt  
&/ "var/log/setup/init/config-stage2"
-  sOut = "#!/bin/bash \n" &
-  "/sbin/config-stage1 vector-virgin-heavy"
-  File.Save(ClsGlobal.sTargetMnt &/ "var/log/setup/init/config-stage2",  
sOut)
-  'SHELL "echo \"" & sOut & "\" >" & ClsGlobal.sTargetMnt  
&/ "var/log/setup/init/config-stage2"
-  SHELL "chmod +x " & ClsGlobal.sTargetMnt  
&/ "var/log/setup/init/config-stage2"
    'Message("Vectorlinux has been installed click OK to reboot")
    'SHELL "reboot"
  END

Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.