Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 1 | From ff325b35639a797edd92b373fbebf7b8b9f3f0c3 Mon Sep 17 00:00:00 2001 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Wed, 26 Aug 2015 16:25:45 +0300 |
Brad Bishop | 96ff198 | 2019-08-19 13:50:42 -0400 | [diff] [blame] | 4 | Subject: [PATCH] Our pre/postinsts expect $D to be set when running in a |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 5 | sysroot and don't expect a chroot. This matches up our system expectations |
| 6 | with what dpkg does. |
| 7 | |
| 8 | Upstream-Status: Inappropriate [OE Specific] |
| 9 | |
| 10 | RP 2011/12/07 |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 11 | ALIMON 2016/05/26 |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 12 | ALIMON 2017/02/21 |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 13 | KKang 2019/02/20 |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 14 | |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 15 | --- |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 16 | src/main/script.c | 53 +++-------------------------------------------- |
| 17 | 1 file changed, 3 insertions(+), 50 deletions(-) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 18 | |
Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame] | 19 | diff --git a/src/main/script.c b/src/main/script.c |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 20 | index ecce4d842..16f4e6ff5 100644 |
Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame] | 21 | --- a/src/main/script.c |
| 22 | +++ b/src/main/script.c |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 23 | @@ -97,58 +97,11 @@ static const char * |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 24 | maintscript_pre_exec(struct command *cmd) |
| 25 | { |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 26 | const char *instdir = dpkg_fsys_get_dir(); |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 27 | - const char *admindir = dpkg_db_get_dir(); |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 28 | - const char *changedir; |
| 29 | - size_t instdirlen = strlen(instdir); |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 30 | |
Brad Bishop | 96ff198 | 2019-08-19 13:50:42 -0400 | [diff] [blame] | 31 | - if (instdirlen > 0 && in_force(FORCE_SCRIPT_CHROOTLESS)) |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 32 | - changedir = instdir; |
| 33 | - else |
| 34 | - changedir = "/"; |
| 35 | - |
Brad Bishop | 96ff198 | 2019-08-19 13:50:42 -0400 | [diff] [blame] | 36 | - if (instdirlen > 0 && !in_force(FORCE_SCRIPT_CHROOTLESS)) { |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 37 | - int rc; |
| 38 | - |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 39 | - if (strncmp(admindir, instdir, instdirlen) != 0) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 40 | - ohshit(_("admindir must be inside instdir for dpkg to work properly")); |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 41 | - if (setenv("DPKG_ADMINDIR", admindir + instdirlen, 1) < 0) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 42 | - ohshite(_("unable to setenv for subprocesses")); |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 43 | - if (setenv("DPKG_ROOT", "", 1) < 0) |
| 44 | - ohshite(_("unable to setenv for subprocesses")); |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 45 | - |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 46 | - rc = chroot(instdir); |
Brad Bishop | 96ff198 | 2019-08-19 13:50:42 -0400 | [diff] [blame] | 47 | - if (rc && in_force(FORCE_NON_ROOT) && errno == EPERM) |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 48 | - ohshit(_("not enough privileges to change root " |
| 49 | - "directory with --force-not-root, consider " |
| 50 | - "using --force-script-chrootless?")); |
| 51 | - else if (rc) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 52 | - ohshite(_("failed to chroot to '%.250s'"), instdir); |
Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame] | 53 | - } |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 54 | - /* Switch to a known good directory to give the maintainer script |
| 55 | - * a saner environment, also needed after the chroot(). */ |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 56 | - if (chdir(changedir)) |
| 57 | - ohshite(_("failed to chdir to '%.255s'"), changedir); |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 58 | - if (debug_has_flag(dbg_scripts)) { |
| 59 | - struct varbuf args = VARBUF_INIT; |
| 60 | - const char **argv = cmd->argv; |
| 61 | - |
| 62 | - while (*++argv) { |
| 63 | - varbuf_add_char(&args, ' '); |
| 64 | - varbuf_add_str(&args, *argv); |
| 65 | - } |
| 66 | - varbuf_end_str(&args); |
| 67 | - debug(dbg_scripts, "fork/exec %s (%s )", cmd->filename, |
| 68 | - args.buf); |
| 69 | - varbuf_destroy(&args); |
Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame] | 70 | + if (*instdir) { |
| 71 | + setenv("D", instdir, 1); |
| 72 | } |
Brad Bishop | 96ff198 | 2019-08-19 13:50:42 -0400 | [diff] [blame] | 73 | - if (instdirlen == 0 || in_force(FORCE_SCRIPT_CHROOTLESS)) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 74 | - return cmd->filename; |
| 75 | - |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 76 | - if (strlen(cmd->filename) < instdirlen) |
| 77 | - internerr("maintscript name '%s' length < instdir length %zd", |
| 78 | - cmd->filename, instdirlen); |
Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame] | 79 | - |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 80 | - return cmd->filename + instdirlen; |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 81 | + return cmd->filename; |
| 82 | } |
| 83 | |
| 84 | /** |