mirror of
https://github.com/dockur/windows.git
synced 2026-08-05 21:47:16 +01:00
Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 32d887c741 | |||
| 8a009b6891 | |||
| 3aab9e97b5 |
+1
-1
@@ -291,7 +291,7 @@ getLanguage() {
|
|||||||
lang="Polish"
|
lang="Polish"
|
||||||
culture="pl-PL" ;;
|
culture="pl-PL" ;;
|
||||||
"br" | "pt" | "pt-br" | "portuguese" | "português" | "portugues" )
|
"br" | "pt" | "pt-br" | "portuguese" | "português" | "portugues" )
|
||||||
[[ "$input" != "pt-br" ]] && id="pt-br"
|
[[ "$input" == "pt-br" ]] || id="pt-br"
|
||||||
short="pt"
|
short="pt"
|
||||||
lang="Brazilian Portuguese"
|
lang="Brazilian Portuguese"
|
||||||
desc="Portuguese"
|
desc="Portuguese"
|
||||||
|
|||||||
+3
-3
@@ -274,7 +274,7 @@ startInstall() {
|
|||||||
|
|
||||||
skipInstall "$BOOT" "$previousBase" && return 1
|
skipInstall "$BOOT" "$previousBase" && return 1
|
||||||
|
|
||||||
if [ -z "$previousBase" ] && hasDisk; then
|
if [ -z "$previousBase" ] && hasData; then
|
||||||
if ! backupPrevious ""; then
|
if ! backupPrevious ""; then
|
||||||
warn "the backup was incomplete, continuing with installation..."
|
warn "the backup was incomplete, continuing with installation..."
|
||||||
fi
|
fi
|
||||||
@@ -418,7 +418,7 @@ skipInstall() {
|
|||||||
# existing installation, but discard stale media when no disk exists yet.
|
# existing installation, but discard stale media when no disk exists yet.
|
||||||
if [[ "${STORAGE,,}/${previousBase,,}" != "${iso,,}" ]]; then
|
if [[ "${STORAGE,,}/${previousBase,,}" != "${iso,,}" ]]; then
|
||||||
|
|
||||||
if ! hasDisk; then
|
if ! hasData; then
|
||||||
|
|
||||||
if ! rm -f -- "$STORAGE/$previousBase"; then
|
if ! rm -f -- "$STORAGE/$previousBase"; then
|
||||||
error "Failed to remove ISO file \"$STORAGE/$previousBase\" !"
|
error "Failed to remove ISO file \"$STORAGE/$previousBase\" !"
|
||||||
@@ -538,7 +538,7 @@ findFile() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -d "$dir" ]; then
|
if [ -d "$dir" ]; then
|
||||||
if ! hasData || [ ! -f "$boot" ]; then
|
if ! hasDisk || [ ! -f "$boot" ]; then
|
||||||
error "The bind $dir maps to a file that does not exist!" && return 1
|
error "The bind $dir maps to a file that does not exist!" && return 1
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|||||||
+4
-3
@@ -483,7 +483,7 @@ gracefulShutdown() {
|
|||||||
|
|
||||||
code=$(signalCode "$sig")
|
code=$(signalCode "$sig")
|
||||||
|
|
||||||
if [ -f "$QEMU_END" ]; then
|
if (( SHUTDOWN_SIGNAL != 0 )); then
|
||||||
|
|
||||||
# A second Ctrl-C during an active shutdown skips the remaining grace period
|
# A second Ctrl-C during an active shutdown skips the remaining grace period
|
||||||
# and lets the shutdown loop force QEMU down immediately.
|
# and lets the shutdown loop force QEMU down immediately.
|
||||||
@@ -497,12 +497,13 @@ gracefulShutdown() {
|
|||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
SHUTDOWN_SIGNAL=$code
|
||||||
|
|
||||||
# Signal handlers must complete their own error handling and cleanup without
|
# Signal handlers must complete their own error handling and cleanup without
|
||||||
# errexit terminating the shell partway through the shutdown sequence.
|
# errexit terminating the shell partway through the shutdown sequence.
|
||||||
set +e
|
set +e
|
||||||
SHUTDOWN_SIGNAL=$code
|
|
||||||
|
|
||||||
touch "$QEMU_END"
|
touch "$QEMU_END"
|
||||||
|
|
||||||
echo && info "Received $sig signal, sending ACPI shutdown signal..."
|
echo && info "Received $sig signal, sending ACPI shutdown signal..."
|
||||||
|
|
||||||
# Interactive startup may receive a signal before the PID file appears, so
|
# Interactive startup may receive a signal before the PID file appears, so
|
||||||
|
|||||||
Reference in New Issue
Block a user