diff options
| -rw-r--r-- | installer/vagrant/Vagrantfile-devel-vbox | 2 | ||||
| -rwxr-xr-x | server/bin/checkperms | 2 | ||||
| -rwxr-xr-x | server/bin/oglivecli | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/installer/vagrant/Vagrantfile-devel-vbox b/installer/vagrant/Vagrantfile-devel-vbox index 2250cd85..c8eb022f 100644 --- a/installer/vagrant/Vagrantfile-devel-vbox +++ b/installer/vagrant/Vagrantfile-devel-vbox @@ -42,7 +42,7 @@ wget -q https://opengnsys.es/svn/branches/version1.1/installer/opengnsys_install mv /opt/opengnsys/log/bash.log /opt/opengnsys/log/opengnsys_installer.log echo y | /opt/opengnsys/bin/setserveraddr enp0s8 # Insert DHCP data. -for ((i=#{NCLIENTS+10}; i>0; i--)); do +for ((i=#{NCLIENTS+10}; i>10; i--)); do sed -i "/^}$/ i host pc${i} { hardware ethernet #{MACPREFIX}:${i}; fixed-address #{NETPREFIX}.${i}; }" /etc/dhcp/dhcpd.conf done service isc-dhcp-server restart 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 |