diff options
| author | imp <imp@FreeBSD.org> | 2003-08-20 06:24:12 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2003-08-20 06:24:12 +0000 |
| commit | d7ba3dd9a7c234423f65deccc61042c9c9fcda45 (patch) | |
| tree | 967b3f1f7e1093fc6645a24501223729a3621229 /usr.sbin/sade | |
| parent | ca8f17fdde609d29203cfa0f308cb5fc42a02f8f (diff) | |
| download | FreeBSD-src-d7ba3dd9a7c234423f65deccc61042c9c9fcda45.zip FreeBSD-src-d7ba3dd9a7c234423f65deccc61042c9c9fcda45.tar.gz | |
Add a new variable 'skipPCCARD'. This variable will cause sysinstall
to ignore all PC Card devices.
Submitted by: Anders Nordby
PR: bin/37650
MFC After: 2 weeks
Diffstat (limited to 'usr.sbin/sade')
| -rw-r--r-- | usr.sbin/sade/install.c | 1 | ||||
| -rw-r--r-- | usr.sbin/sade/main.c | 4 | ||||
| -rw-r--r-- | usr.sbin/sade/sade.h | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c index 6d28171..9800efa 100644 --- a/usr.sbin/sade/install.c +++ b/usr.sbin/sade/install.c @@ -1157,6 +1157,7 @@ installVarDefaults(dialogMenuItem *self) 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"; diff --git a/usr.sbin/sade/main.c b/usr.sbin/sade/main.c index 3b1df90..9d805f7 100644 --- a/usr.sbin/sade/main.c +++ b/usr.sbin/sade/main.c @@ -112,7 +112,9 @@ main(int argc, char **argv) /* 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"); } diff --git a/usr.sbin/sade/sade.h b/usr.sbin/sade/sade.h index 9f50e3ce..684b0e3 100644 --- a/usr.sbin/sade/sade.h +++ b/usr.sbin/sade/sade.h @@ -194,6 +194,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" |
