diff options
| author | ramon <ramongomez@us.es> | 2014-09-04 09:30:13 +0000 |
|---|---|---|
| committer | ramon <ramongomez@us.es> | 2014-09-04 09:30:13 +0000 |
| commit | 477ba422f09ceb3a1e7b3fe8aae5725ab3934ccc (patch) | |
| tree | 34717a2b81b85828a06480632a20c10c4324b580 /client/engine/Boot.lib | |
| parent | 737707071c5763b0964c4654031cb554fee09d31 (diff) | |
#660: Función {{{ogBoot}}} puede iniciar sistema operativo de tipo {{{WinLoader}}} y tiene un mejor control de errores.
git-svn-id: https://opengnsys.es/svn/branches/version1.0@4375 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'client/engine/Boot.lib')
| -rwxr-xr-x | client/engine/Boot.lib | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/client/engine/Boot.lib b/client/engine/Boot.lib index 2322a8ce..be0ed069 100755 --- a/client/engine/Boot.lib +++ b/client/engine/Boot.lib @@ -59,20 +59,20 @@ case "$TYPE" in PARAMS=$(ogLinuxBootParameters $1 $2) || return $? read -e KERNEL INITRD APPEND <<<"$PARAMS" # Si no hay kernel, no hay sistema operativo. - [ -n "$KERNEL" ] || ogRaiseError $OG_ERR_NOTOS "$1 $2" || return $? + [ -n "$KERNEL" ] || ogRaiseError $OG_ERR_NOTOS "$1 $2 $TYPE" || return $? # Arrancar de partición distinta a la original. [ -e "$MNTDIR/etc" ] && APPEND=$(echo $APPEND | awk -v P="$PART " '{sub (/root=[-+=_/a-zA-Z0-9]* /,"root="P);print}') # Configurar kernel Linux con los parámetros leídos de su GRUB. kexec -l "${MNTDIR}${KERNEL}" --append="$APPEND" --initrd="${MNTDIR}${INITRD}" kexec -e & ;; - Windows) + Windows|WinLoader) # Compruebar si hay un cargador de Windows. for f in io.sys ntldr bootmgr; do FILE="$(ogGetPath $1 $2 $f 2>/dev/null)" [ -n "$FILE" ] && LOADER="$f" done - [ -n "$LOADER" ] || ogRaiseError $OG_ERR_NOTOS || return $? + [ -n "$LOADER" ] || ogRaiseError $OG_ERR_NOTOS "$1 $2 $TYPE" || return $? if [ "$winboot" == "kexec" ]; then # Modo de arranque en caliente (con kexec). cp $OGLIB/grub4dos/* $MNTDIR # */ (Comentario Doxygen) @@ -102,7 +102,7 @@ case "$TYPE" in # Reiniciar. reboot ;; - *) ogRaiseError $OG_NOTOS "$1 $2 ${TYPE:+($TYPE)}" + *) ogRaiseError $OG_ERR_NOTOS "$1 $2 ${TYPE:+($TYPE)}" return $? ;; esac |