Skip to content

Commit

Permalink
Enable dot file globbing
Browse files Browse the repository at this point in the history
  • Loading branch information
prinzdezibel committed Dec 8, 2024
1 parent cc00e08 commit b86a278
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions nixos/lib/make-disk-image.nix
Original file line number Diff line number Diff line change
Expand Up @@ -400,9 +400,6 @@ let format' = format; in let
for ((i = 0; i < ''${#targets_[@]}; i++)); do
source="''${sources_[$i]}"
target="''${targets_[$i]}"
echo "source $source"
echo "target $root/$target"
echo "--"
mode="''${modes_[$i]}"
if [ -n "$mode" ]; then
Expand Down Expand Up @@ -448,7 +445,7 @@ let format' = format; in let
--system ${config.system.build.toplevel} \
${if copyChannel then "--channel ${channelSources}" else "--no-channel-copy"} \
--substituters ""
${lib.optionalString (additionalPaths' != []) ''
nix --extra-experimental-features nix-command copy --to $root --no-check-sigs ${lib.concatStringsSep " " additionalPaths'}
''}
Expand Down Expand Up @@ -520,6 +517,7 @@ let format' = format; in let
''}
echo "copying staging root to image..."
shopt -s dotglob
cptofs -p ${lib.optionalString (partitionTableType != "none") "-P ${rootPartition}"} \
-t ${fsType} \
-i $diskImage \
Expand Down Expand Up @@ -593,7 +591,7 @@ let format' = format; in let
mount -t tmpfs -o "mode=755" none $mountPoint/run
mkdir $mountPoint/run/current-system
ln -s ${config.system.build.etc}/etc $mountPoint/run/current-system/etc
# Create the ESP and mount it. Unlike e2fsprogs, mkfs.vfat doesn't support an
# '-E offset=X' option, so we can't do this outside the VM.
${lib.optionalString (partitionTableType == "efi" || partitionTableType == "hybrid") ''
Expand Down

0 comments on commit b86a278

Please sign in to comment.