Zengtudor/windows_in_docker
1
0
Fork 0
mirror of https://github.com/dockur/windows.git synced 2024-11-15 01:34:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: Store installation type (#476)

Browse Source
This commit is contained in:
Kroese 2024-05-09 15:47:46 +02:00 committed by GitHub
parent 8bbd87df40
commit 3b7e2373f7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/install.sh
View File

@ -33,8 +33,6 @@ startInstall() {
html "Starting Windows..." html "Starting Windows..."
[ -z "$MANUAL" ] && MANUAL="N"
if [ -n "$CUSTOM" ]; then if [ -n "$CUSTOM" ]; then
ISO="$CUSTOM" ISO="$CUSTOM"
@ -62,10 +60,13 @@ startInstall() {
if [ -f "$ISO" ] && [ -s "$ISO" ]; then if [ -f "$ISO" ] && [ -s "$ISO" ]; then
# Check if the ISO was already processed by our script # Check if the ISO was already processed by our script
local magic="" local magic
local byte="16"
[[ "$MANUAL" == [Yy1]* ]] && byte="17"
magic=$(dd if="$ISO" seek=0 bs=1 count=1 status=none | tr -d '\000') magic=$(dd if="$ISO" seek=0 bs=1 count=1 status=none | tr -d '\000')
magic="$(printf '%s' "$magic" | od -A n -t x1 -v | tr -d ' \n')" magic="$(printf '%s' "$magic" | od -A n -t x1 -v | tr -d ' \n')"
[[ "$magic" == "16" ]] && return 1
[[ "$magic" == "$byte" ]] && return 1
fi fi
@ -106,7 +107,9 @@ finishInstall() {
if [ -w "$iso" ] && [[ "$aborted" != [Yy1]* ]]; then if [ -w "$iso" ] && [[ "$aborted" != [Yy1]* ]]; then
# Mark ISO as prepared via magic byte # Mark ISO as prepared via magic byte
if ! printf '\x16' | dd of="$iso" bs=1 seek=0 count=1 conv=notrunc status=none; then local byte="\x16"
[[ "$MANUAL" == [Yy1]* ]] && byte="\x17"
if ! printf "$byte" | dd of="$iso" bs=1 seek=0 count=1 conv=notrunc status=none; then
error "Failed to set magic byte in ISO file: $iso" && return 1 error "Failed to set magic byte in ISO file: $iso" && return 1
fi fi
fi fi