Date: Thu, 2 May 2002 00:45:46 +0200 (CEST) From: Anders Nordby <anders@fix.no> To: FreeBSD-gnats-submit@FreeBSD.org Subject: bin/37650: Add skipPCCARD variable to sysinstall Message-ID: <20020501224546.110FC20323@totem.fix.no>
next in thread | raw e-mail | index | archive | help
>Number: 37650 >Category: bin >Synopsis: Add skipPCCARD variable to sysinstall >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed May 01 15:50:01 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Anders Nordby >Release: -current >Organization: Fluxpod Information eXchange >Environment: 5.0-CURRENT-20020422-JPSNAP >Description: Add skipPCCARD variable && options knob for not doing PCCARD initialization. This saves time when installing on systems with detected PCCARD subsystems, and is also necessary to avoid the "Use PC-card device as installation media?" breakage of doing non-interactive installs on them. Some laptops come with built-in Intel/PXE enabled NICs these days. Some goofs (like me) want to use this for non-interactive laptop installs. :) Also, it may be useful if PCCARD probing fails/crashes/whatever. >How-To-Repeat: <Code/input/activities to reproduce the problem (multiple lines)> >Fix: Index: install.c =================================================================== RCS file: /space/cvsroot/src/usr.sbin/sysinstall/install.c,v retrieving revision 1.321 diff -u -r1.321 install.c --- install.c 2 Apr 2002 20:42:52 -0000 1.321 +++ install.c 1 May 2002 22:24:12 -0000 @@ -1119,6 +1119,7 @@ variable_set2(VAR_TAPE_BLOCKSIZE, DEFAULT_TAPE_BLOCKSIZE, 0); variable_set2(VAR_INSTALL_ROOT, "/", 0); variable_set2(VAR_INSTALL_CFG, "install.cfg", 0); + variable_set2(VAR_SKIP_PCCARD, "NO", 0); cp = getenv("EDITOR"); if (!cp) cp = "/usr/bin/ee"; Index: main.c =================================================================== RCS file: /space/cvsroot/src/usr.sbin/sysinstall/main.c,v retrieving revision 1.67 diff -u -r1.67 main.c --- main.c 29 Mar 2002 23:03:17 -0000 1.67 +++ main.c 1 May 2002 22:33:16 -0000 @@ -112,7 +112,7 @@ /* Initialize PC-card, if we haven't already done so. */ #ifdef PCCARD_ARCH - if (!pvariable_get("pccardInitialize")) { + if (!variable_cmp(VAR_SKIP_PCCARD, "YES") && variable_get(VAR_SKIP_PCCARD)!=1 && !pvariable_get("pccardInitialize")) { pccardInitialize(); pvariable_set("pccardInitialize=1"); } Index: options.c =================================================================== RCS file: /space/cvsroot/src/usr.sbin/sysinstall/options.c,v retrieving revision 1.77 diff -u -r1.77 options.c --- options.c 1 Dec 2001 13:13:27 -0000 1.77 +++ options.c 1 May 2002 22:28:15 -0000 @@ -122,6 +122,8 @@ OPT_IS_VAR, NULL, VAR_TRY_DHCP, varCheck }, { "IPv6", "Attempt IPv6 configuration of interfaces", OPT_IS_VAR, NULL, VAR_TRY_RTSOL, varCheck }, +{ "Skip PCCARD", "Skip PC-card probing, do not use PC-card devices for installation", + OPT_IS_VAR, NULL, VAR_SKIP_PCCARD, varCheck }, { "FTP username", "Username and password to use instead of anonymous", OPT_IS_FUNC, mediaSetFTPUserPass, VAR_FTP_USER, varCheck }, { "Editor", "Which text editor to use during installation", Index: sysinstall.h =================================================================== RCS file: /space/cvsroot/src/usr.sbin/sysinstall/sysinstall.h,v retrieving revision 1.226 diff -u -r1.226 sysinstall.h --- sysinstall.h 30 Apr 2002 22:40:06 -0000 1.226 +++ sysinstall.h 1 May 2002 22:23:25 -0000 @@ -175,6 +175,7 @@ #define VAR_TAPE_BLOCKSIZE "tapeBlocksize" #define VAR_TRY_DHCP "tryDHCP" #define VAR_TRY_RTSOL "tryRTSOL" +#define VAR_SKIP_PCCARD "skipPCCARD" #define VAR_UFS_PATH "ufs" #define VAR_USR_SIZE "usrSize" #define VAR_VAR_SIZE "varSize" >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020501224546.110FC20323>