From 4146cc5ce7b36355adbfef690d19762c74041b53 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Mon, 11 Nov 2013 12:48:31 +0000 Subject: [PATCH] * faq-setup.xml: Throughout remove setup.exe, use setup or setup-x86... instead. (faq.setup.cli): Reproduce latest --help output. (faq.setup.noroot): New section. (faq.setup.setup-fails-on-ts): Remove section. * setup-net.xml (internet-setup): Mention setup-x86{_64} in first paragraph. Add note to allow using setup.exe in subsequent paragraphs. Add paragraph to introduce --no-admin option. --- winsup/doc/ChangeLog | 11 +++ winsup/doc/faq-setup.xml | 142 ++++++++++++++++++++------------------- winsup/doc/setup-net.xml | 32 +++++++-- 3 files changed, 111 insertions(+), 74 deletions(-) diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog index 445de3b76..99d95db66 100644 --- a/winsup/doc/ChangeLog +++ b/winsup/doc/ChangeLog @@ -1,3 +1,14 @@ +2013-11-11 Corinna Vinschen + + * faq-setup.xml: Throughout remove setup.exe, use setup or setup-x86... + instead. + (faq.setup.cli): Reproduce latest --help output. + (faq.setup.noroot): New section. + (faq.setup.setup-fails-on-ts): Remove section. + * setup-net.xml (internet-setup): Mention setup-x86{_64} in first + paragraph. Add note to allow using setup.exe in subsequent paragraphs. + Add paragraph to introduce --no-admin option. + 2013-11-06 Christopher Faylor * Makefile.in: Fix problems accessing xidepend when configured with a diff --git a/winsup/doc/faq-setup.xml b/winsup/doc/faq-setup.xml index 8339b61f3..3bea40d21 100644 --- a/winsup/doc/faq-setup.xml +++ b/winsup/doc/faq-setup.xml @@ -37,10 +37,10 @@ see http://cygwin.com/packages/ The Cygwin Setup program is designed to be interactive, but there are a few different ways to automate it. If you are deploying to multiple systems, the best way is to run through a full installation once, saving the entire -downloaded package tree. Then, on target systems, run setup.exe as a "Local -Install" pointed at your downloaded package tree. You could do this -non-interactively with the command line options -setup.exe -q -L -l x:\cygwin-local\, where your downloaded +downloaded package tree. Then, on target systems, run Cygwin Setup as a +"Local Install" pointed at your downloaded package tree. You could do this +non-interactively with the command line options +-q -L -l x:\cygwin-local\, where your downloaded package tree is in x:\cygwin-local\ (see the next FAQ for an explanation of those options.) @@ -52,37 +52,67 @@ For other options, search the mailing lists with terms such as -Does setup.exe accept command-line arguments? +Does Setup accept command-line arguments? Yes, the full listing is written to the setup.log file -when you run setup.exe --help. The current options are: +when you run setup-x86.exe --help or +setup-x86_64.exe --help. The current options are: Command Line Options: - -A --disable-buggy-antivirus Disable known or suspected buggy anti - virus software packages during execution. - -C --categories Specify entire categories to install - -D --download Download from internet - -d --no-desktop Disable creation of desktop shortcut - -h --help print help - -K --pubkey URL of extra public key file (gpg format) - -L --local-install Install from local directory - -l --local-package-dir Local package directory - -n --no-shortcuts Disable creation of desktop and start menu - shortcuts - -N --no-startmenu Disable creation of start menu shortcut - -O --only-site Ignore all sites except for -s - -P --packages Specify packages to install - -p --proxy HTTP/FTP proxy (host:port) - -q --quiet-mode Unattended setup mode - -r --no-replaceonreboot Disable replacing in-use files on next - reboot. - -R --root Root installation directory - -S --sexpr-pubkey Extra public key in s-expr format - -s --site Download site - -U --keep-untrusted-keys Use untrusted keys and retain all - -u --untrusted-keys Use untrusted keys from last-extrakeys - -X --no-verify Don't verify setup.ini signatures + -D --download Download from internet + -L --local-install Install from local directory + -s --site Download site + -O --only-site Ignore all sites except for -s + -R --root Root installation directory + -x --remove-packages Specify packages to uninstall + -c --remove-categories Specify categories to uninstall + -P --packages Specify packages to install + -C --categories Specify entire categories to install + -p --proxy HTTP/FTP proxy (host:port) + -a --arch architecture to install (x86_64 or x86) + -q --quiet-mode Unattended setup mode + -M --package-manager Semi-attended chooser-only mode + -B --no-admin Do not check for and enforce running as + Administrator + -h --help print help + -l --local-package-dir Local package directory + -r --no-replaceonreboot Disable replacing in-use files on next + reboot. + -X --no-verify Don't verify setup.ini signatures + -n --no-shortcuts Disable creation of desktop and start menu + shortcuts + -N --no-startmenu Disable creation of start menu shortcut + -d --no-desktop Disable creation of desktop shortcut + -K --pubkey URL of extra public key file (gpg format) + -S --sexpr-pubkey Extra public key in s-expr format + -u --untrusted-keys Use untrusted keys from last-extrakeys + -U --keep-untrusted-keys Use untrusted keys and retain all + -g --upgrade-also also upgrade installed packages + -o --delete-orphans remove orphaned packages + -A --disable-buggy-antivirus Disable known or suspected buggy anti virus + software packages during execution. + + + + + +Can I install Cygwin without administrator rights? + + +Yes. The default installation requests administrator rights because +this allows to set up the Cygwin environment so that all users can start +a Cygwin shell out of the box. However, if you don't have administrator +rights for your machine, and the admins don't want to install it for you, +you can install Cygwin just for yourself by downloading +setup-x86.exe (for a 32 bit install) or +setup-x86_64.exe (for a 64 bit install) and then start +it from the command line or via the "Run..." dialog from the start menu +using the --no-admin option, for instance: + + + + setup-x86.exe --no-admin @@ -168,7 +198,8 @@ archives. If this happens to you, consider disabling your anti-virus software when running Cygwin Setup. The following procedure should be a fairly safe way to do that: -Download setup.exe and scan it explicitly. +Download setup-x86.exe or +setup-x86_64.exe and scan it explicitly. Turn off the anti-virus software. @@ -275,10 +306,11 @@ installed, not including the package archives themselves nor the source code. After installation, the package archives remain in your ``Local -Package Directory'', by default the location of setup.exe. You -may conserve disk space by deleting the subdirectories there. These -directories will have very weird looking names, being encoded with -their URLs (named ftp%3a%2f...). +Package Directory''. By default the location of +setup-x86{_64}.exe. You may conserve disk space by +deleting the subdirectories there. These directories will have very weird +looking names, being encoded with their URLs +(named ftp%3a%2f...). Of course, you can keep them around in case you want to reinstall a package. If you want to clean out only the outdated packages, Michael Chase @@ -333,35 +365,6 @@ what happened that wasn't supposed to happen, etc. - -My installation on a Terminal Server machine goes wrong. What can I do? - - -The problem is that Terminal Server machines do some compatibility -checks when running applications which are not marked as -"Terminal Server-aware", and this compatibility check seems to be buggy, -leaving parts of the application in a non-executable state. Curious enough, -this only happens if DEP (Data Execution Prevention) is turned on for -all applications. - -So far, only few Cygwin packages have their binaries marked as -TS-aware, which means there's a good chance that the postinstall scripts -during the installation will break, and that after installation you -can't start a shell, etc. - -So, for the time being, here's how you install Cygwin on a Terminal -Server. First, switch DEP to "Turn on DEP for essential Windows programs -and services only" and reboot the machine. Then install via setup.exe. -You can leave it at that and run the Terminal Server in the aforementioned -DEP setting. Or use the peflags tool from the rebase package to set -the TS-aware flag in all executables, switch DEP back to "Turn on DEP for -all programs and services except [...]" and reboot again. However, -please keep in mind that a package update might re-install a binary -with the TS-aware flag switched off again. So you will have to re-use -the peflags utility once in a while. - - - My Windows logon name has a space in it, will this cause problems? @@ -493,10 +496,11 @@ this in Cygwin by typing chown -R user / or by using other tools such as CACLS.EXE. -Delete the Cygwin shortcuts on the Desktop and Start Menu, and anything -left by setup.exe in the download directory. However, if you plan to reinstall -Cygwin it's a good idea to keep your setup.exe download directory since you can -reinstall the packages left in its cache without redownloading them. +Delete the Cygwin shortcuts on the Desktop and Start Menu, and +anything left by setup-x86{_64}.exe in the download directory. However, if you +plan to reinstall Cygwin it's a good idea to keep your setup-x86{_64}.exe +download directory since you can reinstall the packages left in its cache +without redownloading them. If you added Cygwin to your system path, you should remove it unless you @@ -609,7 +613,7 @@ this up for Cygwin 1.7, we might add this information here. Since Cygwin 1.7, there's nothing important in the registry anymore, except for the installation directory information stored there for the sake -of setup.exe. There's nothing left to manipulate anymore. +of setup-x86{_64}.exe. There's nothing left to manipulate anymore. diff --git a/winsup/doc/setup-net.xml b/winsup/doc/setup-net.xml index 877489b9c..fff9abe32 100644 --- a/winsup/doc/setup-net.xml +++ b/winsup/doc/setup-net.xml @@ -8,11 +8,25 @@ Internet Setup To install the Cygwin net release, go to http://cygwin.com/ and click on "Install Cygwin Now!". This will -download a GUI installer called setup.exe which can -be run to download a complete cygwin installation via the internet. -Follow the instructions on each screen to install Cygwin. +url="http://cygwin.com/">http://cygwin.com/ and run either +setup-x86.exe +to install the 32 bit version of Cygwin, or +setup-x86_64.exe +to install the 64 bit version of Cygwin. This will download a GUI +installer which can be run to download a complete cygwin installation +via the internet. Follow the instructions on each screen to install Cygwin. + + + + +For easier reading the installer is called setup.exe +throughout the following sections. This refers likewise to both +installer applications, +setup-x86.exe +for 32 bit, as well as +setup-x86_64.exe +for 64 bit. Apart from the target architecture they are the same thing. + @@ -24,6 +38,14 @@ check the wishlist in the