commit 437f73dd546e1cbaaa9de576608bdfa0281659e3 · pyrox.dev/nixpkgs

pyrox.dev / nixpkgs

lol

nixos/systemd-boot: fix entry match condition in remove_old_entries

Before this patch, the entry match condition always fails, causing all
entries being removed. The error is not noticed because later they are
re-generated.

Lin Jian 3 years ago 437f73dd 64232393

options

unified split

Changed files

+2 -2

nixos

modules

system

boot

loader

systemd-boot

systemd-boot-builder.py

+2 -2

nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py

···

       185
       185
        
                   if rex_profile.match(path):

     

       186
       186
        
                       prof = rex_profile.sub(r"\1", path)

     

       187
       187
        
                   else:

     

       188
       188
       -
                       prof = "system"

     

       188
       188
       +
                       prof = None

     

       189
       189
        
                   gen_number = int(rex_generation.sub(r"\1", path))

     

       190
       190
       -
                   if not (prof, gen_number) in gens:

     

       190
       190
       +
                   if not (prof, gen_number, None) in gens:

     

       191
       191
        
                       os.unlink(path)

     

       192
       192
        
               except ValueError:

     

       193
       193
        
                   pass