View | Details | Raw Unified | Return to bug 37650
Collapse All | Expand All

(-)install.c (+1 lines)
Lines 1119-1124 Link Here
1119 
    variable_set2(VAR_TAPE_BLOCKSIZE,		DEFAULT_TAPE_BLOCKSIZE, 0);
 1119 
    variable_set2(VAR_TAPE_BLOCKSIZE,		DEFAULT_TAPE_BLOCKSIZE, 0);
1120 
    variable_set2(VAR_INSTALL_ROOT,		"/", 0);
 1120 
    variable_set2(VAR_INSTALL_ROOT,		"/", 0);
1121 
    variable_set2(VAR_INSTALL_CFG,		"install.cfg", 0);
 1121 
    variable_set2(VAR_INSTALL_CFG,		"install.cfg", 0);
1122 
    variable_set2(VAR_SKIP_PCCARD,		"NO", 0);
1122 
    cp = getenv("EDITOR");
 1123 
    cp = getenv("EDITOR");
1123 
    if (!cp)
 1124 
    if (!cp)
1124 
	cp = "/usr/bin/ee";
 1125 
	cp = "/usr/bin/ee";
(-)main.c (-1 / +1 lines)
Lines 112-118 Link Here
112 

          112
          

        

        

          113
          
    /* Initialize PC-card, if we haven't already done so. */

          113
          
    /* Initialize PC-card, if we haven't already done so. */

        

        

          114
          
#ifdef PCCARD_ARCH

          114
          
#ifdef PCCARD_ARCH

        

          
            

              115
              
    if (!pvariable_get("pccardInitialize")) {


              115
              
    if (!variable_cmp(VAR_SKIP_PCCARD, "YES") && variable_get(VAR_SKIP_PCCARD)!=1 && !pvariable_get("pccardInitialize")) {

            

        

          116
          
	pccardInitialize();

          116
          
	pccardInitialize();

        

        

          117
          
	pvariable_set("pccardInitialize=1");

          117
          
	pvariable_set("pccardInitialize=1");

        

        

          118
          
    }

          118
          
    }

        



(-)options.c
      (+2 lines)




  

    
      
            Lines 122-127
          
      
      
        Link Here
      
    
  

        

          122
          
      OPT_IS_VAR,	NULL,			VAR_TRY_DHCP,		varCheck	},

          122
          
      OPT_IS_VAR,	NULL,			VAR_TRY_DHCP,		varCheck	},

        

        

          123
          
{ "IPv6",		"Attempt IPv6 configuration of interfaces",

          123
          
{ "IPv6",		"Attempt IPv6 configuration of interfaces",

        

        

          124
          
      OPT_IS_VAR,	NULL,			VAR_TRY_RTSOL,		varCheck	},

          124
          
      OPT_IS_VAR,	NULL,			VAR_TRY_RTSOL,		varCheck	},

        

            

              
              
              125
              
{ "Skip PCCARD",	"Skip PC-card probing, do not use PC-card devices for installation",

            

            

              126
              
      OPT_IS_VAR,	NULL,			VAR_SKIP_PCCARD,	varCheck	},

            

        

          125
          
{ "FTP username",	"Username and password to use instead of anonymous",

          127
          
{ "FTP username",	"Username and password to use instead of anonymous",

        

        

          126
          
      OPT_IS_FUNC,	mediaSetFTPUserPass,	VAR_FTP_USER,		varCheck	},

          128
          
      OPT_IS_FUNC,	mediaSetFTPUserPass,	VAR_FTP_USER,		varCheck	},

        

        

          127
          
{ "Editor",		"Which text editor to use during installation",

          129
          
{ "Editor",		"Which text editor to use during installation",

        



(-)sysinstall.h
      (+1 lines)




  

    
      
            Lines 175-180
          
      
      
        Link Here
      
    
  

        

          175
          
#define VAR_TAPE_BLOCKSIZE		"tapeBlocksize"

          175
          
#define VAR_TAPE_BLOCKSIZE		"tapeBlocksize"

        

        

          176
          
#define VAR_TRY_DHCP			"tryDHCP"

          176
          
#define VAR_TRY_DHCP			"tryDHCP"

        

        

          177
          
#define VAR_TRY_RTSOL			"tryRTSOL"

          177
          
#define VAR_TRY_RTSOL			"tryRTSOL"

        

            

              
              
              178
              
#define VAR_SKIP_PCCARD			"skipPCCARD"

            

        

          178
          
#define VAR_UFS_PATH			"ufs"

          179
          
#define VAR_UFS_PATH			"ufs"

        

        

          179
          
#define VAR_USR_SIZE			"usrSize"

          180
          
#define VAR_USR_SIZE			"usrSize"

        

        

          180
          
#define VAR_VAR_SIZE			"varSize"

          181
          
#define VAR_VAR_SIZE			"varSize"

        






  

  Return to bug 37650