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

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

Author: M0...@gm...
Date: Wed Dec  3 10:34:04 2008
New Revision: 353

Modified:
    branches/iVL/.project
    branches/iVL/FrmImportAccts.class
    branches/iVL/MdlLilo.module
    branches/iVL/MdlUsrAdd.module
    branches/iVL/installer.gambas

Log:
Added noinitrd option to lilo initrd lists

Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project	(original)
+++ branches/iVL/.project	Wed Dec  3 10:34:04 2008
@@ -2,7 +2,7 @@
  # Compiled with Gambas 2.9.0
  Title=VectorLinux Installer
  Startup=MdlCore
-Version=0.1.24
+Version=0.1.26
  Library=gb.gtk
  Library=gb.form
  Library=gb.debug
@@ -17,7 +17,6 @@
  Language=en_US
  ControlPublic=1
  ModulePublic=1
-ExecPath=/root/gui-installer/installer.gambas
  Maintainer=M0E-lnx
  Vendor=VectorLinux
  Add...@gm...

Modified: branches/iVL/FrmImportAccts.class
==============================================================================
--- branches/iVL/FrmImportAccts.class	(original)
+++ branches/iVL/FrmImportAccts.class	Wed Dec  3 10:34:04 2008
@@ -92,6 +92,7 @@
        MdlUsrAdd.DISPLAY_USER_GROUP_OPTIONS(ME.frmUsrGrps)
        MdlUsrAdd.LIST_NEW_USER_ACCOUNT()
        Message.Info(("User account for") & Space(1) &  
Trim(ME.cbAccntList.Text) & Space(1) & ("successfully imported"))
+      ME.cbAccntList.Remove(ME.cbAccntList.Find(Trim(ME.cbAccntList.Text)))
      END IF

      'ME.Close
@@ -151,17 +152,19 @@
            IF Exist(clsglobal.sTargetMnt &/ "home" &/ sname  
&/ ".face.icon") THEN KILL clsglobal.sTargetMnt &/ "home" &/ sname  
&/ ".face.icon"
            SHELL "cd " & sPicdir & " && ln -s " &  
Replace(ME.tbPicPath.Text, ClsGlobal.sTargetMnt, "") & Space(1) & sname  
& ".face.icon" WAIT  'link for KDM
                ' Tweak for the GDM face icon to work
-          TRY COPY Trim(tbPicPath.Text) TO clsglobal.sTargetMnt &/ "home"  
&/ sname &/ ".face"
-          SHELL "chmod 644 " & ClsGlobal.sTargetMnt &/ "home/" & sname  
&/ ".face" WAIT
+       '   TRY COPY Trim(tbPicPath.Text) TO clsglobal.sTargetMnt &/ "home"  
&/ sname &/ ".face"
+       EXEC ["cp", Trim(tbPicPath.Text), clsglobal.sTargetMnt &/ "home" &/  
sname &/ ".face "] WAIT
+       EXEC ["chmod", "664", clsglobal.sTargetMnt &/ "home" &/ sname  
&/ ".face"] WAIT
+          'SHELL "chmod 644 " & ClsGlobal.sTargetMnt &/ "home/" & sname  
&/ ".face" WAIT
            SHELL "chroot " & ClsGlobal.sTargetMnt & " chown " & sname &  
Space(1) &/ "home" &/ sname &/ ".face" WAIT
            SHELL "chroot " & ClsGlobal.sTargetMnt & " chgrp " & sname &  
Space(1) &/ "home/" & sname &/ ".face" WAIT
            IF ERROR THEN Message.Error(Error.Where & gb.NewLine &  
Error.Text)
    END IF

      ' Increase the value of the iUID
-    INC FrmUserAdd.iUID
-    ME.LIST_IMPORTED_USER_ACCOUNT()
-  ME.cbAccntList.Remove(ME.cbAccntList.Find(sname))
+    'INC FrmUserAdd.iUID
+    'ME.LIST_IMPORTED_USER_ACCOUNT()
+

  END


Modified: branches/iVL/MdlLilo.module
==============================================================================
--- branches/iVL/MdlLilo.module	(original)
+++ branches/iVL/MdlLilo.module	Wed Dec  3 10:34:04 2008
@@ -37,7 +37,7 @@
    'MdlConfLilo.PERFORM_BINDING() ' Performs binding mounts for LILO setup
    IRET = MdlConfLilo.EXECUTE_LILO() ' Execute lilo in chroot mode
      RETURN IRET
-  MdlCore.warn_status_off()
+  'MdlCore.warn_status_off()

  END

@@ -162,7 +162,11 @@
                  END IF
            NEXT
            FOR EACH cbox IN arrCbInitrds
-              IF cb.Tag = cbox.Tag THEN sInitrd = Trim(cbox.Text) & "-" &  
Right(cbox.Tag, Len(cbox.Tag) - RInStr(cbox.tag, "/"))
+              IF cb.Tag = cbox.Tag AND cbox.Text = ("None") THEN
+                sInitrd = "noinitrd"
+              ELSE
+               sInitrd = Trim(cbox.Text) & "-" & Right(cbox.Tag,  
Len(cbox.Tag) - RInStr(cbox.tag, "/"))
+              END IF
            NEXT
            FOR EACH tb IN arrLinuxAppendtxtBoxes
              IF cb.Tag = tb.Tag THEN sAppend = Trim(tb.Text)
@@ -300,11 +304,12 @@
                    ELSE
                        sKernelLoc = "/tmp/lilo_tmp"
                    END IF
-
+                  ' Do not copy current kernel..
+                    IF sShortpart <> Right(ClsPartSel.sRoot,  
Len(ClsPartSel.sRoot) - InStr(ClsPartSel.sRoot, "/")) THEN
                      '  EXEC ["mkdir", "-p", ClsGlobal.sTargetMnt  
&/ "boot/tamu"] WAIT
                        EXEC ["cp", sKernelLoc &/ sInitrd,  
ClsGlobal.sTargetMnt &/ sKernelPath &/ sInitrd & "-" & sShortpart] WAIT
                        EXEC ["cp", sKernelLoc &/ "vmlinuz",  
ClsGlobal.sTargetMnt &/ sKernelPath &/ "vmlinuz-" & sShortpart] WAIT
-
+                    END IF

                EXEC ["sync"] WAIT
                EXEC ["umount", "/tmp/lilo_tmp"] WAIT
@@ -606,7 +611,9 @@
                                      .Width = 200
                                      .Height = 21
                                      .Tag = i & sHostPart
+                                     .Add(("None"))
                                              ' BROWSE FOR INITRD IMAGES
+
                                                  FOR EACH sDump IN  
Dir(sInitrdLoc, "initrd*").Sort(gb.Ascent)
                                                      IF  
cbox.Find(Trim(sDump)) = -1 THEN cbox.Add(Trim(sDump))
                                                  NEXT

Modified: branches/iVL/MdlUsrAdd.module
==============================================================================
--- branches/iVL/MdlUsrAdd.module	(original)
+++ branches/iVL/MdlUsrAdd.module	Wed Dec  3 10:34:04 2008
@@ -30,7 +30,7 @@
    DIM tl AS TextLabel
    DIM tly AS Integer

-  FrmUserAdd.LstUsers.Clear
+'  FrmUserAdd.LstUsers.Clear
    tly = 4
    FOR i = 0 TO sFile.count - 1
      sLine = sFile[i]

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