diff options
| author | Vladimír Čunát <vladimir.cunat@nic.cz> | 2022-09-27 08:20:58 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vladimir.cunat@nic.cz> | 2022-09-27 08:20:58 +0200 |
| commit | 85d3dce182f72a97f5f4c96a9f81b92979a194ed (patch) | |
| tree | a2204977b336c60cf969c099d027799b062e992c /nixos | |
| parent | 088eead34aa975dbd76c36d9a85c539d188551e0 (diff) | |
| parent | e2420ef939f2a5b83db62f837ca299ece557f60c (diff) | |
| download | nixlib-85d3dce182f72a97f5f4c96a9f81b92979a194ed.tar nixlib-85d3dce182f72a97f5f4c96a9f81b92979a194ed.tar.gz nixlib-85d3dce182f72a97f5f4c96a9f81b92979a194ed.tar.bz2 nixlib-85d3dce182f72a97f5f4c96a9f81b92979a194ed.tar.lz nixlib-85d3dce182f72a97f5f4c96a9f81b92979a194ed.tar.xz nixlib-85d3dce182f72a97f5f4c96a9f81b92979a194ed.tar.zst nixlib-85d3dce182f72a97f5f4c96a9f81b92979a194ed.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/system/boot/stage-1-init.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index 337064034efb..994aa0e33cbf 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -555,6 +555,9 @@ while read -u 3 mountPoint; do umount /tmp-iso rmdir /tmp-iso + if [ -n "$isoPath" ] && [ $fsType = "iso9660" ] && mountpoint -q /findiso; then + umount /findiso + fi continue fi |