Merge pull request #97989 from flokli/systemd-246.5
systemd: 246.4 -> 246.6
This commit is contained in:
commit
2d92e695ba
@ -200,9 +200,7 @@ def main():
|
||||
else:
|
||||
# Update bootloader to latest if needed
|
||||
systemd_version = subprocess.check_output(["@systemd@/bin/bootctl", "--version"], universal_newlines=True).split()[1]
|
||||
# Ideally this should use check_output as well, but as a temporary
|
||||
# work-around for #97433 we ignore any errors.
|
||||
sdboot_status = subprocess.run(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "status"], universal_newlines=True, stdout=subprocess.PIPE).stdout
|
||||
sdboot_status = subprocess.check_output(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "status"], universal_newlines=True)
|
||||
|
||||
# See status_binaries() in systemd bootctl.c for code which generates this
|
||||
m = re.search("^\W+File:.*/EFI/(BOOT|systemd)/.*\.efi \(systemd-boot (\d+)\)$",
|
||||
|
@ -18,7 +18,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "246.4";
|
||||
version = "246.6";
|
||||
in stdenv.mkDerivation {
|
||||
inherit version;
|
||||
pname = "systemd";
|
||||
@ -29,7 +29,7 @@ in stdenv.mkDerivation {
|
||||
owner = "systemd";
|
||||
repo = "systemd-stable";
|
||||
rev = "v${version}";
|
||||
sha256 = "0ns12w55yv680p4l7f2i9il7scdph7hips68d9k8cyvxk2w9xg0x";
|
||||
sha256 = "1yhj2jlighqqpw1xk9q52f3pncjn47ipi224k35d6syb94q2b988";
|
||||
};
|
||||
|
||||
# If these need to be regenerated, `git am path/to/00*.patch` them into a
|
||||
|
Loading…
Reference in New Issue
Block a user