pyrox.dev / nixpkgs
lol
fork atom

stage-1: escape mount points and options

mountFS adds these strings to fstab and then relies on `mount` parsing fstab. If
they have spaces or tabs in them, that would break fstab and therefore not mount
with the unhelpful error: No such file or directory.

Co-authored-by: Lily Foster <lily@lily.flowers>

Co-authored-by: Luflosi <Luflosi@users.noreply.github.com>

Atemu 753f883c 7e2aec07

options
unified split
Changed files
+9 -1
nixos
modules
system
boot
stage-1-init.sh
+9 -1
nixos/modules/system/boot/stage-1-init.sh 
···

       
342

       
342

       
 

       
    return 0


     

       
343

       
343

       
 

       
}


     

       
344

       
344

       
 

       



     

       

       
345

       
+

       
escapeFstab() {


     

       

       
346

       
+

       
    local original="$1"


     

       

       
347

       
+

       



     

       

       
348

       
+

       
    # Replace space


     

       

       
349

       
+

       
    local escaped="${original// /\\040}"


     

       

       
350

       
+

       
    # Replace tab


     

       

       
351

       
+

       
    echo "${escaped//$'\t'/\\011}"


     

       

       
352

       
+

       
}


     

       
345

       
353

       
 

       



     

       
346

       
354

       
 

       
# Function for mounting a file system.


     

       
347

       
355

       
 

       
mountFS() {


     
···

       
569

       
577

       
 

       
        continue


     

       
570

       
578

       
 

       
    fi


     

       
571

       
579

       
 

       



     

       
572

       

       
-

       
    mountFS "$device" "$mountPoint" "$options" "$fsType"


     

       

       
580

       
+

       
    mountFS "$device" "$(escapeFstab "$mountPoint")" "$(escapeFstab "$options")" "$fsType"


     

       
573

       
581

       
 

       
done


     

       
574

       
582

       
 

       



     

       
575

       
583

       
 

       
exec 3>&-