Use /mnt as mount directory

This commit is contained in:
Manuel Thalmann 2024-08-27 04:30:12 +02:00
parent e828cb1988
commit a9a90a64f9

View file

@ -16,6 +16,7 @@ begin
argparse --name (status filename) -x "iso,usb" "iso" "usb" "debug" -- $argv argparse --name (status filename) -x "iso,usb" "iso" "usb" "debug" -- $argv
or exit 1 or exit 1
set -l mountDir "/mnt"
set -l setupLabel "winiso-valhalla" set -l setupLabel "winiso-valhalla"
set -l projectPath "PortValhalla" set -l projectPath "PortValhalla"
set -l systemDrivePath "sources/\$OEM\$/\$1" set -l systemDrivePath "sources/\$OEM\$/\$1"
@ -23,9 +24,9 @@ begin
set -l localProjectPath "$systemDrivePath/$projectPath" set -l localProjectPath "$systemDrivePath/$projectPath"
set -l cacheDir ~/.cache/winiso-valhalla set -l cacheDir ~/.cache/winiso-valhalla
set -l winpe "$cacheDir/winpe.iso" set -l winpe "$cacheDir/winpe.iso"
set -l winPath "/media/win" set -l winPath "$mountDir/win"
set -l winpePath "/media/winpe" set -l winpePath "$mountDir/winpe"
set -l valhallaPath "/media/winiso-valhalla" set -l valhallaPath "$mountDir/winiso-valhalla"
set -l winpeOverlay (mktemp -d) set -l winpeOverlay (mktemp -d)
set -l winOverlay (mktemp -d) set -l winOverlay (mktemp -d)
set -l upperDir (mktemp -d) set -l upperDir (mktemp -d)
@ -228,8 +229,8 @@ begin
-output "$isoFile" \ -output "$isoFile" \
"$valhallaPath" "$valhallaPath"
else else
set -l bootPath "/media/boot" set -l bootPath "$mountDir/boot"
set -l dataPath "/media/data" set -l dataPath "$mountDir/data"
set -a mountPaths \ set -a mountPaths \
"$bootPath" \ "$bootPath" \