mirror of
https://github.com/dockur/windows.git
synced 2025-11-03 13:55:08 +00:00
Compare commits
4 Commits
10449a3d29
...
5476760551
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5476760551 | ||
|
|
0caa4d76b8 | ||
|
|
4e0a29605b | ||
|
|
c3ba25bfb7 |
@ -8,12 +8,13 @@
|
|||||||
"portsAttributes": {
|
"portsAttributes": {
|
||||||
"8006": {
|
"8006": {
|
||||||
"label": "Web",
|
"label": "Web",
|
||||||
"onAutoForward": "openBrowser"
|
"onAutoForward": "notify"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"otherPortsAttributes": {
|
"otherPortsAttributes": {
|
||||||
"onAutoForward": "ignore"
|
"onAutoForward": "ignore"
|
||||||
},
|
},
|
||||||
"dockerComposeFile": "../codespaces.yml",
|
"dockerComposeFile": "../codespaces.yml",
|
||||||
|
"workspaceFolder": "/workspaces/windows",
|
||||||
"initializeCommand": "docker system prune --all --force"
|
"initializeCommand": "docker system prune --all --force"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -8,12 +8,13 @@
|
|||||||
"portsAttributes": {
|
"portsAttributes": {
|
||||||
"8006": {
|
"8006": {
|
||||||
"label": "Web",
|
"label": "Web",
|
||||||
"onAutoForward": "openBrowser"
|
"onAutoForward": "notify"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"otherPortsAttributes": {
|
"otherPortsAttributes": {
|
||||||
"onAutoForward": "ignore"
|
"onAutoForward": "ignore"
|
||||||
},
|
},
|
||||||
"dockerComposeFile": "../codespaces.yml",
|
"dockerComposeFile": "../codespaces.yml",
|
||||||
|
"workspaceFolder": "/workspaces/windows",
|
||||||
"initializeCommand": "docker system prune --all --force"
|
"initializeCommand": "docker system prune --all --force"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -8,12 +8,13 @@
|
|||||||
"portsAttributes": {
|
"portsAttributes": {
|
||||||
"8006": {
|
"8006": {
|
||||||
"label": "Web",
|
"label": "Web",
|
||||||
"onAutoForward": "openBrowser"
|
"onAutoForward": "notify"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"otherPortsAttributes": {
|
"otherPortsAttributes": {
|
||||||
"onAutoForward": "ignore"
|
"onAutoForward": "ignore"
|
||||||
},
|
},
|
||||||
"dockerComposeFile": "../codespaces.yml",
|
"dockerComposeFile": "../codespaces.yml",
|
||||||
|
"workspaceFolder": "/workspaces/windows",
|
||||||
"initializeCommand": "docker system prune --all --force"
|
"initializeCommand": "docker system prune --all --force"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -8,12 +8,13 @@
|
|||||||
"portsAttributes": {
|
"portsAttributes": {
|
||||||
"8006": {
|
"8006": {
|
||||||
"label": "Web",
|
"label": "Web",
|
||||||
"onAutoForward": "openBrowser"
|
"onAutoForward": "notify"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"otherPortsAttributes": {
|
"otherPortsAttributes": {
|
||||||
"onAutoForward": "ignore"
|
"onAutoForward": "ignore"
|
||||||
},
|
},
|
||||||
"dockerComposeFile": "../codespaces.yml",
|
"dockerComposeFile": "../codespaces.yml",
|
||||||
|
"workspaceFolder": "/workspaces/windows",
|
||||||
"initializeCommand": "docker system prune --all --force"
|
"initializeCommand": "docker system prune --all --force"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -8,12 +8,13 @@
|
|||||||
"portsAttributes": {
|
"portsAttributes": {
|
||||||
"8006": {
|
"8006": {
|
||||||
"label": "Web",
|
"label": "Web",
|
||||||
"onAutoForward": "openBrowser"
|
"onAutoForward": "notify"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"otherPortsAttributes": {
|
"otherPortsAttributes": {
|
||||||
"onAutoForward": "ignore"
|
"onAutoForward": "ignore"
|
||||||
},
|
},
|
||||||
"dockerComposeFile": "../codespaces.yml",
|
"dockerComposeFile": "../codespaces.yml",
|
||||||
|
"workspaceFolder": "/workspaces/windows",
|
||||||
"initializeCommand": "docker system prune --all --force"
|
"initializeCommand": "docker system prune --all --force"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -8,12 +8,13 @@
|
|||||||
"portsAttributes": {
|
"portsAttributes": {
|
||||||
"8006": {
|
"8006": {
|
||||||
"label": "Web",
|
"label": "Web",
|
||||||
"onAutoForward": "openBrowser"
|
"onAutoForward": "notify"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"otherPortsAttributes": {
|
"otherPortsAttributes": {
|
||||||
"onAutoForward": "ignore"
|
"onAutoForward": "ignore"
|
||||||
},
|
},
|
||||||
"dockerComposeFile": "../codespaces.yml",
|
"dockerComposeFile": "../codespaces.yml",
|
||||||
|
"workspaceFolder": "/workspaces/windows",
|
||||||
"initializeCommand": "docker system prune --all --force"
|
"initializeCommand": "docker system prune --all --force"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -8,12 +8,13 @@
|
|||||||
"portsAttributes": {
|
"portsAttributes": {
|
||||||
"8006": {
|
"8006": {
|
||||||
"label": "Web",
|
"label": "Web",
|
||||||
"onAutoForward": "openBrowser"
|
"onAutoForward": "notify"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"otherPortsAttributes": {
|
"otherPortsAttributes": {
|
||||||
"onAutoForward": "ignore"
|
"onAutoForward": "ignore"
|
||||||
},
|
},
|
||||||
"dockerComposeFile": "../codespaces.yml",
|
"dockerComposeFile": "../codespaces.yml",
|
||||||
|
"workspaceFolder": "/workspaces/windows",
|
||||||
"initializeCommand": "docker system prune --all --force"
|
"initializeCommand": "docker system prune --all --force"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -8,12 +8,13 @@
|
|||||||
"portsAttributes": {
|
"portsAttributes": {
|
||||||
"8006": {
|
"8006": {
|
||||||
"label": "Web",
|
"label": "Web",
|
||||||
"onAutoForward": "openBrowser"
|
"onAutoForward": "notify"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"otherPortsAttributes": {
|
"otherPortsAttributes": {
|
||||||
"onAutoForward": "ignore"
|
"onAutoForward": "ignore"
|
||||||
},
|
},
|
||||||
"dockerComposeFile": "../codespaces.yml",
|
"dockerComposeFile": "../codespaces.yml",
|
||||||
|
"workspaceFolder": "/workspaces/windows",
|
||||||
"initializeCommand": "docker system prune --all --force"
|
"initializeCommand": "docker system prune --all --force"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -8,12 +8,13 @@
|
|||||||
"portsAttributes": {
|
"portsAttributes": {
|
||||||
"8006": {
|
"8006": {
|
||||||
"label": "Web",
|
"label": "Web",
|
||||||
"onAutoForward": "openBrowser"
|
"onAutoForward": "notify"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"otherPortsAttributes": {
|
"otherPortsAttributes": {
|
||||||
"onAutoForward": "ignore"
|
"onAutoForward": "ignore"
|
||||||
},
|
},
|
||||||
"dockerComposeFile": "../codespaces.yml",
|
"dockerComposeFile": "../codespaces.yml",
|
||||||
|
"workspaceFolder": "/workspaces/windows",
|
||||||
"initializeCommand": "docker system prune --all --force"
|
"initializeCommand": "docker system prune --all --force"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -8,12 +8,13 @@
|
|||||||
"portsAttributes": {
|
"portsAttributes": {
|
||||||
"8006": {
|
"8006": {
|
||||||
"label": "Web",
|
"label": "Web",
|
||||||
"onAutoForward": "openBrowser"
|
"onAutoForward": "notify"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"otherPortsAttributes": {
|
"otherPortsAttributes": {
|
||||||
"onAutoForward": "ignore"
|
"onAutoForward": "ignore"
|
||||||
},
|
},
|
||||||
"dockerComposeFile": "../codespaces.yml",
|
"dockerComposeFile": "../codespaces.yml",
|
||||||
|
"workspaceFolder": "/workspaces/windows",
|
||||||
"initializeCommand": "docker system prune --all --force"
|
"initializeCommand": "docker system prune --all --force"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -8,12 +8,13 @@
|
|||||||
"portsAttributes": {
|
"portsAttributes": {
|
||||||
"8006": {
|
"8006": {
|
||||||
"label": "Web",
|
"label": "Web",
|
||||||
"onAutoForward": "openBrowser"
|
"onAutoForward": "notify"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"otherPortsAttributes": {
|
"otherPortsAttributes": {
|
||||||
"onAutoForward": "ignore"
|
"onAutoForward": "ignore"
|
||||||
},
|
},
|
||||||
"dockerComposeFile": "../codespaces.yml",
|
"dockerComposeFile": "../codespaces.yml",
|
||||||
|
"workspaceFolder": "/workspaces/windows",
|
||||||
"initializeCommand": "docker system prune --all --force"
|
"initializeCommand": "docker system prune --all --force"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -8,12 +8,13 @@
|
|||||||
"portsAttributes": {
|
"portsAttributes": {
|
||||||
"8006": {
|
"8006": {
|
||||||
"label": "Web",
|
"label": "Web",
|
||||||
"onAutoForward": "openBrowser"
|
"onAutoForward": "notify"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"otherPortsAttributes": {
|
"otherPortsAttributes": {
|
||||||
"onAutoForward": "ignore"
|
"onAutoForward": "ignore"
|
||||||
},
|
},
|
||||||
"dockerComposeFile": "../codespaces.yml",
|
"dockerComposeFile": "../codespaces.yml",
|
||||||
|
"workspaceFolder": "/workspaces/windows",
|
||||||
"initializeCommand": "docker system prune --all --force"
|
"initializeCommand": "docker system prune --all --force"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -8,12 +8,13 @@
|
|||||||
"portsAttributes": {
|
"portsAttributes": {
|
||||||
"8006": {
|
"8006": {
|
||||||
"label": "Web",
|
"label": "Web",
|
||||||
"onAutoForward": "openBrowser"
|
"onAutoForward": "notify"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"otherPortsAttributes": {
|
"otherPortsAttributes": {
|
||||||
"onAutoForward": "ignore"
|
"onAutoForward": "ignore"
|
||||||
},
|
},
|
||||||
"dockerComposeFile": "../codespaces.yml",
|
"dockerComposeFile": "../codespaces.yml",
|
||||||
|
"workspaceFolder": "/workspaces/windows",
|
||||||
"initializeCommand": "docker system prune --all --force"
|
"initializeCommand": "docker system prune --all --force"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -8,12 +8,13 @@
|
|||||||
"portsAttributes": {
|
"portsAttributes": {
|
||||||
"8006": {
|
"8006": {
|
||||||
"label": "Web",
|
"label": "Web",
|
||||||
"onAutoForward": "openBrowser"
|
"onAutoForward": "notify"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"otherPortsAttributes": {
|
"otherPortsAttributes": {
|
||||||
"onAutoForward": "ignore"
|
"onAutoForward": "ignore"
|
||||||
},
|
},
|
||||||
"dockerComposeFile": "../codespaces.yml",
|
"dockerComposeFile": "../codespaces.yml",
|
||||||
|
"workspaceFolder": "/workspaces/windows",
|
||||||
"initializeCommand": "docker system prune --all --force"
|
"initializeCommand": "docker system prune --all --force"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -8,12 +8,13 @@
|
|||||||
"portsAttributes": {
|
"portsAttributes": {
|
||||||
"8006": {
|
"8006": {
|
||||||
"label": "Web",
|
"label": "Web",
|
||||||
"onAutoForward": "openBrowser"
|
"onAutoForward": "notify"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"otherPortsAttributes": {
|
"otherPortsAttributes": {
|
||||||
"onAutoForward": "ignore"
|
"onAutoForward": "ignore"
|
||||||
},
|
},
|
||||||
"dockerComposeFile": "../codespaces.yml",
|
"dockerComposeFile": "../codespaces.yml",
|
||||||
|
"workspaceFolder": "/workspaces/windows",
|
||||||
"initializeCommand": "docker system prune --all --force"
|
"initializeCommand": "docker system prune --all --force"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -8,12 +8,13 @@
|
|||||||
"portsAttributes": {
|
"portsAttributes": {
|
||||||
"8006": {
|
"8006": {
|
||||||
"label": "Web",
|
"label": "Web",
|
||||||
"onAutoForward": "openBrowser"
|
"onAutoForward": "notify"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"otherPortsAttributes": {
|
"otherPortsAttributes": {
|
||||||
"onAutoForward": "ignore"
|
"onAutoForward": "ignore"
|
||||||
},
|
},
|
||||||
"dockerComposeFile": "../codespaces.yml",
|
"dockerComposeFile": "../codespaces.yml",
|
||||||
|
"workspaceFolder": "/workspaces/windows",
|
||||||
"initializeCommand": "docker system prune --all --force"
|
"initializeCommand": "docker system prune --all --force"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -8,12 +8,13 @@
|
|||||||
"portsAttributes": {
|
"portsAttributes": {
|
||||||
"8006": {
|
"8006": {
|
||||||
"label": "Web",
|
"label": "Web",
|
||||||
"onAutoForward": "openBrowser"
|
"onAutoForward": "notify"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"otherPortsAttributes": {
|
"otherPortsAttributes": {
|
||||||
"onAutoForward": "ignore"
|
"onAutoForward": "ignore"
|
||||||
},
|
},
|
||||||
"dockerComposeFile": "../codespaces.yml",
|
"dockerComposeFile": "../codespaces.yml",
|
||||||
|
"workspaceFolder": "/workspaces/windows",
|
||||||
"initializeCommand": "docker system prune --all --force"
|
"initializeCommand": "docker system prune --all --force"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -8,12 +8,13 @@
|
|||||||
"portsAttributes": {
|
"portsAttributes": {
|
||||||
"8006": {
|
"8006": {
|
||||||
"label": "Web",
|
"label": "Web",
|
||||||
"onAutoForward": "openBrowser"
|
"onAutoForward": "notify"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"otherPortsAttributes": {
|
"otherPortsAttributes": {
|
||||||
"onAutoForward": "ignore"
|
"onAutoForward": "ignore"
|
||||||
},
|
},
|
||||||
"dockerComposeFile": "../codespaces.yml",
|
"dockerComposeFile": "../codespaces.yml",
|
||||||
|
"workspaceFolder": "/workspaces/windows",
|
||||||
"initializeCommand": "docker system prune --all --force"
|
"initializeCommand": "docker system prune --all --force"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -8,12 +8,13 @@
|
|||||||
"portsAttributes": {
|
"portsAttributes": {
|
||||||
"8006": {
|
"8006": {
|
||||||
"label": "Web",
|
"label": "Web",
|
||||||
"onAutoForward": "openBrowser"
|
"onAutoForward": "notify"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"otherPortsAttributes": {
|
"otherPortsAttributes": {
|
||||||
"onAutoForward": "ignore"
|
"onAutoForward": "ignore"
|
||||||
},
|
},
|
||||||
"dockerComposeFile": "../codespaces.yml",
|
"dockerComposeFile": "../codespaces.yml",
|
||||||
|
"workspaceFolder": "/workspaces/windows",
|
||||||
"initializeCommand": "docker system prune --all --force"
|
"initializeCommand": "docker system prune --all --force"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -8,12 +8,13 @@
|
|||||||
"portsAttributes": {
|
"portsAttributes": {
|
||||||
"8006": {
|
"8006": {
|
||||||
"label": "Web",
|
"label": "Web",
|
||||||
"onAutoForward": "openBrowser"
|
"onAutoForward": "notify"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"otherPortsAttributes": {
|
"otherPortsAttributes": {
|
||||||
"onAutoForward": "ignore"
|
"onAutoForward": "ignore"
|
||||||
},
|
},
|
||||||
"dockerComposeFile": "../codespaces.yml",
|
"dockerComposeFile": "../codespaces.yml",
|
||||||
|
"workspaceFolder": "/workspaces/windows",
|
||||||
"initializeCommand": "docker system prune --all --force"
|
"initializeCommand": "docker system prune --all --force"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -8,12 +8,13 @@
|
|||||||
"portsAttributes": {
|
"portsAttributes": {
|
||||||
"8006": {
|
"8006": {
|
||||||
"label": "Web",
|
"label": "Web",
|
||||||
"onAutoForward": "openBrowser"
|
"onAutoForward": "notify"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"otherPortsAttributes": {
|
"otherPortsAttributes": {
|
||||||
"onAutoForward": "ignore"
|
"onAutoForward": "ignore"
|
||||||
},
|
},
|
||||||
"dockerComposeFile": "../codespaces.yml",
|
"dockerComposeFile": "../codespaces.yml",
|
||||||
|
"workspaceFolder": "/workspaces/windows",
|
||||||
"initializeCommand": "docker system prune --all --force"
|
"initializeCommand": "docker system prune --all --force"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,9 +1,8 @@
|
|||||||
services:
|
services:
|
||||||
windows:
|
windows:
|
||||||
image: dockurr/windows
|
|
||||||
container_name: windows
|
container_name: windows
|
||||||
|
image: ghcr.io/dockur/windows
|
||||||
environment:
|
environment:
|
||||||
ALLOCATE: "Y"
|
|
||||||
RAM_SIZE: "half"
|
RAM_SIZE: "half"
|
||||||
DISK_SIZE: "max"
|
DISK_SIZE: "max"
|
||||||
CPU_CORES: "max"
|
CPU_CORES: "max"
|
||||||
|
|||||||
@ -8,12 +8,13 @@
|
|||||||
"portsAttributes": {
|
"portsAttributes": {
|
||||||
"8006": {
|
"8006": {
|
||||||
"label": "Web",
|
"label": "Web",
|
||||||
"onAutoForward": "openBrowser"
|
"onAutoForward": "notify"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"otherPortsAttributes": {
|
"otherPortsAttributes": {
|
||||||
"onAutoForward": "ignore"
|
"onAutoForward": "ignore"
|
||||||
},
|
},
|
||||||
"dockerComposeFile": "codespaces.yml",
|
"dockerComposeFile": "codespaces.yml",
|
||||||
|
"workspaceFolder": "/workspaces/windows",
|
||||||
"initializeCommand": "docker system prune --all --force"
|
"initializeCommand": "docker system prune --all --force"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1108,14 +1108,14 @@ getLink4() {
|
|||||||
url="nano11_25h2/nano11%2025h2.iso"
|
url="nano11_25h2/nano11%2025h2.iso"
|
||||||
;;
|
;;
|
||||||
"core11" )
|
"core11" )
|
||||||
size=2159738880
|
size=3176654848
|
||||||
sum="78f0f44444ff95b97125b43e560a72e0d6ce0a665cf9f5573bf268191e5510c1"
|
sum="29c055fcfb7b089abd9e007e7abe4bb82c70a03aac9d65e56a38b87ab32d04d2"
|
||||||
url="tiny-11-core-x-64-beta-1/tiny11%20core%20x64%20beta%201.iso"
|
url="tiny11_25H2/tiny11core_25H2_Oct25.iso"
|
||||||
;;
|
;;
|
||||||
"tiny11" )
|
"tiny11" )
|
||||||
size=3788177408
|
size=5514559488
|
||||||
sum="a028800a91addc35d8ae22dce7459b67330f7d69d2f11c70f53c0fdffa5b4280"
|
sum="92484f2b7f707e42383294402a9eabbadeaa5ede80ac633390ae7f3537e36275"
|
||||||
url="tiny11-2311/tiny11%202311%20x64.iso"
|
url="tiny11_25H2/tiny11_25H2_Oct25.iso"
|
||||||
;;
|
;;
|
||||||
"tiny10" )
|
"tiny10" )
|
||||||
size=3839819776
|
size=3839819776
|
||||||
@ -1123,9 +1123,9 @@ getLink4() {
|
|||||||
url="tiny-10-23-h2/tiny10%20x64%2023h2.iso"
|
url="tiny-10-23-h2/tiny10%20x64%2023h2.iso"
|
||||||
;;
|
;;
|
||||||
"win11x64" )
|
"win11x64" )
|
||||||
size=5819484160
|
size=7736125440
|
||||||
sum="b56b911bf18a2ceaeb3904d87e7c770bdf92d3099599d61ac2497b91bf190b11"
|
sum="d141f6030fed50f75e2b03e1eb2e53646c4b21e5386047cb860af5223f102a32"
|
||||||
url="windows-11-24h2-x64/Windows%2011%2024H2%20x64.iso"
|
url="W11x64_26200.6584/26200.6584.250915-1905.25h2_ge_release_svc_refresh_CLIENT_CONSUMER_x64FRE_en-us.iso"
|
||||||
;;
|
;;
|
||||||
"win11x64-enterprise" | "win11x64-enterprise-eval" )
|
"win11x64-enterprise" | "win11x64-enterprise-eval" )
|
||||||
size=6209064960
|
size=6209064960
|
||||||
|
|||||||
@ -460,11 +460,15 @@ extractImage() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
rm -rf "$dir"
|
rm -rf "$dir"
|
||||||
|
/run/progress.sh "$dir" "$size" "$msg ([P])..." &
|
||||||
|
|
||||||
if ! 7z x "$iso" -o"$dir" > /dev/null; then
|
if ! 7z x "$iso" -o"$dir" > /dev/null; then
|
||||||
|
fKill "progress.sh"
|
||||||
error "Failed to extract ISO file: $iso" && return 1
|
error "Failed to extract ISO file: $iso" && return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
fKill "progress.sh"
|
||||||
|
|
||||||
if [[ "${UNPACK:-}" != [Yy1]* ]]; then
|
if [[ "${UNPACK:-}" != [Yy1]* ]]; then
|
||||||
|
|
||||||
LABEL=$(isoinfo -d -i "$iso" | sed -n 's/Volume id: //p')
|
LABEL=$(isoinfo -d -i "$iso" | sed -n 's/Volume id: //p')
|
||||||
@ -1095,6 +1099,8 @@ buildImage() {
|
|||||||
error "Not enough free space in $STORAGE, have $space_gb available but need at least $size_gb." && return 1
|
error "Not enough free space in $STORAGE, have $space_gb available but need at least $size_gb." && return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
/run/progress.sh "$out" "$size" "$msg ([P])..." &
|
||||||
|
|
||||||
if [[ "${BOOT_MODE,,}" != "windows_legacy" ]]; then
|
if [[ "${BOOT_MODE,,}" != "windows_legacy" ]]; then
|
||||||
|
|
||||||
genisoimage -o "$out" -b "$ETFS" -no-emul-boot -c "$cat" -iso-level 4 -J -l -D -N -joliet-long -relaxed-filenames -V "${LABEL::30}" \
|
genisoimage -o "$out" -b "$ETFS" -no-emul-boot -c "$cat" -iso-level 4 -J -l -D -N -joliet-long -relaxed-filenames -V "${LABEL::30}" \
|
||||||
@ -1115,6 +1121,8 @@ buildImage() {
|
|||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
fKill "progress.sh"
|
||||||
|
|
||||||
if [ -n "$failed" ]; then
|
if [ -n "$failed" ]; then
|
||||||
[ -s "$log" ] && echo "$(<"$log")"
|
[ -s "$log" ] && echo "$(<"$log")"
|
||||||
error "Failed to build image!" && return 1
|
error "Failed to build image!" && return 1
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user