d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Document shortcuts.

Browse Source 
Fix a bug which prevented variables from working properly
This commit is contained in:
jkh 1996-07-02 10:57:58 +00:00
parent e697fd9fd2
commit 8c06ca329b
14 changed files with 257 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
release/sysinstall/dispatch.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: dispatch.c,v 1.2 1996/06/08 09:08:38 jkh Exp $
* $Id: dispatch.c,v 1.3 1996/06/26 09:09:27 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -114,13 +114,13 @@ dispatchCommand(char *str)
return DITEM_FAILURE;
}
/* A command might be a pathname if it's encoded in argv[0], as we also support */
if ((cp = index(str, '/')) != NULL)
str = cp + 1;
if (index(str, '=')) {
variable_set(str);
return DITEM_SUCCESS;
}
else if (!call_possible_resword(str, NULL, &i)) {
else if ((cp = index(str, '/')) != NULL)
str = cp + 1;
if (!call_possible_resword(str, NULL, &i)) {
msgConfirm("No such command: %s", str);
return DITEM_FAILURE;
}

115
release/sysinstall/help/shortcuts.hlp Normal file
View File

@ -0,0 +1,115 @@
/stand/sysinstall now supports command-line "shortcuts" which can
often replace outdated commands, like pkg_install. Multiple commands
can be invoked in sequence, and variables may be set on-the-fly to
customize the installation program's behavior in various ways.
Syntax:
/stand/sysinstall [var=value ..] [command ..]
Where "var" can be one or more of:
blanktime Screen blank time setting in seconds
bootManager Which boot manager to use: booteasy, standard or none
browserBinary Which doc browser to use (default: lynx)
browserPackage Which package to get browser from (default: lynx pkg)
cpioVerbose How verbose to be with cpio: high, medium or low
debug Extra debugging?
disk Which disk to operate on (wd0, sd0, etc).
domainname Domain name
editor Which screen editor to use
ifconfig_<iface> For each <iface> in network_devices
ftpDirectory Root of the FreeBSD distribution tree on FTP server
ftpOnError Set to retry or abort
ftpPass Which password to use when logging into FTP server
ftp Which FTP site/dir to use (URL ftp://site/dir/..)
ftpPort Which FTP port to use (default: 21)
ftpRetryCount How many times to retry a fetch operation
ftpUser Which username to use when logging into FTP server
ftpHost Which FTP hostname to use (overrides ftp variable)
gated Use gated instead of routed
defaultrouter IP address of default route
geometry Geometry to use for selected disk ("cyl/hd/sec")
hostname Fully qualified domain name for host.
network_interfaces Which network interfaces to configure
ipaddr IP address for this host's primary interface
nameserver IP address of name server
netmask Netmask for this host's primary interface
nfs Full host:/path/ specification to NFS media
nfsHost Host portion of nfs path
nfsSecure Use NFS secure mount (-P flag)
nfs_server Configure this machine as an NFS server
noConfirm Don't ask for confirmation on non-fatal errors
ntpDate Which ntp clock syncronization server to use
pcnfsd Install the PCNFSD package
ports Path to the ports collection
releaseName Which FreeBSD release to install
rootSize Size of the root partition to create for Auto
routedflags Which flags to pass to routed, if enabled
serialSpeed How fast to run a SLIP/PPP connection
slowEthernetCard PC ethernet card is uncommonly slow
swapSize Size of the swap partition to create for Auto
tapeBlocksize Tape size in blocks
ufs Full path to UFS media directory
usrSize Size of the /usr partition to create for Auto
varSize Size of the /var partition to create for Auto
And "command" can be one or more of:
configAnonFTP Configure system for anonymous FTP
configApache Configure and install the Apache WEB server
configGated Configure and install gated
configNFSServer Configure host as an NFS server
configSamba Configure and install Samba
configPackages Browse / install packages
diskPartitionEditor Partition a new or existing disk
diskPartitionWrite Write out any changed partition information
diskLabelEditor Label/Newfs/Mount new or existing filesystems
diskLabelCommit Write out any changed label information
distReset Reset distribution information
distSetDeveloper Select developer distribution
distSetXDeveloper Select X developer distribution
distSetKernDeveloper Select kernel developer distribution
distSetUser Select user distribution
distSetXUser Select X user distribution
distSetMinimum Select minimal distribution
distSetEverything Select all distributions
distSetDES Select DES sub-distributions
distSetSrc Select source sub-distributions
distSetXF86 Select XFree86 sub-distributions
distExtractAll Extract all selected distributions
docBrowser Browse documentation
installCommit Commit any pending installation operations
installExpress Express installation
installUpgrade Upgrade installation
installFixup Go into "fixit" mode
mediaSetCDROM Select CDROM media
mediaSetFloppy Select floppy media
mediaSetDOS Select DOS media
mediaSetTape Select tape media
mediaSetFTP Select FTP media
mediaSetFTPPassive Select FTP media in passive mode
mediaSetUFS Select UFS media
mediaSetNFS Select NFS media
mediaSetFtpUserPass Prompt for FTP username and password
mediaSetCPIOVerbosity Prompt for CPIO verbosity
mediaGetType Prompt for media type
optionsEditor Go to options editor
Examples:
/stand/sysinstall mediaSetFTP configPackages
Selects an FTP site and then goes to the package configuration menu.
/stand/sysinstall disk=sd0 diskPartitionEditor
Invokes the disk partition editor on disk sd0.
If /stand/sysinstall is linked to another filename, say
`/usr/local/bin/configPackages', then the basename will be used as an
implicit command name.

3
release/sysinstall/install.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: install.c,v 1.104 1996/06/29 03:49:39 jkh Exp $
* $Id: install.c,v 1.105 1996/07/02 01:03:42 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -800,7 +800,6 @@ installVarDefaults(dialogMenuItem *self)
variable_set2(VAR_FTP_USER, "ftp");
variable_set2(VAR_BROWSER_PACKAGE, "lynx-2.5FM");
variable_set2(VAR_BROWSER_BINARY, "/usr/local/bin/lynx");
variable_set2(VAR_CONFIG_FILE, "freebsd.cfg");
variable_set2(VAR_FTP_STATE, "passive");
variable_set2(VAR_FTP_ONERROR, "abort");
variable_set2(VAR_FTP_RETRIES, MAX_FTP_RETRIES);

5
release/sysinstall/menus.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: menus.c,v 1.76 1996/06/29 03:43:22 jkh Exp $
* $Id: menus.c,v 1.77 1996/07/02 01:03:47 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -334,7 +334,8 @@ consult the README file.",
{ "3 Install","A step-by-step guide to installing FreeBSD.", NULL, dmenuDisplayFile, NULL, "install" },
{ "4 Copyright","The FreeBSD Copyright notices.", NULL, dmenuDisplayFile, NULL, "COPYRIGHT" },
{ "5 Release","The release notes for this version of FreeBSD.", NULL, dmenuDisplayFile, NULL, "relnotes" },
{ "6 HTML Docs","Go to the HTML documentation menu (post-install).", NULL, docBrowser },
{ "6 Shortcuts", "Creating shortcuts to sysinstall.", NULL, dmenuDisplayFile, NULL, "shortcuts" },
{ "7 HTML Docs","Go to the HTML documentation menu (post-install).", NULL, docBrowser },
{ "0 Exit", "Exit this menu (returning to previous)", NULL, dmenuExit },
{ NULL } },
};

4
release/sysinstall/sysinstall.h
View File

@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated to essentially a complete rewrite.
*
* $Id: sysinstall.h,v 1.67 1996/06/29 03:43:25 jkh Exp $
* $Id: sysinstall.h,v 1.68 1996/07/02 01:03:51 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -83,11 +83,9 @@
#define VAR_BOOTMGR "bootManager"
#define VAR_BROWSER_BINARY "browserBinary"
#define VAR_BROWSER_PACKAGE "browserPackage"
#define VAR_CONFIG_FILE "configFile"
#define VAR_CPIO_VERBOSITY "cpioVerbose"
#define VAR_DEBUG "debug"
#define VAR_DISK "disk"
#define VAR_DISKSPACE "diskSpace"
#define VAR_DOMAINNAME "domainname"
#define VAR_EDITOR "editor"
#define VAR_EXTRAS "ifconfig_"

8
usr.sbin/sade/dispatch.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: dispatch.c,v 1.2 1996/06/08 09:08:38 jkh Exp $
* $Id: dispatch.c,v 1.3 1996/06/26 09:09:27 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -114,13 +114,13 @@ dispatchCommand(char *str)
return DITEM_FAILURE;
}
/* A command might be a pathname if it's encoded in argv[0], as we also support */
if ((cp = index(str, '/')) != NULL)
str = cp + 1;
if (index(str, '=')) {
variable_set(str);
return DITEM_SUCCESS;
}
else if (!call_possible_resword(str, NULL, &i)) {
else if ((cp = index(str, '/')) != NULL)
str = cp + 1;
if (!call_possible_resword(str, NULL, &i)) {
msgConfirm("No such command: %s", str);
return DITEM_FAILURE;
}

3
usr.sbin/sade/install.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: install.c,v 1.104 1996/06/29 03:49:39 jkh Exp $
* $Id: install.c,v 1.105 1996/07/02 01:03:42 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -800,7 +800,6 @@ installVarDefaults(dialogMenuItem *self)
variable_set2(VAR_FTP_USER, "ftp");
variable_set2(VAR_BROWSER_PACKAGE, "lynx-2.5FM");
variable_set2(VAR_BROWSER_BINARY, "/usr/local/bin/lynx");
variable_set2(VAR_CONFIG_FILE, "freebsd.cfg");
variable_set2(VAR_FTP_STATE, "passive");
variable_set2(VAR_FTP_ONERROR, "abort");
variable_set2(VAR_FTP_RETRIES, MAX_FTP_RETRIES);

5
usr.sbin/sade/menus.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: menus.c,v 1.76 1996/06/29 03:43:22 jkh Exp $
* $Id: menus.c,v 1.77 1996/07/02 01:03:47 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -334,7 +334,8 @@ consult the README file.",
{ "3 Install","A step-by-step guide to installing FreeBSD.", NULL, dmenuDisplayFile, NULL, "install" },
{ "4 Copyright","The FreeBSD Copyright notices.", NULL, dmenuDisplayFile, NULL, "COPYRIGHT" },
{ "5 Release","The release notes for this version of FreeBSD.", NULL, dmenuDisplayFile, NULL, "relnotes" },
{ "6 HTML Docs","Go to the HTML documentation menu (post-install).", NULL, docBrowser },
{ "6 Shortcuts", "Creating shortcuts to sysinstall.", NULL, dmenuDisplayFile, NULL, "shortcuts" },
{ "7 HTML Docs","Go to the HTML documentation menu (post-install).", NULL, docBrowser },
{ "0 Exit", "Exit this menu (returning to previous)", NULL, dmenuExit },
{ NULL } },
};

4
usr.sbin/sade/sade.h
View File

@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated to essentially a complete rewrite.
*
* $Id: sysinstall.h,v 1.67 1996/06/29 03:43:25 jkh Exp $
* $Id: sysinstall.h,v 1.68 1996/07/02 01:03:51 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -83,11 +83,9 @@
#define VAR_BOOTMGR "bootManager"
#define VAR_BROWSER_BINARY "browserBinary"
#define VAR_BROWSER_PACKAGE "browserPackage"
#define VAR_CONFIG_FILE "configFile"
#define VAR_CPIO_VERBOSITY "cpioVerbose"
#define VAR_DEBUG "debug"
#define VAR_DISK "disk"
#define VAR_DISKSPACE "diskSpace"
#define VAR_DOMAINNAME "domainname"
#define VAR_EDITOR "editor"
#define VAR_EXTRAS "ifconfig_"

8
usr.sbin/sysinstall/dispatch.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: dispatch.c,v 1.2 1996/06/08 09:08:38 jkh Exp $
* $Id: dispatch.c,v 1.3 1996/06/26 09:09:27 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -114,13 +114,13 @@ dispatchCommand(char *str)
return DITEM_FAILURE;
}
/* A command might be a pathname if it's encoded in argv[0], as we also support */
if ((cp = index(str, '/')) != NULL)
str = cp + 1;
if (index(str, '=')) {
variable_set(str);
return DITEM_SUCCESS;
}
else if (!call_possible_resword(str, NULL, &i)) {
else if ((cp = index(str, '/')) != NULL)
str = cp + 1;
if (!call_possible_resword(str, NULL, &i)) {
msgConfirm("No such command: %s", str);
return DITEM_FAILURE;
}

115
usr.sbin/sysinstall/help/shortcuts.hlp Normal file
View File

@ -0,0 +1,115 @@
/stand/sysinstall now supports command-line "shortcuts" which can
often replace outdated commands, like pkg_install. Multiple commands
can be invoked in sequence, and variables may be set on-the-fly to
customize the installation program's behavior in various ways.
Syntax:
/stand/sysinstall [var=value ..] [command ..]
Where "var" can be one or more of:
blanktime Screen blank time setting in seconds
bootManager Which boot manager to use: booteasy, standard or none
browserBinary Which doc browser to use (default: lynx)
browserPackage Which package to get browser from (default: lynx pkg)
cpioVerbose How verbose to be with cpio: high, medium or low
debug Extra debugging?
disk Which disk to operate on (wd0, sd0, etc).
domainname Domain name
editor Which screen editor to use
ifconfig_<iface> For each <iface> in network_devices
ftpDirectory Root of the FreeBSD distribution tree on FTP server
ftpOnError Set to retry or abort
ftpPass Which password to use when logging into FTP server
ftp Which FTP site/dir to use (URL ftp://site/dir/..)
ftpPort Which FTP port to use (default: 21)
ftpRetryCount How many times to retry a fetch operation
ftpUser Which username to use when logging into FTP server
ftpHost Which FTP hostname to use (overrides ftp variable)
gated Use gated instead of routed
defaultrouter IP address of default route
geometry Geometry to use for selected disk ("cyl/hd/sec")
hostname Fully qualified domain name for host.
network_interfaces Which network interfaces to configure
ipaddr IP address for this host's primary interface
nameserver IP address of name server
netmask Netmask for this host's primary interface
nfs Full host:/path/ specification to NFS media
nfsHost Host portion of nfs path
nfsSecure Use NFS secure mount (-P flag)
nfs_server Configure this machine as an NFS server
noConfirm Don't ask for confirmation on non-fatal errors
ntpDate Which ntp clock syncronization server to use
pcnfsd Install the PCNFSD package
ports Path to the ports collection
releaseName Which FreeBSD release to install
rootSize Size of the root partition to create for Auto
routedflags Which flags to pass to routed, if enabled
serialSpeed How fast to run a SLIP/PPP connection
slowEthernetCard PC ethernet card is uncommonly slow
swapSize Size of the swap partition to create for Auto
tapeBlocksize Tape size in blocks
ufs Full path to UFS media directory
usrSize Size of the /usr partition to create for Auto
varSize Size of the /var partition to create for Auto
And "command" can be one or more of:
configAnonFTP Configure system for anonymous FTP
configApache Configure and install the Apache WEB server
configGated Configure and install gated
configNFSServer Configure host as an NFS server
configSamba Configure and install Samba
configPackages Browse / install packages
diskPartitionEditor Partition a new or existing disk
diskPartitionWrite Write out any changed partition information
diskLabelEditor Label/Newfs/Mount new or existing filesystems
diskLabelCommit Write out any changed label information
distReset Reset distribution information
distSetDeveloper Select developer distribution
distSetXDeveloper Select X developer distribution
distSetKernDeveloper Select kernel developer distribution
distSetUser Select user distribution
distSetXUser Select X user distribution
distSetMinimum Select minimal distribution
distSetEverything Select all distributions
distSetDES Select DES sub-distributions
distSetSrc Select source sub-distributions
distSetXF86 Select XFree86 sub-distributions
distExtractAll Extract all selected distributions
docBrowser Browse documentation
installCommit Commit any pending installation operations
installExpress Express installation
installUpgrade Upgrade installation
installFixup Go into "fixit" mode
mediaSetCDROM Select CDROM media
mediaSetFloppy Select floppy media
mediaSetDOS Select DOS media
mediaSetTape Select tape media
mediaSetFTP Select FTP media
mediaSetFTPPassive Select FTP media in passive mode
mediaSetUFS Select UFS media
mediaSetNFS Select NFS media
mediaSetFtpUserPass Prompt for FTP username and password
mediaSetCPIOVerbosity Prompt for CPIO verbosity
mediaGetType Prompt for media type
optionsEditor Go to options editor
Examples:
/stand/sysinstall mediaSetFTP configPackages
Selects an FTP site and then goes to the package configuration menu.
/stand/sysinstall disk=sd0 diskPartitionEditor
Invokes the disk partition editor on disk sd0.
If /stand/sysinstall is linked to another filename, say
`/usr/local/bin/configPackages', then the basename will be used as an
implicit command name.

3
usr.sbin/sysinstall/install.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: install.c,v 1.104 1996/06/29 03:49:39 jkh Exp $
* $Id: install.c,v 1.105 1996/07/02 01:03:42 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -800,7 +800,6 @@ installVarDefaults(dialogMenuItem *self)
variable_set2(VAR_FTP_USER, "ftp");
variable_set2(VAR_BROWSER_PACKAGE, "lynx-2.5FM");
variable_set2(VAR_BROWSER_BINARY, "/usr/local/bin/lynx");
variable_set2(VAR_CONFIG_FILE, "freebsd.cfg");
variable_set2(VAR_FTP_STATE, "passive");
variable_set2(VAR_FTP_ONERROR, "abort");
variable_set2(VAR_FTP_RETRIES, MAX_FTP_RETRIES);

5
usr.sbin/sysinstall/menus.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: menus.c,v 1.76 1996/06/29 03:43:22 jkh Exp $
* $Id: menus.c,v 1.77 1996/07/02 01:03:47 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -334,7 +334,8 @@ consult the README file.",
{ "3 Install","A step-by-step guide to installing FreeBSD.", NULL, dmenuDisplayFile, NULL, "install" },
{ "4 Copyright","The FreeBSD Copyright notices.", NULL, dmenuDisplayFile, NULL, "COPYRIGHT" },
{ "5 Release","The release notes for this version of FreeBSD.", NULL, dmenuDisplayFile, NULL, "relnotes" },
{ "6 HTML Docs","Go to the HTML documentation menu (post-install).", NULL, docBrowser },
{ "6 Shortcuts", "Creating shortcuts to sysinstall.", NULL, dmenuDisplayFile, NULL, "shortcuts" },
{ "7 HTML Docs","Go to the HTML documentation menu (post-install).", NULL, docBrowser },
{ "0 Exit", "Exit this menu (returning to previous)", NULL, dmenuExit },
{ NULL } },
};

4
usr.sbin/sysinstall/sysinstall.h
View File

@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated to essentially a complete rewrite.
*
* $Id: sysinstall.h,v 1.67 1996/06/29 03:43:25 jkh Exp $
* $Id: sysinstall.h,v 1.68 1996/07/02 01:03:51 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -83,11 +83,9 @@
#define VAR_BOOTMGR "bootManager"
#define VAR_BROWSER_BINARY "browserBinary"
#define VAR_BROWSER_PACKAGE "browserPackage"
#define VAR_CONFIG_FILE "configFile"
#define VAR_CPIO_VERBOSITY "cpioVerbose"
#define VAR_DEBUG "debug"
#define VAR_DISK "disk"
#define VAR_DISKSPACE "diskSpace"
#define VAR_DOMAINNAME "domainname"
#define VAR_EDITOR "editor"
#define VAR_EXTRAS "ifconfig_"