summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2018-01-19 12:47:26 +0100
committerAllan McRae <allan@archlinux.org>2018-01-19 12:47:26 +0100
commita278356f75866f89232e3e6230bbf9fb2dc1893c (patch)
treec980b8a12ac36a64f9b4b08d76c4c03f4d7bb491
parenta7dbe4635b4af9b5bd927ec0e7a211d1f6c1b0f2 (diff)
downloadpacman-a278356f75866f89232e3e6230bbf9fb2dc1893c.tar.gz
pacman-a278356f75866f89232e3e6230bbf9fb2dc1893c.tar.xz
Deprecate --root in favour of --sysroot
The --root option was widely misunderstood, and is now replaced by --sysroot. Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--doc/pacman.8.txt10
-rw-r--r--src/pacman/pacman.c3
2 files changed, 2 insertions, 11 deletions
diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt
index 48958358..a395b777 100644
--- a/doc/pacman.8.txt
+++ b/doc/pacman.8.txt
@@ -133,16 +133,6 @@ Options
*NOTE*: If specified, this is an absolute path, and the root path is
not automatically prepended.
-*-r, \--root* <path>::
- Specify an alternative installation root (default is `/`). This should
- not be used as a way to install software into `/usr/local` instead of
- `/usr`.
- *NOTE*: If database path or log file are not specified on either the
- command line or in linkman:pacman.conf[5], their default location will
- be inside this root path.
- *NOTE*: This option is not suitable for performing operations on a mounted
- guest system. See '\--sysroot' instead.
-
*-v, \--verbose*::
Output paths such as as the Root, Conf File, DB Path, Cache Dirs, etc.
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index 8c7f715e..98b3f326 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -211,7 +211,6 @@ static void usage(int op, const char * const myname)
}
addlist(_(" -b, --dbpath <path> set an alternate database location\n"));
- addlist(_(" -r, --root <path> set an alternate installation root\n"));
addlist(_(" -v, --verbose be verbose\n"));
addlist(_(" --arch <arch> set an alternate architecture\n"));
addlist(_(" --sysroot operate on a mounted guest system (root-only)\n"));
@@ -450,6 +449,8 @@ static int parsearg_global(int opt)
break;
case OP_ROOT:
case 'r':
+ pm_printf(ALPM_LOG_WARNING,
+ _("option --root is deprecated; use --sysroot instead\n"));
free(config->rootdir);
config->rootdir = strdup(optarg);
break;