diff options
| author | ramon <ramongomez@us.es> | 2018-02-20 12:19:12 +0000 |
|---|---|---|
| committer | ramon <ramongomez@us.es> | 2018-02-20 12:19:12 +0000 |
| commit | b17e87e096bdc340aae129656bd6b46750c59732 (patch) | |
| tree | 42ef53e4983696005a2d6a2db6c76f08b0c061ab /server/bin | |
| parent | 03044650e0b68aeb5b721e9562dca823091002d7 (diff) | |
#739 #768: Cambios menores:
- Crear entradas correctas en DHCP de entorno Vagrant.
- Permisos correctos en todos los clientes ogLive.
- Obtener datos correctos al ejecutar {{{oglivecli convert}}}.
git-svn-id: https://opengnsys.es/svn/branches/version1.1@5603 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'server/bin')
| -rwxr-xr-x | server/bin/checkperms | 2 | ||||
| -rwxr-xr-x | server/bin/oglivecli | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/server/bin/checkperms b/server/bin/checkperms index 25a7e150..0d80183c 100755 --- a/server/bin/checkperms +++ b/server/bin/checkperms @@ -53,7 +53,7 @@ chown -R $APACHE_USER:$APACHE_GROUP $OPENGNSYS_DIR/www/images/{fotos,iconos} chown -R $APACHE_USER:$APACHE_GROUP $OPENGNSYS_DIR/www/api chown -R $APACHE_USER:$APACHE_GROUP $OPENGNSYS_DIR/www/tmp # ??? chown -R $APACHE_USER:$APACHE_GROUP $OPENGNSYS_DIR/tftpboot/menu.lst -chown -R :$OPENGNSYS_USER $OPENGNSYS_DIR/tftpboot/ogclient +chown -R :$OPENGNSYS_USER $OPENGNSYS_DIR/tftpboot/ogLive* find -L $OPENGNSYS_DIR/tftpboot -type d -exec chmod 755 {} \; find -L $OPENGNSYS_DIR/tftpboot -type f -exec chmod 644 {} \; chown $APACHE_USER:$APACHE_GROUP $OPENGNSYS_DIR/log/ogagent.log diff --git a/server/bin/oglivecli b/server/bin/oglivecli index 74b37275..451c3c12 100755 --- a/server/bin/oglivecli +++ b/server/bin/oglivecli @@ -130,8 +130,8 @@ function convert() { # Add entry to JSON file using ogclient kernel version. OGLIVEKRNL=$(file -bkr $OGCLIENT/ogvmlinuz | awk '/Linux/ {for(i=1;i<=NF;i++) if($i~/version/) {v=$(i+1);sub(/-.*/,"",v);print v}}') OGLIVEDIR=$DEFOGLIVE-$OGLIVEKRNL - [ -r $OLDINFOFILE ] && OGLIVEISO=$(head -1 $OLDINFOFILE).iso - addToJson "$(echo $OGLIVEISO|cut -f2 -d-)" "$OGLIVEKRNL" "i386" "${OGLIVEISO##*-}" "$OGLIVEDIR" "$OGLIVEISO" + [ -r $OLDINFOFILE ] && OGLIVEISO="$(head -1 $OLDINFOFILE)" + addToJson "$(echo $OGLIVEISO|cut -f2 -d-)" "$OGLIVEKRNL" "i386" "${OGLIVEISO##*-}" "$OGLIVEDIR" "$OGLIVEISO.iso" # Rename directory, link to default and clean old files. mv -v $OGCLIENT $OGLIVEDIR ln -vfs $OGLIVEDIR $DEFOGLIVE |