This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch main in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=7c6adad334747d3cd1b32a59634ca272a4be364c commit 7c6adad334747d3cd1b32a59634ca272a4be364c Author: Guillem Jover <[email protected]> AuthorDate: Sun Mar 6 20:38:25 2022 +0100 dselect: Add support for --instdir --- dselect/main.cc | 4 +++- man/dselect.pod | 17 ++++++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dselect/main.cc b/dselect/main.cc index 74abd426c..7985bb74f 100644 --- a/dselect/main.cc +++ b/dselect/main.cc @@ -189,12 +189,13 @@ usage(const struct cmdinfo *ci, const char *value) printf(_( "Options:\n" " --admindir <directory> Use <directory> instead of %s.\n" +" --instdir <directory> Use <directory> instead of %s.\n" " --root <directory> Use <directory> instead of %s.\n" " --expert Turn on expert mode.\n" " -D, --debug <file> Turn on debugging, send output to <file>.\n" " --color <color-spec> Configure screen colors.\n" " --colour <color-spec> Ditto.\n" -), ADMINDIR, "/"); +), ADMINDIR, "/", "/"); printf(_( " -?, --help Show this help message.\n" @@ -322,6 +323,7 @@ extern "C" { static const struct cmdinfo cmdinfos[]= { { "admindir", 0, 1, nullptr, &admindir, nullptr }, + { "instdir", 0, 1, nullptr, &instdir, nullptr }, { "root", 0, 1, nullptr, nullptr, set_root, 1 }, { "debug", 'D', 1, nullptr, nullptr, set_debug }, { "expert", 'E', 0, nullptr, nullptr, set_expert }, diff --git a/man/dselect.pod b/man/dselect.pod index 609782f31..7a19c734b 100644 --- a/man/dselect.pod +++ b/man/dselect.pod @@ -92,9 +92,16 @@ Changes the directory where the dpkg ‘I<status>’, This defaults to I<%ADMINDIR%> and normally there shouldn't be any need to change it. +=item B<--instdir> I<directory> + +Set the installation directory, which refers to the directory where +packages get installed (since dpkg 1.21.2). +Defaults to «I</>» if B<DPKG_ROOT> has not been set. + =item B<--root> I<directory> -Set the root directory to I<directory>, which sets the administrative +Set the root directory to I<directory>, which sets the installation +directory to «I<directory>» and the administrative directory to «I<directory>%ADMINDIR%» (since dpkg 1.21.0). =item B<-D>I<file>, B<--debug> I<file> @@ -629,13 +636,13 @@ memory allocations, etc. =item B<DPKG_ROOT> -If set and the B<--root> option has not been specified, it will -be used as the filesystem root directory (since dpkg 1.21.0). +If set and the B<--instdir> or B<--root> options have not been specified, +it will be used as the filesystem root directory (since dpkg 1.21.0). =item B<DPKG_ADMINDIR> -If set and the B<--admindir> option has not been specified, it will -be used as the B<dpkg> database directory (since dpkg 1.21.0). +If set and the B<--admindir> or B<--root> option have not been specified, +it will be used as the B<dpkg> database directory (since dpkg 1.21.0). =item B<HOME> -- Dpkg.Org's dpkg
