pyrox.dev / nixpkgs
lol
fork atom

nixos/systemd-boot: correctly find gen_number for specialisation

Before this patch, the gen_number found by regex contains
"-specialisation-foo" if specialisation is used. As a result, applying
int() to gen_number raises ValueError, causing entries containing
a specialisation part not being removed.

Lin Jian 64232393 e16d04ed

options
unified split
Changed files
+1 -1
nixos
modules
system
boot
loader
systemd-boot
systemd-boot-builder.py
+1 -1
nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py 
···

       
175

       
175

       
 

       



     

       
176

       
176

       
 

       
def remove_old_entries(gens: List[SystemIdentifier]) -> None:


     

       
177

       
177

       
 

       
    rex_profile = re.compile("^@efiSysMountPoint@/loader/entries/nixos-(.*)-generation-.*\.conf$")


     

       
178

       

       
-

       
    rex_generation = re.compile("^@efiSysMountPoint@/loader/entries/nixos.*-generation-(.*)\.conf$")


     

       

       
178

       
+

       
    rex_generation = re.compile("^@efiSysMountPoint@/loader/entries/nixos.*-generation-([0-9]+)(-specialisation-.*)?\.conf$")


     

       
179

       
179

       
 

       
    known_paths = []


     

       
180

       
180

       
 

       
    for gen in gens:


     

       
181

       
181

       
 

       
        known_paths.append(copy_from_profile(*gen, "kernel", True))