Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2018-07-19 12:51:07 +1000
committerAllan McRae <allan@archlinux.org>2018-07-25 09:50:26 +1000
commit0adb36346c18ab316f86f2ba52729257ac63284d (patch)
tree88e2d6223781c0c8c1ce90e231c03969970f0a2c
parentacef70c1036e3234fe07f2dd1d105f0f59480baa (diff)
Revert "Deprecate --root in favour of --sysroot"
The use of --sysroot in the real world has flagged some issues that need addressing. Undeprecate --root for now. This reverts commit a278356f75866f89232e3e6230bbf9fb2dc1893c. Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--doc/pacman.8.asciidoc10
-rw-r--r--src/pacman/pacman.c3
2 files changed, 11 insertions, 2 deletions
diff --git a/doc/pacman.8.asciidoc b/doc/pacman.8.asciidoc
index b6f4dd76..66483bcb 100644
--- a/doc/pacman.8.asciidoc
+++ b/doc/pacman.8.asciidoc
@@ -130,6 +130,16 @@ 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 fe54793e..e0178da8 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -211,6 +211,7 @@ 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"));
@@ -449,8 +450,6 @@ 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;