From a31f7a97b1516650135bca967949f430158491e8 Mon Sep 17 00:00:00 2001 From: Irina Gómez Date: Mon, 21 Jan 2019 14:05:18 +0100 Subject: #802 #889 ogHidePartition and ogUnhidePartition: Add Windows and Windows Reserved Partitions. ogSaveImageInfo and ogRestoreUuidPartitions: Only save/restore GUID Partition Table. --- client/shared/scripts/bootOsCustom.template | 4 ++-- client/shared/scripts/configureOsCustom.template | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'client/shared') diff --git a/client/shared/scripts/bootOsCustom.template b/client/shared/scripts/bootOsCustom.template index b457fde4..06046526 100755 --- a/client/shared/scripts/bootOsCustom.template +++ b/client/shared/scripts/bootOsCustom.template @@ -50,11 +50,11 @@ case "$OSTYPE" in #echo "[40] Activar particion de Windows $PART y ocultar las demás." #for (( i=1; i<=$(ogGetPartitionsNumber $DISK); i++ )); do # if [ $i == $PART -o $i == $PARTDATA ]; then - # [ $(ogGetPartitionType $DISK $PART) == "HNTFS" ] && ogUnhidePartition $1 $PART + # [ $(ogGetPartitionType $DISK $PART) == "HNTFS" -o $(ogGetPartitionType $DISK $PART) == "WIN-RESERV" ] && ogUnhidePartition $1 $PART # # Activo la particion si no es de datos # [ $i -ne $PARTDATA ] && ogSetPartitionActive $DISK $i # else - # [ "$(ogGetPartitionType $DISK $i)" == NTFS ] && ogHidePartition $DISK $i + # [ "$(ogGetPartitionType $DISK $i)" == NTFS -o "$(ogGetPartitionType $DISK $i)" == "WINDOWS" ] && ogHidePartition $DISK $i # fi #done ;; diff --git a/client/shared/scripts/configureOsCustom.template b/client/shared/scripts/configureOsCustom.template index 66be3c63..920e6b3c 100644 --- a/client/shared/scripts/configureOsCustom.template +++ b/client/shared/scripts/configureOsCustom.template @@ -28,7 +28,7 @@ IMGNAME="$4" # Nombre canónico de imagen (sin extensión). # Nota: incluye llamada al script "configureOs" para realizar previamente una configuración estándar. # Configurarción típica. -configureOs "$1" "$2" +configureOs "$DISK" "$PART" "$REPO" "$IMGNAME" # Postconfiguración personalizada para cada tipo de sistema operativo. OSTYPE="$(ogGetOsType $1 $2)" case "$OSTYPE" in -- cgit v1.2.3-18-g5258