Versión 1.0.1: corregir errata en actualización de permisos para PXE (cerrar #412).

git-svn-id: https://opengnsys.es/svn/branches/version1.0@2050 a21b9725-9963-47de-94b9-378ad31fedc9

6 files changed, 27 insertions, 32 deletions

diff --git a/doc/INSTALL.es.txt b/doc/INSTALL.es.txt
index e7d49bca..8eb85635 100644
--- a/doc/INSTALL.es.txt
+++ b/doc/INSTALL.es.txt
@@ -1,5 +1,5 @@
-Instalación de OpenGnSys Server v 0.9
-=====================================
+Instalación de OpenGnSys Server v 1.0.1
+=======================================
 
 Notas iniciales
 ---------------
diff --git a/installer/INSTALL.es.txt b/installer/INSTALL.es.txt
index 5a7ee2b6..e68f83c6 100644
--- a/installer/INSTALL.es.txt
+++ b/installer/INSTALL.es.txt
@@ -1,5 +1,5 @@
-Instalación y Actualización de OpenGnSys
-========================================
+Instalación y Actualización de OpenGnSys 1.0.1
+==============================================
 
 
 Instalación inicial
diff --git a/installer/opengnsys_installer.sh b/installer/opengnsys_installer.sh
index c2fb994c..00552f4b 100755
--- a/installer/opengnsys_installer.sh
+++ b/installer/opengnsys_installer.sh
@@ -551,15 +551,15 @@ function getNetworkSettings()
 
 function tftpConfigure()
 {
-        echoAndLog "${FUNCNAME}(): Configuring TFTP service."
-        basetftp=/var/lib/tftpboot
+        local basetftp=/var/lib/tftpboot
 
+        echoAndLog "${FUNCNAME}(): Configuring TFTP service."
         # reiniciamos demonio internet ????? porque ????
         /etc/init.d/openbsd-inetd start
 
         # preparacion contenedor tftpboot
-        cp -pr /usr/lib/syslinux/ ${basetftp}/syslinux
-        cp /usr/lib/syslinux/pxelinux.0 ${basetftp}
+        cp -ar /usr/lib/syslinux/ ${basetftp}/syslinux
+        cp -a /usr/lib/syslinux/pxelinux.0 ${basetftp}
         # prepamos el directorio de la configuracion de pxe
         mkdir -p ${basetftp}/pxelinux.cfg
         cat > ${basetftp}/pxelinux.cfg/default <<EOF
@@ -862,6 +862,7 @@ function createDirs()
 	mkdir -p $path_opengnsys_base/images
 	ln -fs /var/lib/tftpboot $path_opengnsys_base
 	mkdir -p $path_opengnsys_base/tftpboot/pxelinux.cfg
+	mkdir -p $path_opengnsys_base/tftpboot/menu.lst
 	if [ $? -ne 0 ]; then
 		errorAndLog "${FUNCNAME}(): error while creating dirs. Do you have write permissions?"
 		return 1
@@ -881,8 +882,8 @@ function createDirs()
 
 	# Establecer los permisos básicos.
 	echoAndLog "${FUNCNAME}(): setting directory permissions"
-	chmod -R 775 $path_opengnsys_base/{log/clients,images,tftpboot/pxelinux.cfg}
-	chown -R :$OPENGNSYS_CLIENT_USER $path_opengnsys_base/{log/clients,images,tftpboot/pxelinux.cfg}
+	chmod -R 775 $path_opengnsys_base/{log/clients,images,tftpboot/pxelinux.cfg,tftpboot/menu.lst}
+	chown -R :$OPENGNSYS_CLIENT_USER $path_opengnsys_base/{log/clients,images,tftpboot/pxelinux.cfg,tftpboot/menu.lst}
 	if [ $? -ne 0 ]; then
 		errorAndLog "${FUNCNAME}(): error while setting permissions"
 		return 1
@@ -902,13 +903,13 @@ function openGnsysCopyServerFiles ()
 
 	local path_opengnsys_base="$1"
 
-	local SOURCES=( server/tftpboot/pxelinux.cfg \
+	local SOURCES=( server/tftpboot \
 			server/bin \
 			repoman/bin \
 			installer/opengnsys_uninstall.sh \
 			installer/opengnsys_update.sh \
 			doc )
-	local TARGETS=( tftpboot/pxelinux.cfg \
+	local TARGETS=( tftpboot \
 			bin \
 			bin \
 			lib \
diff --git a/installer/opengnsys_installer_v1.0.2.sh b/installer/opengnsys_installer_v1.0.2.sh
index 8a5915d2..bbd6c06f 100755
--- a/installer/opengnsys_installer_v1.0.2.sh
+++ b/installer/opengnsys_installer_v1.0.2.sh
@@ -570,15 +570,15 @@ function getNetworkSettings()
 
 function tftpConfigure()
 {
-        echoAndLog "${FUNCNAME}(): Configuring TFTP service."
-        basetftp=/var/lib/tftpboot
+        local basetftp=/var/lib/tftpboot
 
+        echoAndLog "${FUNCNAME}(): Configuring TFTP service."
         # reiniciamos demonio internet ????? porque ????
         /etc/init.d/openbsd-inetd start
 
         # preparacion contenedor tftpboot
-        cp -pr /usr/lib/syslinux/ ${basetftp}/syslinux
-        cp /usr/lib/syslinux/pxelinux.0 ${basetftp}
+        cp -ar /usr/lib/syslinux/ ${basetftp}/syslinux
+        cp -a /usr/lib/syslinux/pxelinux.0 ${basetftp}
         # prepamos el directorio de la configuracion de pxe
         mkdir -p ${basetftp}/pxelinux.cfg
         cat > ${basetftp}/pxelinux.cfg/default <<EOF
@@ -788,6 +788,7 @@ function createDirs()
 	mkdir -p $path_opengnsys_base/images
 	ln -fs /var/lib/tftpboot $path_opengnsys_base
 	mkdir -p $path_opengnsys_base/tftpboot/pxelinux.cfg
+	mkdir -p $path_opengnsys_base/tftpboot/menu.lst
 	if [ $? -ne 0 ]; then
 		errorAndLog "${FUNCNAME}(): error while creating dirs. Do you have write permissions?"
 		return 1
@@ -807,8 +808,8 @@ function createDirs()
 
 	# Establecer los permisos básicos.
 	echoAndLog "${FUNCNAME}(): setting directory permissions"
-	chmod -R 775 $path_opengnsys_base/{log/clients,images,tftpboot/pxelinux.cfg}
-	chown -R :$OPENGNSYS_CLIENT_USER $path_opengnsys_base/{log/clients,images,tftpboot/pxelinux.cfg}
+	chmod -R 775 $path_opengnsys_base/{log/clients,images,tftpboot/pxelinux.cfg,tftpboot/menu.lst}
+	chown -R :$OPENGNSYS_CLIENT_USER $path_opengnsys_base/{log/clients,images,tftpboot/pxelinux.cfg,tftpboot/menu.lst}
 	if [ $? -ne 0 ]; then
 		errorAndLog "${FUNCNAME}(): error while setting permissions"
 		return 1
@@ -828,13 +829,13 @@ function openGnsysCopyServerFiles ()
 
 	local path_opengnsys_base="$1"
 
-	local SOURCES=( server/tftpboot/pxelinux.cfg \
+	local SOURCES=( server/tftpboot \
 			server/bin \
 			repoman/bin \
 			installer/opengnsys_uninstall.sh \
 			installer/opengnsys_update.sh \
 			doc )
-	local TARGETS=( tftpboot/pxelinux.cfg \
+	local TARGETS=( tftpboot \
 			bin \
 			bin \
 			lib \
diff --git a/installer/opengnsys_update.sh b/installer/opengnsys_update.sh
index 2371525b..f377e7f3 100755
--- a/installer/opengnsys_update.sh
+++ b/installer/opengnsys_update.sh
@@ -376,19 +376,12 @@ function createDirs()
 {
 	# Crear estructura de directorios.
 	echoAndLog "${FUNCNAME}(): creating directory paths in ${INSTALL_TARGET}"
-	mkdir -p ${INSTALL_TARGET}
-	mkdir -p ${INSTALL_TARGET}/bin
-	mkdir -p ${INSTALL_TARGET}/client
-	mkdir -p ${INSTALL_TARGET}/doc
-	mkdir -p ${INSTALL_TARGET}/etc
-	mkdir -p ${INSTALL_TARGET}/lib
+	mkdir -p ${INSTALL_TARGET}/{bin,doc,etc,lib,sbin,www}
+	mkdir -p ${INSTALL_TARGET}/{client,images}
 	mkdir -p ${INSTALL_TARGET}/log/clients
 	ln -fs ${INSTALL_TARGET}/log /var/log/opengnsys
-	mkdir -p ${INSTALL_TARGET}/sbin
-	mkdir -p ${INSTALL_TARGET}/www
-	mkdir -p ${INSTALL_TARGET}/images
 	ln -fs /var/lib/tftpboot ${INSTALL_TARGET}
-	mkdir -p ${INSTALL_TARGET}/tftpboot/pxelinux.cfg
+	mkdir -p ${INSTALL_TARGET}/tftpboot/{pxelinux.cfg,menu.lst}
 	if [ $? -ne 0 ]; then
 		errorAndLog "${FUNCNAME}(): error while creating dirs. Do you have write permissions?"
 		return 1
@@ -408,8 +401,8 @@ function createDirs()
 
 	# Establecer los permisos básicos.
 	echoAndLog "${FUNCNAME}(): setting directory permissions"
-	chmod -R 775 $INSTALL_TARGET/{log/clients,images,tftpboot/pxelinux.cfg}
-	chown -R :$OPENGNSYS_CLIENTUSER $INSTALL_TARGET/{log/clients,images,tftpboot/pxelinux.cfg}
+	chmod -R 775 $INSTALL_TARGET/{log/clients,images,tftpboot/pxelinux.cfg,tftpboot/menu.lst}
+	chown -R :$OPENGNSYS_CLIENTUSER $INSTALL_TARGET/{log/clients,images,tftpboot/pxelinux.cfg,tftpboot/menu.lst}
 	if [ $? -ne 0 ]; then
 		errorAndLog "${FUNCNAME}(): error while setting permissions"
 		return 1
diff --git a/server/tftpboot/pxelinux.0 b/server/tftpboot/pxelinux.0
deleted file mode 100644
index 08270f1a..00000000
--- a/server/tftpboot/pxelinux.0
+++ /dev/null