Attachment 21480 Details for Bug 37650 – file.diff

[patch] file.diff

file.diff (text/plain), 2.52 KB, created by anders on 2002-05-01 23:50:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: anders

Created: 2002-05-01 23:50:01 UTC

Size: 2.52 KB

patch

obsolete

>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"

Actions: View | Diff

Attachments on bug 37650: 21480