nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-18 11:44:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
b83ed81c33
nixpkgs/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch

26 lines
755 B
Diff
Raw Normal View History

systemd: 246 -> 246.4 This bumps systemd to the latest stable maintenance release. - dc2e82af33 core: create per-user inaccessible node from the service manager - 0b3c497347 nspawn,pid1: pass "inaccessible" nodes from cntr mgr to pid1 payload via /run/host - 2239965c29 coredump: don't convert s → µs twice - 61d29b7f8c firstboot: fill empty color if ansi_color unavailable from os-release - 9678a3daf6 varlink: do not parse invalid messages twice - 4e516dcbc1 userdbctl: add forgotten --output mode in help - aee20dfbd8 shared/{user,group}-record-nss: adjust filtering of "valid" passwords - 5933d77afe doc: cross link sd_listen_fd() docs a bit - 97fdde3239 Rework how we cache mtime to figure out if units changed - 0500968241 core: always try to reload not-found unit - 8ae22f0d64 pid1: use the cache mtime not clock to "mark" load attempts - 715507c277 core: rename manager_unit_file_maybe_loadable_from_cache() - 20ad76d0a7 man: document fd ownership for sd-bus fd marshalling - 38ae73fafd resolved: make sure we initialize t->answer_errno before completing the transaction - a1ba0fbef6 homed: fix log message to honor real homework path - d6b1e659b3 src/shared/dissect-image.c: fix build without blkdid (#16901) - e42f9add21 analyze: fix error handling in one case - 4804ce1488 units: add missing usb-gadget.target - 5ad4e68c37 man: extend on the usec/sec discrepancy - 2fb612371d login/logind: Include sys/stat.h for struct stat usage - 5e884e7ee0 partition/makefs: Include missing sys/file.h header - 7bbc3807da network: dhcp6: logs only new address - 2056429e0f Don't run test-repart when loop devices are not available - dcbea51c5a man: clarify that several networkctl commands takes device names - 16e4cfcc82 networkctl: label command does not take any argument - 2352921244 missing: Add new Linux capability - 8b29c4a4f9 tty-ask-pw-agent: properly propagate error - f7ce2e9839 tty-ask-pw-agent: the message string might not be set - 29cba5c9ef tty-ask-pw-agent: make sure "--list" works correctly - e1ce367d73 add "list" verb to autocompleted commands - 1f4cb5da1e shell-completion/zsh: add missing verbs for networkctl - a4236a2764 path: Improve $PATH search directory case - b7cef386bd path: Skip directories when finalising $PATH search - 122945f315 rules: don't install 80-drivers.rules when kmod is disabled - 42fab2d454 zsh: correct journalctl command completion parsing - ed3f97f962 basic/missing_syscall: fix syscall numbers for arm64 :( - ba6e7f7c46 shared/install: fix preset operations for non-service instantiated units - d39f139348 nss-resolve: treat BUS_ERROR_NO_SUCH_UNIT the same as SD_BUS_ERROR_SERVICE_UNKNOWN too - 9bb3e64d71 various: treat BUS_ERROR_NO_SUCH_UNIT the same as SD_BUS_ERROR_SERVICE_UNKNOWN - 6d802dd596 man: drop reference to long gone .busname unit type - a29656804b man: fix a fix of a typo in systemd.service example - 21ce0f5b33 network: can: Fix CAN initialization - cab5cde8c9 man: update autogenerated dbus api lists - 0d8000522b man: fix invalid tag place - ea94f218be man: add conditionals to more man pages - ef91325349 meson: add ENABLE_ANALYZE conditional - 83f7c0a7ec core: add missing conditions/asserts to unit file parsing - 716718155d analyze: rework condition testing - 5c4c7581bc sd-bus: fix error handling on readv() - 6cd058f305 user-runtime-dir: deal gracefully with missing logind properties - 6a2d73638d shared/seccomp: do not use ifdef guards around textual syscall names - 7355ac9689 machine-id-setup: don't use KVM or container manager supplied uuid if in chroot env - 496a71f444 man: Fix typo in systemd-tmpfiles - 6c5d216ad8 homework: downgrade chattr failure log message - 1708f06a00 homework: explicitly close cryptsetup context, to not keep loopback device busy - a21eaa2a3a homework: correct error passed into log message - 3a2d169f36 homework: sync everything to disk before we rename LUKS loopback file into place - 84e1ab74d2 homed: downgrade quota message in containers - 8b62cadf36 analyze-security: do not assign badness to filtered-out syscalls - 29854a5437 NEWS: clarify two points - 4cb4fb82f7 meson: add min version for libfdisk - 76331f86f6 load-fragment: fix grammar in error messages - 1e53c2d70f Fix function description in logind man page - 669066564d network: do not fail if UseMTU=yes on DHCP lease lost - a2a3f16cdc missing_syscall: do not use function name that may conflict with glibc - 4091dcd469 missing_syscall: fix pidfd_{send_signal,open} numbers for alpha - 7875daf52b network: wait for previous address removal before configuring static addresses - 120064b4a1 network: only process non-error message - f44ec1de15 test: accept that char device 0/0 can now be created witout privileges - 946e4c43bb tools/make-man-index: fix purpose text that contains tags - dae0586e91 test-fs-util: skip encrypted path test if we get EACCES - 0d026c9b0d Newer Glibc use faccessat2 to implement faccessat - fde6520d46 namespace: fix minor memory leak - 208ba581f4 man: fix incorrectly placed full stop - 6c81d57828 man: fix typo - 53a8d2588e bless-boot: add missing verb to --help - 4cfa0ac4fd user-record: deal with invalid GECOS fields gracefully - ae5234ef48 user-util: add mangle_gecos() call for turning strings into fields suitable as GECOS fields - 972391ac39 fix typo in systemctl help - 443aacfcda man: clarify that LogNamespace= is for system services only - 5aec8fe54e _sd-common.h: avoid parsing errors with Coverity - f9ad4ea2ca analyze: fix 'cat-config systemd/zram-generator.conf' - dda6fec1df man: describe that changing Storage= does not move existing data - 2bbd33e476 core: reset bus error before reuse - b81504a3c7 nspawn: Fix incorrect usage of putenv - cb263973ac man: fix typo in systemd.service - 73b432e7ef network: fix DHCPv6 Prefix Delegation example after option rename
2020-09-10 13:12:51 +00:00
From 5098b1aad07356e04fcd12f2c77ea4fd17460411 Mon Sep 17 00:00:00 2001
systemd: switch from our own fork to upstream repo + local patches After patching, this produces exactly the same source code as in our custom fork, but having the actual patches inlined inside nixpkgs makes it easier to get rid of them. In case more complicated rebasing is necessary, maintainers can - Clone the upstream systemd/systemd[-stable] repo - Checkout the current rev mentioned in src - Apply the patches from this folder via `git am 00*.patch` - Rebase the repo on top of a new version - Export the patch series via `git format-patch $newVersion` - Update the patches = [ … ] attribute (if necessary)
2020-01-26 13:56:41 +00:00
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 1 May 2014 14:10:10 +0200
systemd: regenerate patches It seems nix is much more permissive in applying patches than git am. These patches were regenerated by running `git am path/to/nixpkgs/pkgs/os-specific/linux/systemd/*.patch`, and manually running `patch -p1 < path/to/nixpkgs/pkgs/os-specific/linux/systemd/*N.patch` where necessary.
2020-04-29 23:03:18 +00:00
Subject: [PATCH 04/18] Look for fsck in the right place
systemd: switch from our own fork to upstream repo + local patches After patching, this produces exactly the same source code as in our custom fork, but having the actual patches inlined inside nixpkgs makes it easier to get rid of them. In case more complicated rebasing is necessary, maintainers can - Clone the upstream systemd/systemd[-stable] repo - Checkout the current rev mentioned in src - Apply the patches from this folder via `git am 00*.patch` - Rebase the repo on top of a new version - Export the patch series via `git format-patch $newVersion` - Update the patches = [ … ] attribute (if necessary)
2020-01-26 13:56:41 +00:00
---
src/fsck/fsck.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
systemd: regenerate patches It seems nix is much more permissive in applying patches than git am. These patches were regenerated by running `git am path/to/nixpkgs/pkgs/os-specific/linux/systemd/*.patch`, and manually running `patch -p1 < path/to/nixpkgs/pkgs/os-specific/linux/systemd/*N.patch` where necessary.
2020-04-29 23:03:18 +00:00
index 80f7107b9d..74e48a385f 100644
systemd: switch from our own fork to upstream repo + local patches After patching, this produces exactly the same source code as in our custom fork, but having the actual patches inlined inside nixpkgs makes it easier to get rid of them. In case more complicated rebasing is necessary, maintainers can - Clone the upstream systemd/systemd[-stable] repo - Checkout the current rev mentioned in src - Apply the patches from this folder via `git am 00*.patch` - Rebase the repo on top of a new version - Export the patch series via `git format-patch $newVersion` - Update the patches = [ … ] attribute (if necessary)
2020-01-26 13:56:41 +00:00
--- a/src/fsck/fsck.c
+++ b/src/fsck/fsck.c
systemd: regenerate patches It seems nix is much more permissive in applying patches than git am. These patches were regenerated by running `git am path/to/nixpkgs/pkgs/os-specific/linux/systemd/*.patch`, and manually running `patch -p1 < path/to/nixpkgs/pkgs/os-specific/linux/systemd/*N.patch` where necessary.
2020-04-29 23:03:18 +00:00
@@ -370,7 +370,7 @@ static int run(int argc, char *argv[]) {
systemd: switch from our own fork to upstream repo + local patches After patching, this produces exactly the same source code as in our custom fork, but having the actual patches inlined inside nixpkgs makes it easier to get rid of them. In case more complicated rebasing is necessary, maintainers can - Clone the upstream systemd/systemd[-stable] repo - Checkout the current rev mentioned in src - Apply the patches from this folder via `git am 00*.patch` - Rebase the repo on top of a new version - Export the patch series via `git format-patch $newVersion` - Update the patches = [ … ] attribute (if necessary)
2020-01-26 13:56:41 +00:00
} else
dash_c[0] = 0;
- cmdline[i++] = "/sbin/fsck";
+ cmdline[i++] = "/run/current-system/sw/bin/fsck";
cmdline[i++] = arg_repair;
cmdline[i++] = "-T";
--
systemd: 246 -> 246.4 This bumps systemd to the latest stable maintenance release. - dc2e82af33 core: create per-user inaccessible node from the service manager - 0b3c497347 nspawn,pid1: pass "inaccessible" nodes from cntr mgr to pid1 payload via /run/host - 2239965c29 coredump: don't convert s → µs twice - 61d29b7f8c firstboot: fill empty color if ansi_color unavailable from os-release - 9678a3daf6 varlink: do not parse invalid messages twice - 4e516dcbc1 userdbctl: add forgotten --output mode in help - aee20dfbd8 shared/{user,group}-record-nss: adjust filtering of "valid" passwords - 5933d77afe doc: cross link sd_listen_fd() docs a bit - 97fdde3239 Rework how we cache mtime to figure out if units changed - 0500968241 core: always try to reload not-found unit - 8ae22f0d64 pid1: use the cache mtime not clock to "mark" load attempts - 715507c277 core: rename manager_unit_file_maybe_loadable_from_cache() - 20ad76d0a7 man: document fd ownership for sd-bus fd marshalling - 38ae73fafd resolved: make sure we initialize t->answer_errno before completing the transaction - a1ba0fbef6 homed: fix log message to honor real homework path - d6b1e659b3 src/shared/dissect-image.c: fix build without blkdid (#16901) - e42f9add21 analyze: fix error handling in one case - 4804ce1488 units: add missing usb-gadget.target - 5ad4e68c37 man: extend on the usec/sec discrepancy - 2fb612371d login/logind: Include sys/stat.h for struct stat usage - 5e884e7ee0 partition/makefs: Include missing sys/file.h header - 7bbc3807da network: dhcp6: logs only new address - 2056429e0f Don't run test-repart when loop devices are not available - dcbea51c5a man: clarify that several networkctl commands takes device names - 16e4cfcc82 networkctl: label command does not take any argument - 2352921244 missing: Add new Linux capability - 8b29c4a4f9 tty-ask-pw-agent: properly propagate error - f7ce2e9839 tty-ask-pw-agent: the message string might not be set - 29cba5c9ef tty-ask-pw-agent: make sure "--list" works correctly - e1ce367d73 add "list" verb to autocompleted commands - 1f4cb5da1e shell-completion/zsh: add missing verbs for networkctl - a4236a2764 path: Improve $PATH search directory case - b7cef386bd path: Skip directories when finalising $PATH search - 122945f315 rules: don't install 80-drivers.rules when kmod is disabled - 42fab2d454 zsh: correct journalctl command completion parsing - ed3f97f962 basic/missing_syscall: fix syscall numbers for arm64 :( - ba6e7f7c46 shared/install: fix preset operations for non-service instantiated units - d39f139348 nss-resolve: treat BUS_ERROR_NO_SUCH_UNIT the same as SD_BUS_ERROR_SERVICE_UNKNOWN too - 9bb3e64d71 various: treat BUS_ERROR_NO_SUCH_UNIT the same as SD_BUS_ERROR_SERVICE_UNKNOWN - 6d802dd596 man: drop reference to long gone .busname unit type - a29656804b man: fix a fix of a typo in systemd.service example - 21ce0f5b33 network: can: Fix CAN initialization - cab5cde8c9 man: update autogenerated dbus api lists - 0d8000522b man: fix invalid tag place - ea94f218be man: add conditionals to more man pages - ef91325349 meson: add ENABLE_ANALYZE conditional - 83f7c0a7ec core: add missing conditions/asserts to unit file parsing - 716718155d analyze: rework condition testing - 5c4c7581bc sd-bus: fix error handling on readv() - 6cd058f305 user-runtime-dir: deal gracefully with missing logind properties - 6a2d73638d shared/seccomp: do not use ifdef guards around textual syscall names - 7355ac9689 machine-id-setup: don't use KVM or container manager supplied uuid if in chroot env - 496a71f444 man: Fix typo in systemd-tmpfiles - 6c5d216ad8 homework: downgrade chattr failure log message - 1708f06a00 homework: explicitly close cryptsetup context, to not keep loopback device busy - a21eaa2a3a homework: correct error passed into log message - 3a2d169f36 homework: sync everything to disk before we rename LUKS loopback file into place - 84e1ab74d2 homed: downgrade quota message in containers - 8b62cadf36 analyze-security: do not assign badness to filtered-out syscalls - 29854a5437 NEWS: clarify two points - 4cb4fb82f7 meson: add min version for libfdisk - 76331f86f6 load-fragment: fix grammar in error messages - 1e53c2d70f Fix function description in logind man page - 669066564d network: do not fail if UseMTU=yes on DHCP lease lost - a2a3f16cdc missing_syscall: do not use function name that may conflict with glibc - 4091dcd469 missing_syscall: fix pidfd_{send_signal,open} numbers for alpha - 7875daf52b network: wait for previous address removal before configuring static addresses - 120064b4a1 network: only process non-error message - f44ec1de15 test: accept that char device 0/0 can now be created witout privileges - 946e4c43bb tools/make-man-index: fix purpose text that contains tags - dae0586e91 test-fs-util: skip encrypted path test if we get EACCES - 0d026c9b0d Newer Glibc use faccessat2 to implement faccessat - fde6520d46 namespace: fix minor memory leak - 208ba581f4 man: fix incorrectly placed full stop - 6c81d57828 man: fix typo - 53a8d2588e bless-boot: add missing verb to --help - 4cfa0ac4fd user-record: deal with invalid GECOS fields gracefully - ae5234ef48 user-util: add mangle_gecos() call for turning strings into fields suitable as GECOS fields - 972391ac39 fix typo in systemctl help - 443aacfcda man: clarify that LogNamespace= is for system services only - 5aec8fe54e _sd-common.h: avoid parsing errors with Coverity - f9ad4ea2ca analyze: fix 'cat-config systemd/zram-generator.conf' - dda6fec1df man: describe that changing Storage= does not move existing data - 2bbd33e476 core: reset bus error before reuse - b81504a3c7 nspawn: Fix incorrect usage of putenv - cb263973ac man: fix typo in systemd.service - 73b432e7ef network: fix DHCPv6 Prefix Delegation example after option rename
2020-09-10 13:12:51 +00:00
2.28.0
systemd: switch from our own fork to upstream repo + local patches After patching, this produces exactly the same source code as in our custom fork, but having the actual patches inlined inside nixpkgs makes it easier to get rid of them. In case more complicated rebasing is necessary, maintainers can - Clone the upstream systemd/systemd[-stable] repo - Checkout the current rev mentioned in src - Apply the patches from this folder via `git am 00*.patch` - Rebase the repo on top of a new version - Export the patch series via `git format-patch $newVersion` - Update the patches = [ … ] attribute (if necessary)
2020-01-26 13:56:41 +00:00
Reference in New Issue Copy Permalink