mirror of
https://github.com/dockur/windows.git
synced 2025-10-26 19:05:49 +00:00
Compare commits
No commits in common. "b244fa544fbe3a8ae1af566b8afecbf279ed4497" and "10449a3d2968ae07db4567bae5e2f4fe29689829" have entirely different histories.
b244fa544f
...
10449a3d29
27 changed files with 97 additions and 179 deletions
|
|
@ -3,18 +3,17 @@
|
|||
"service": "windows",
|
||||
"containerEnv": {
|
||||
"VERSION": "11e"
|
||||
},
|
||||
},
|
||||
"forwardPorts": [8006],
|
||||
"portsAttributes": {
|
||||
"8006": {
|
||||
"label": "Web",
|
||||
"onAutoForward": "notify"
|
||||
"onAutoForward": "openBrowser"
|
||||
}
|
||||
},
|
||||
"otherPortsAttributes": {
|
||||
"onAutoForward": "ignore"
|
||||
},
|
||||
"dockerComposeFile": "../codespaces.yml",
|
||||
"workspaceFolder": "/workspaces/windows",
|
||||
"initializeCommand": "docker system prune --all --force"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,18 +3,17 @@
|
|||
"service": "windows",
|
||||
"containerEnv": {
|
||||
"VERSION": "11l"
|
||||
},
|
||||
},
|
||||
"forwardPorts": [8006],
|
||||
"portsAttributes": {
|
||||
"8006": {
|
||||
"label": "Web",
|
||||
"onAutoForward": "notify"
|
||||
"onAutoForward": "openBrowser"
|
||||
}
|
||||
},
|
||||
"otherPortsAttributes": {
|
||||
"onAutoForward": "ignore"
|
||||
},
|
||||
"dockerComposeFile": "../codespaces.yml",
|
||||
"workspaceFolder": "/workspaces/windows",
|
||||
"initializeCommand": "docker system prune --all --force"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,18 +3,17 @@
|
|||
"service": "windows",
|
||||
"containerEnv": {
|
||||
"VERSION": "10"
|
||||
},
|
||||
},
|
||||
"forwardPorts": [8006],
|
||||
"portsAttributes": {
|
||||
"8006": {
|
||||
"label": "Web",
|
||||
"onAutoForward": "notify"
|
||||
"onAutoForward": "openBrowser"
|
||||
}
|
||||
},
|
||||
"otherPortsAttributes": {
|
||||
"onAutoForward": "ignore"
|
||||
},
|
||||
"dockerComposeFile": "../codespaces.yml",
|
||||
"workspaceFolder": "/workspaces/windows",
|
||||
"initializeCommand": "docker system prune --all --force"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,18 +3,17 @@
|
|||
"service": "windows",
|
||||
"containerEnv": {
|
||||
"VERSION": "10e"
|
||||
},
|
||||
},
|
||||
"forwardPorts": [8006],
|
||||
"portsAttributes": {
|
||||
"8006": {
|
||||
"label": "Web",
|
||||
"onAutoForward": "notify"
|
||||
"onAutoForward": "openBrowser"
|
||||
}
|
||||
},
|
||||
"otherPortsAttributes": {
|
||||
"onAutoForward": "ignore"
|
||||
},
|
||||
"dockerComposeFile": "../codespaces.yml",
|
||||
"workspaceFolder": "/workspaces/windows",
|
||||
"initializeCommand": "docker system prune --all --force"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,18 +3,17 @@
|
|||
"service": "windows",
|
||||
"containerEnv": {
|
||||
"VERSION": "10l"
|
||||
},
|
||||
},
|
||||
"forwardPorts": [8006],
|
||||
"portsAttributes": {
|
||||
"8006": {
|
||||
"label": "Web",
|
||||
"onAutoForward": "notify"
|
||||
"onAutoForward": "openBrowser"
|
||||
}
|
||||
},
|
||||
"otherPortsAttributes": {
|
||||
"onAutoForward": "ignore"
|
||||
},
|
||||
"dockerComposeFile": "../codespaces.yml",
|
||||
"workspaceFolder": "/workspaces/windows",
|
||||
"initializeCommand": "docker system prune --all --force"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,18 +3,17 @@
|
|||
"service": "windows",
|
||||
"containerEnv": {
|
||||
"VERSION": "8e"
|
||||
},
|
||||
"forwardPorts": [8006],
|
||||
},
|
||||
"forwardPorts": [8006],
|
||||
"portsAttributes": {
|
||||
"8006": {
|
||||
"label": "Web",
|
||||
"onAutoForward": "notify"
|
||||
"onAutoForward": "openBrowser"
|
||||
}
|
||||
},
|
||||
"otherPortsAttributes": {
|
||||
"onAutoForward": "ignore"
|
||||
},
|
||||
"dockerComposeFile": "../codespaces.yml",
|
||||
"workspaceFolder": "/workspaces/windows",
|
||||
"initializeCommand": "docker system prune --all --force"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,18 +3,17 @@
|
|||
"service": "windows",
|
||||
"containerEnv": {
|
||||
"VERSION": "7u"
|
||||
},
|
||||
"forwardPorts": [8006],
|
||||
},
|
||||
"forwardPorts": [8006],
|
||||
"portsAttributes": {
|
||||
"8006": {
|
||||
"label": "Web",
|
||||
"onAutoForward": "notify"
|
||||
"onAutoForward": "openBrowser"
|
||||
}
|
||||
},
|
||||
"otherPortsAttributes": {
|
||||
"onAutoForward": "ignore"
|
||||
},
|
||||
"dockerComposeFile": "../codespaces.yml",
|
||||
"workspaceFolder": "/workspaces/windows",
|
||||
"initializeCommand": "docker system prune --all --force"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,18 +3,17 @@
|
|||
"service": "windows",
|
||||
"containerEnv": {
|
||||
"VERSION": "vu"
|
||||
},
|
||||
"forwardPorts": [8006],
|
||||
},
|
||||
"forwardPorts": [8006],
|
||||
"portsAttributes": {
|
||||
"8006": {
|
||||
"label": "Web",
|
||||
"onAutoForward": "notify"
|
||||
"onAutoForward": "openBrowser"
|
||||
}
|
||||
},
|
||||
"otherPortsAttributes": {
|
||||
"onAutoForward": "ignore"
|
||||
},
|
||||
"dockerComposeFile": "../codespaces.yml",
|
||||
"workspaceFolder": "/workspaces/windows",
|
||||
"initializeCommand": "docker system prune --all --force"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,18 +3,17 @@
|
|||
"service": "windows",
|
||||
"containerEnv": {
|
||||
"VERSION": "xp"
|
||||
},
|
||||
"forwardPorts": [8006],
|
||||
},
|
||||
"forwardPorts": [8006],
|
||||
"portsAttributes": {
|
||||
"8006": {
|
||||
"label": "Web",
|
||||
"onAutoForward": "notify"
|
||||
"onAutoForward": "openBrowser"
|
||||
}
|
||||
},
|
||||
"otherPortsAttributes": {
|
||||
"onAutoForward": "ignore"
|
||||
},
|
||||
"dockerComposeFile": "../codespaces.yml",
|
||||
"workspaceFolder": "/workspaces/windows",
|
||||
"initializeCommand": "docker system prune --all --force"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,18 +3,17 @@
|
|||
"service": "windows",
|
||||
"containerEnv": {
|
||||
"VERSION": "2k"
|
||||
},
|
||||
"forwardPorts": [8006],
|
||||
},
|
||||
"forwardPorts": [8006],
|
||||
"portsAttributes": {
|
||||
"8006": {
|
||||
"label": "Web",
|
||||
"onAutoForward": "notify"
|
||||
"onAutoForward": "openBrowser"
|
||||
}
|
||||
},
|
||||
"otherPortsAttributes": {
|
||||
"onAutoForward": "ignore"
|
||||
},
|
||||
"dockerComposeFile": "../codespaces.yml",
|
||||
"workspaceFolder": "/workspaces/windows",
|
||||
"initializeCommand": "docker system prune --all --force"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,18 +3,17 @@
|
|||
"service": "windows",
|
||||
"containerEnv": {
|
||||
"VERSION": "2025"
|
||||
},
|
||||
"forwardPorts": [8006],
|
||||
},
|
||||
"forwardPorts": [8006],
|
||||
"portsAttributes": {
|
||||
"8006": {
|
||||
"label": "Web",
|
||||
"onAutoForward": "notify"
|
||||
"onAutoForward": "openBrowser"
|
||||
}
|
||||
},
|
||||
"otherPortsAttributes": {
|
||||
"onAutoForward": "ignore"
|
||||
},
|
||||
"dockerComposeFile": "../codespaces.yml",
|
||||
"workspaceFolder": "/workspaces/windows",
|
||||
"initializeCommand": "docker system prune --all --force"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,18 +3,17 @@
|
|||
"service": "windows",
|
||||
"containerEnv": {
|
||||
"VERSION": "2022"
|
||||
},
|
||||
"forwardPorts": [8006],
|
||||
},
|
||||
"forwardPorts": [8006],
|
||||
"portsAttributes": {
|
||||
"8006": {
|
||||
"label": "Web",
|
||||
"onAutoForward": "notify"
|
||||
"onAutoForward": "openBrowser"
|
||||
}
|
||||
},
|
||||
"otherPortsAttributes": {
|
||||
"onAutoForward": "ignore"
|
||||
},
|
||||
"dockerComposeFile": "../codespaces.yml",
|
||||
"workspaceFolder": "/workspaces/windows",
|
||||
"initializeCommand": "docker system prune --all --force"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,18 +3,17 @@
|
|||
"service": "windows",
|
||||
"containerEnv": {
|
||||
"VERSION": "2019"
|
||||
},
|
||||
"forwardPorts": [8006],
|
||||
},
|
||||
"forwardPorts": [8006],
|
||||
"portsAttributes": {
|
||||
"8006": {
|
||||
"label": "Web",
|
||||
"onAutoForward": "notify"
|
||||
"onAutoForward": "openBrowser"
|
||||
}
|
||||
},
|
||||
"otherPortsAttributes": {
|
||||
"onAutoForward": "ignore"
|
||||
},
|
||||
"dockerComposeFile": "../codespaces.yml",
|
||||
"workspaceFolder": "/workspaces/windows",
|
||||
"initializeCommand": "docker system prune --all --force"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,18 +3,17 @@
|
|||
"service": "windows",
|
||||
"containerEnv": {
|
||||
"VERSION": "2016"
|
||||
},
|
||||
"forwardPorts": [8006],
|
||||
},
|
||||
"forwardPorts": [8006],
|
||||
"portsAttributes": {
|
||||
"8006": {
|
||||
"label": "Web",
|
||||
"onAutoForward": "notify"
|
||||
"onAutoForward": "openBrowser"
|
||||
}
|
||||
},
|
||||
"otherPortsAttributes": {
|
||||
"onAutoForward": "ignore"
|
||||
},
|
||||
"dockerComposeFile": "../codespaces.yml",
|
||||
"workspaceFolder": "/workspaces/windows",
|
||||
"initializeCommand": "docker system prune --all --force"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,18 +3,17 @@
|
|||
"service": "windows",
|
||||
"containerEnv": {
|
||||
"VERSION": "2012"
|
||||
},
|
||||
"forwardPorts": [8006],
|
||||
},
|
||||
"forwardPorts": [8006],
|
||||
"portsAttributes": {
|
||||
"8006": {
|
||||
"label": "Web",
|
||||
"onAutoForward": "notify"
|
||||
"onAutoForward": "openBrowser"
|
||||
}
|
||||
},
|
||||
"otherPortsAttributes": {
|
||||
"onAutoForward": "ignore"
|
||||
},
|
||||
"dockerComposeFile": "../codespaces.yml",
|
||||
"workspaceFolder": "/workspaces/windows",
|
||||
"initializeCommand": "docker system prune --all --force"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,18 +3,17 @@
|
|||
"service": "windows",
|
||||
"containerEnv": {
|
||||
"VERSION": "2008"
|
||||
},
|
||||
"forwardPorts": [8006],
|
||||
},
|
||||
"forwardPorts": [8006],
|
||||
"portsAttributes": {
|
||||
"8006": {
|
||||
"label": "Web",
|
||||
"onAutoForward": "notify"
|
||||
"onAutoForward": "openBrowser"
|
||||
}
|
||||
},
|
||||
"otherPortsAttributes": {
|
||||
"onAutoForward": "ignore"
|
||||
},
|
||||
"dockerComposeFile": "../codespaces.yml",
|
||||
"workspaceFolder": "/workspaces/windows",
|
||||
"initializeCommand": "docker system prune --all --force"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,18 +3,17 @@
|
|||
"service": "windows",
|
||||
"containerEnv": {
|
||||
"VERSION": "2003"
|
||||
},
|
||||
"forwardPorts": [8006],
|
||||
},
|
||||
"forwardPorts": [8006],
|
||||
"portsAttributes": {
|
||||
"8006": {
|
||||
"label": "Web",
|
||||
"onAutoForward": "notify"
|
||||
"onAutoForward": "openBrowser"
|
||||
}
|
||||
},
|
||||
"otherPortsAttributes": {
|
||||
"onAutoForward": "ignore"
|
||||
},
|
||||
"dockerComposeFile": "../codespaces.yml",
|
||||
"workspaceFolder": "/workspaces/windows",
|
||||
"initializeCommand": "docker system prune --all --force"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,18 +3,17 @@
|
|||
"service": "windows",
|
||||
"containerEnv": {
|
||||
"VERSION": "tiny11"
|
||||
},
|
||||
"forwardPorts": [8006],
|
||||
},
|
||||
"forwardPorts": [8006],
|
||||
"portsAttributes": {
|
||||
"8006": {
|
||||
"label": "Web",
|
||||
"onAutoForward": "notify"
|
||||
"onAutoForward": "openBrowser"
|
||||
}
|
||||
},
|
||||
"otherPortsAttributes": {
|
||||
"onAutoForward": "ignore"
|
||||
},
|
||||
"dockerComposeFile": "../codespaces.yml",
|
||||
"workspaceFolder": "/workspaces/windows",
|
||||
"initializeCommand": "docker system prune --all --force"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,18 +3,17 @@
|
|||
"service": "windows",
|
||||
"containerEnv": {
|
||||
"VERSION": "core11"
|
||||
},
|
||||
"forwardPorts": [8006],
|
||||
},
|
||||
"forwardPorts": [8006],
|
||||
"portsAttributes": {
|
||||
"8006": {
|
||||
"label": "Web",
|
||||
"onAutoForward": "notify"
|
||||
"onAutoForward": "openBrowser"
|
||||
}
|
||||
},
|
||||
"otherPortsAttributes": {
|
||||
"onAutoForward": "ignore"
|
||||
},
|
||||
"dockerComposeFile": "../codespaces.yml",
|
||||
"workspaceFolder": "/workspaces/windows",
|
||||
"initializeCommand": "docker system prune --all --force"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,18 +3,17 @@
|
|||
"service": "windows",
|
||||
"containerEnv": {
|
||||
"VERSION": "nano11"
|
||||
},
|
||||
"forwardPorts": [8006],
|
||||
},
|
||||
"forwardPorts": [8006],
|
||||
"portsAttributes": {
|
||||
"8006": {
|
||||
"label": "Web",
|
||||
"onAutoForward": "notify"
|
||||
"onAutoForward": "openBrowser"
|
||||
}
|
||||
},
|
||||
"otherPortsAttributes": {
|
||||
"onAutoForward": "ignore"
|
||||
},
|
||||
"dockerComposeFile": "../codespaces.yml",
|
||||
"workspaceFolder": "/workspaces/windows",
|
||||
"initializeCommand": "docker system prune --all --force"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,18 +3,17 @@
|
|||
"service": "windows",
|
||||
"containerEnv": {
|
||||
"VERSION": "tiny10"
|
||||
},
|
||||
"forwardPorts": [8006],
|
||||
},
|
||||
"forwardPorts": [8006],
|
||||
"portsAttributes": {
|
||||
"8006": {
|
||||
"label": "Web",
|
||||
"onAutoForward": "notify"
|
||||
"onAutoForward": "openBrowser"
|
||||
}
|
||||
},
|
||||
"otherPortsAttributes": {
|
||||
"onAutoForward": "ignore"
|
||||
},
|
||||
"dockerComposeFile": "../codespaces.yml",
|
||||
"workspaceFolder": "/workspaces/windows",
|
||||
"initializeCommand": "docker system prune --all --force"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
services:
|
||||
windows:
|
||||
image: dockurr/windows
|
||||
container_name: windows
|
||||
image: ghcr.io/dockur/windows
|
||||
environment:
|
||||
ALLOCATE: "Y"
|
||||
RAM_SIZE: "half"
|
||||
DISK_SIZE: "max"
|
||||
CPU_CORES: "max"
|
||||
|
|
|
|||
|
|
@ -8,13 +8,12 @@
|
|||
"portsAttributes": {
|
||||
"8006": {
|
||||
"label": "Web",
|
||||
"onAutoForward": "notify"
|
||||
"onAutoForward": "openBrowser"
|
||||
}
|
||||
},
|
||||
"otherPortsAttributes": {
|
||||
"onAutoForward": "ignore"
|
||||
},
|
||||
},
|
||||
"dockerComposeFile": "codespaces.yml",
|
||||
"workspaceFolder": "/workspaces/windows",
|
||||
"initializeCommand": "docker system prune --all --force"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
ARG VERSION_ARG="latest"
|
||||
FROM scratch AS build-amd64
|
||||
|
||||
COPY --from=qemux/qemu:7.26 / /
|
||||
COPY --from=qemux/qemu:7.25 / /
|
||||
|
||||
ARG TARGETARCH
|
||||
ARG DEBCONF_NOWARNINGS="yes"
|
||||
|
|
|
|||
|
|
@ -1108,14 +1108,14 @@ getLink4() {
|
|||
url="nano11_25h2/nano11%2025h2.iso"
|
||||
;;
|
||||
"core11" )
|
||||
size=3176654848
|
||||
sum="29c055fcfb7b089abd9e007e7abe4bb82c70a03aac9d65e56a38b87ab32d04d2"
|
||||
url="tiny11_25H2/tiny11core_25H2_Oct25.iso"
|
||||
size=2159738880
|
||||
sum="78f0f44444ff95b97125b43e560a72e0d6ce0a665cf9f5573bf268191e5510c1"
|
||||
url="tiny-11-core-x-64-beta-1/tiny11%20core%20x64%20beta%201.iso"
|
||||
;;
|
||||
"tiny11" )
|
||||
size=5514559488
|
||||
sum="92484f2b7f707e42383294402a9eabbadeaa5ede80ac633390ae7f3537e36275"
|
||||
url="tiny11_25H2/tiny11_25H2_Oct25.iso"
|
||||
size=3788177408
|
||||
sum="a028800a91addc35d8ae22dce7459b67330f7d69d2f11c70f53c0fdffa5b4280"
|
||||
url="tiny11-2311/tiny11%202311%20x64.iso"
|
||||
;;
|
||||
"tiny10" )
|
||||
size=3839819776
|
||||
|
|
@ -1123,9 +1123,9 @@ getLink4() {
|
|||
url="tiny-10-23-h2/tiny10%20x64%2023h2.iso"
|
||||
;;
|
||||
"win11x64" )
|
||||
size=7736125440
|
||||
sum="d141f6030fed50f75e2b03e1eb2e53646c4b21e5386047cb860af5223f102a32"
|
||||
url="W11x64_26200.6584/26200.6584.250915-1905.25h2_ge_release_svc_refresh_CLIENT_CONSUMER_x64FRE_en-us.iso"
|
||||
size=5819484160
|
||||
sum="b56b911bf18a2ceaeb3904d87e7c770bdf92d3099599d61ac2497b91bf190b11"
|
||||
url="windows-11-24h2-x64/Windows%2011%2024H2%20x64.iso"
|
||||
;;
|
||||
"win11x64-enterprise" | "win11x64-enterprise-eval" )
|
||||
size=6209064960
|
||||
|
|
|
|||
|
|
@ -339,12 +339,10 @@ extractESD() {
|
|||
local dir="$2"
|
||||
local version="$3"
|
||||
local desc="$4"
|
||||
local size size_gb sizes space space_gb
|
||||
local desc total total1 total2 total3 total4
|
||||
local imageIndex links links1 links2 links3 links4
|
||||
local size size_gb space space_gb desc
|
||||
|
||||
local msg="Extracting $desc bootdisk"
|
||||
info "$msg..." && html "$msg..."
|
||||
local msg="Extracting $desc bootdisk..."
|
||||
info "$msg" && html "$msg"
|
||||
|
||||
if [ "$(stat -c%s "$iso")" -lt 100000000 ]; then
|
||||
error "Invalid ESD file: Size is smaller than 100 MB" && return 1
|
||||
|
|
@ -353,7 +351,7 @@ extractESD() {
|
|||
rm -rf "$dir"
|
||||
mkdir -p "$dir"
|
||||
|
||||
size=9606127360
|
||||
size=16106127360
|
||||
size_gb=$(formatBytes "$size")
|
||||
space=$(df --output=avail -B 1 "$dir" | tail -n 1)
|
||||
space_gb=$(formatBytes "$space")
|
||||
|
|
@ -369,68 +367,40 @@ extractESD() {
|
|||
error "Cannot read the image count in ESD file!" && return 1
|
||||
fi
|
||||
|
||||
sizes=$(wimlib-imagex info "$iso" | grep "Total Bytes:")
|
||||
links=$(wimlib-imagex info "$iso" | grep "Hard Link Bytes:")
|
||||
|
||||
total1=$(awk "NR==1{ print; }" <<< "$sizes" | cut -d':' -f2 | sed 's/^ *//')
|
||||
links1=$(awk "NR==1{ print; }" <<< "$links" | cut -d':' -f2 | sed 's/^ *//')
|
||||
total=$(( total1 - links1 ))
|
||||
|
||||
total3=$(awk "NR==3{ print; }" <<< "$sizes" | cut -d':' -f2 | sed 's/^ *//')
|
||||
links3=$(awk "NR==3{ print; }" <<< "$links" | cut -d':' -f2 | sed 's/^ *//')
|
||||
total3=$(( total3 - links3 ))
|
||||
total3=$(( total3 + 60000000 ))
|
||||
|
||||
/run/progress.sh "$dir" "$total" "$msg ([P])..." &
|
||||
|
||||
imageIndex="1"
|
||||
wimlib-imagex apply "$iso" "$imageIndex" "$dir" --quiet 2>/dev/null || {
|
||||
wimlib-imagex apply "$iso" 1 "$dir" --quiet 2>/dev/null || {
|
||||
retVal=$?
|
||||
fKill "progress.sh"
|
||||
error "Extracting $desc bootdisk failed ($retVal)" && return 1
|
||||
error "Extracting $desc bootdisk failed" && return $retVal
|
||||
}
|
||||
|
||||
fKill "progress.sh"
|
||||
|
||||
local bootWimFile="$dir/sources/boot.wim"
|
||||
local installWimFile="$dir/sources/install.wim"
|
||||
|
||||
local msg="Extracting $desc environment"
|
||||
info "$msg..." && html "$msg..."
|
||||
local msg="Extracting $desc environment..."
|
||||
info "$msg" && html "$msg"
|
||||
|
||||
imageIndex="2"
|
||||
/run/progress.sh "$bootWimFile" "$total3" "$msg ([P])..." &
|
||||
|
||||
wimlib-imagex export "$iso" "$imageIndex" "$bootWimFile" --compress=none --quiet || {
|
||||
wimlib-imagex export "$iso" 2 "$bootWimFile" --compress=none --quiet || {
|
||||
retVal=$?
|
||||
fKill "progress.sh"
|
||||
error "Adding WinPE failed ($retVal)" && return 1
|
||||
error "Adding WinPE failed" && return ${retVal}
|
||||
}
|
||||
|
||||
local msg="Extracting $desc setup"
|
||||
info "$msg..."
|
||||
local msg="Extracting $desc setup..."
|
||||
info "$msg" && html "$msg"
|
||||
|
||||
imageIndex="3"
|
||||
/run/progress.sh "$bootWimFile" "$total3" "$msg ([P])..." &
|
||||
|
||||
wimlib-imagex export "$iso" "$imageIndex" "$bootWimFile" --compress=none --boot --quiet || {
|
||||
wimlib-imagex export "$iso" 3 "$bootWimFile" --compress=none --boot --quiet || {
|
||||
retVal=$?
|
||||
fKill "progress.sh"
|
||||
error "Adding Windows Setup failed ($retVal)" && return 1
|
||||
error "Adding Windows Setup failed" && return ${retVal}
|
||||
}
|
||||
|
||||
fKill "progress.sh"
|
||||
|
||||
if [[ "${PLATFORM,,}" == "x64" ]]; then
|
||||
LABEL="CCCOMA_X64FRE_EN-US_DV9"
|
||||
else
|
||||
LABEL="CPBA_A64FRE_EN-US_DV9"
|
||||
fi
|
||||
|
||||
local msg="Extracting $desc image"
|
||||
info "$msg..." && html "$msg..."
|
||||
local msg="Extracting $desc image..."
|
||||
info "$msg" && html "$msg"
|
||||
|
||||
local edition imageEdition
|
||||
local edition imageIndex imageEdition
|
||||
edition=$(getCatalog "$version" "name")
|
||||
|
||||
if [ -z "$edition" ]; then
|
||||
|
|
@ -438,27 +408,15 @@ extractESD() {
|
|||
fi
|
||||
|
||||
for (( imageIndex=4; imageIndex<=esdImageCount; imageIndex++ )); do
|
||||
|
||||
imageEdition=$(wimlib-imagex info "$iso" "$imageIndex" | grep '^Description:' | sed 's/Description:[ \t]*//')
|
||||
imageEdition=$(wimlib-imagex info "$iso" ${imageIndex} | grep '^Description:' | sed 's/Description:[ \t]*//')
|
||||
[[ "${imageEdition,,}" != "${edition,,}" ]] && continue
|
||||
|
||||
total4=$(du -sb "$iso" | cut -f1)
|
||||
total4=$(( total4 + 3000000 ))
|
||||
|
||||
/run/progress.sh "$installWimFile" "$total4" "$msg ([P])..." &
|
||||
|
||||
wimlib-imagex export "$iso" "$imageIndex" "$installWimFile" --compress=LZMS --chunk-size 128K --quiet || {
|
||||
wimlib-imagex export "$iso" ${imageIndex} "$installWimFile" --compress=LZMS --chunk-size 128K --quiet || {
|
||||
retVal=$?
|
||||
fKill "progress.sh"
|
||||
error "Addition of $imageIndex to the $desc image failed ($retVal)" && return 1
|
||||
error "Addition of $imageIndex to the $desc image failed" && return $retVal
|
||||
}
|
||||
|
||||
fKill "progress.sh"
|
||||
return 0
|
||||
|
||||
done
|
||||
|
||||
fKill "progress.sh"
|
||||
error "Failed to find product '$edition' in install.wim!" && return 1
|
||||
}
|
||||
|
||||
|
|
@ -482,8 +440,8 @@ extractImage() {
|
|||
return 1
|
||||
fi
|
||||
|
||||
local msg="Extracting $desc image"
|
||||
info "$msg..." && html "$msg..."
|
||||
local msg="Extracting $desc image..."
|
||||
info "$msg" && html "$msg"
|
||||
|
||||
rm -rf "$dir"
|
||||
mkdir -p "$dir"
|
||||
|
|
@ -502,15 +460,11 @@ extractImage() {
|
|||
fi
|
||||
|
||||
rm -rf "$dir"
|
||||
/run/progress.sh "$dir" "$size" "$msg ([P])..." &
|
||||
|
||||
if ! 7z x "$iso" -o"$dir" > /dev/null; then
|
||||
fKill "progress.sh"
|
||||
error "Failed to extract ISO file: $iso" && return 1
|
||||
fi
|
||||
|
||||
fKill "progress.sh"
|
||||
|
||||
if [[ "${UNPACK:-}" != [Yy1]* ]]; then
|
||||
|
||||
LABEL=$(isoinfo -d -i "$iso" | sed -n 's/Volume id: //p')
|
||||
|
|
@ -1123,8 +1077,8 @@ buildImage() {
|
|||
|
||||
desc=$(printVersion "$DETECTED" "ISO")
|
||||
|
||||
local msg="Building $desc image"
|
||||
info "$msg..." && html "$msg..."
|
||||
local msg="Building $desc image..."
|
||||
info "$msg" && html "$msg"
|
||||
|
||||
[ -z "$LABEL" ] && LABEL="Windows"
|
||||
|
||||
|
|
@ -1141,8 +1095,6 @@ buildImage() {
|
|||
error "Not enough free space in $STORAGE, have $space_gb available but need at least $size_gb." && return 1
|
||||
fi
|
||||
|
||||
/run/progress.sh "$out" "$size" "$msg ([P])..." &
|
||||
|
||||
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}" \
|
||||
|
|
@ -1163,8 +1115,6 @@ buildImage() {
|
|||
|
||||
fi
|
||||
|
||||
fKill "progress.sh"
|
||||
|
||||
if [ -n "$failed" ]; then
|
||||
[ -s "$log" ] && echo "$(<"$log")"
|
||||
error "Failed to build image!" && return 1
|
||||
|
|
|
|||
13
src/power.sh
13
src/power.sh
|
|
@ -74,7 +74,6 @@ ready() {
|
|||
finish() {
|
||||
|
||||
local pid
|
||||
local cnt=0
|
||||
local reason=$1
|
||||
|
||||
touch "$QEMU_END"
|
||||
|
|
@ -82,24 +81,14 @@ finish() {
|
|||
if [ -s "$QEMU_PID" ]; then
|
||||
|
||||
pid=$(<"$QEMU_PID")
|
||||
echo && error "Forcefully terminating Windows, reason: $reason..."
|
||||
error "Forcefully terminating Windows, reason: $reason..."
|
||||
{ kill -15 "$pid" || true; } 2>/dev/null
|
||||
|
||||
while isAlive "$pid"; do
|
||||
|
||||
sleep 1
|
||||
cnt=$((cnt+1))
|
||||
|
||||
# Workaround for zombie pid
|
||||
[ ! -s "$QEMU_PID" ] && break
|
||||
|
||||
if [ "$cnt" == "5" ]; then
|
||||
echo && error "QEMU did not terminate itself, forcefully killing process..."
|
||||
{ kill -9 "$pid" || true; } 2>/dev/null
|
||||
fi
|
||||
|
||||
done
|
||||
|
||||
fi
|
||||
|
||||
if [ ! -f "$STORAGE/windows.boot" ] && [ -f "$BOOT" ]; then
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue