diff options
| author | ramon <ramongomez@us.es> | 2015-06-05 08:31:30 +0000 |
|---|---|---|
| committer | ramon <ramongomez@us.es> | 2015-06-05 08:31:30 +0000 |
| commit | d3e23829022652356a1b2a23eb99803d23946201 (patch) | |
| tree | 6b9a8a0fd97f521c86e0e390d556df176efc46ac | |
| parent | de687e3ba82883fa561b00bca0dbd0a73b6ee2d5 (diff) | |
#645 #685: Montar SF {{{/boot}}} para obtener datos de arranque de GNU/Linux.
git-svn-id: https://opengnsys.es/svn/trunk@4642 a21b9725-9963-47de-94b9-378ad31fedc9
| -rwxr-xr-x | client/engine/Boot.lib | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/client/engine/Boot.lib b/client/engine/Boot.lib index ea3badb7..109c3048 100755 --- a/client/engine/Boot.lib +++ b/client/engine/Boot.lib @@ -29,9 +29,9 @@ #@version 1.0.4 - Soporta modo de arranque Windows (parámetro de inicio "winboot"). #@author Ramon Gomez, ETSII Universidad de Sevilla #@date 2012-04-12 -#@version 1.0.6 - Selección a partir de tipo de sistema operativo (en vez de S.F.). +#@version 1.0.6 - Selección a partir de tipo de sistema operativo (en vez de S.F.) y arrancar Linux con /boot separado. #@author Ramon Gomez, ETSII Universidad de Sevilla -#@date 2014-08-28 +#@date 2015-06-05 #*/ ## function ogBoot () { @@ -61,6 +61,8 @@ case "$TYPE" in if [ -z "$PARAMS" -a -e $MNTDIR/etc/fstab ]; then # Localizar S.F. /boot en /etc/fstab del S.F. actual. PART=$(ogDevToDisk $(awk '$2=="/boot" {print $1}' $MNTDIR/etc/fstab)) + # Montar S.F. de /boot. + MNTDIR=$(ogMount $PART) || return $? # Buscar los datos de arranque. PARAMS=$(ogLinuxBootParameters $PART) || exit $? fi @@ -210,12 +212,12 @@ awk 'BEGIN {cont=-1;} if (def ~ /saved_entry/) def=0; } $1~/^(title|menuentry)$/ {cont++} - $1~/^(kernel|linux(efi)?)$/ { if (def==cont) { + $1~/^(kernel|linux(16|efi)?)$/ { if (def==cont) { kern=$2; sub($1,""); sub($1,""); sub(/^[ \t]*/,""); app=$0 - } # /* (comentario Doxygen) - } - $1~/^initrd(efi)?$/ {if (def==cont) init=$2} + } # /* (comentario Doxygen) + } + $1~/^initrd(16|efi)?$/ {if (def==cont) init=$2} END {if (kern!="") printf("%s %s %s", kern,init,app)} ' $CONFFILE # */ (comentario Doxygen) |