diff options
author | irina <irinagomez@us.es> | 2016-05-20 12:15:12 +0000 |
---|---|---|
committer | irina <irinagomez@us.es> | 2016-05-20 12:15:12 +0000 |
commit | dc4eac637d5f07676f85b2504b3698f7056ee751 (patch) | |
tree | 20d219e1c16e82b93f433ebe47049212b7ee521a /client | |
parent | 680f79fdc9561195e9816a95fb4b9b16687735c9 (diff) |
#717 bootOs y ogBoot: Se modifica el mensaje de ayuda corrigiendo el argumento de los parámetros del kernel
git-svn-id: https://opengnsys.es/svn/branches/version1.1@4944 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'client')
-rwxr-xr-x | client/engine/Boot.lib | 6 | ||||
-rwxr-xr-x | client/shared/scripts/bootOs | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/client/engine/Boot.lib b/client/engine/Boot.lib index dc9158f0..50262f9d 100755 --- a/client/engine/Boot.lib +++ b/client/engine/Boot.lib @@ -10,7 +10,7 @@ #/** -# ogBoot int_ndisk int_nfilesys [str_krnlparams] +# ogBoot int_ndisk int_nfilesys [str_kernel str_initrd str_krnlparams] #@brief Inicia el proceso de arranque de un sistema de archivos. #@param int_ndisk nº de orden del disco #@param int_nfilesys nº de orden del sistema de archivos @@ -45,8 +45,8 @@ local PART TYPE MNTDIR PARAMS KERNEL INITRD APPEND FILE LOADER f # Si se solicita, mostrar ayuda. if [ "$*" == "help" ]; then - ogHelp "$FUNCNAME" "$FUNCNAME int_ndisk int_nfilesys [str_kernelparams" \ - "$FUNCNAME 1 1" "$FUNCNAME 1 2 \"root=/dev/sda2 ro\"" + ogHelp "$FUNCNAME" "$FUNCNAME int_ndisk int_nfilesys [str_kernel str_initrd str_kernelparams]" \ + "$FUNCNAME 1 1" "$FUNCNAME 1 2 \"/boot/vmlinuz /boot/initrd.img root=/dev/sda2 ro\"" return fi # Error si no se reciben 2 o 3 parámetros. diff --git a/client/shared/scripts/bootOs b/client/shared/scripts/bootOs index d0bda8b9..ef4832fb 100755 --- a/client/shared/scripts/bootOs +++ b/client/shared/scripts/bootOs @@ -4,7 +4,7 @@ PROG="$(basename $0)" if [ $# -lt 2 -o $# -gt 3 ]; then - ogRaiseError $OG_ERR_FORMAT "Formato: $PROG ndisco nfilesys [kernelparams]" + ogRaiseError $OG_ERR_FORMAT "Formato: $PROG ndisco nfilesys [str_kernel str_initrd str_kernelparams]" exit $? fi |