diff options
| author | ramon <ramongomez@us.es> | 2012-01-16 18:50:05 +0000 |
|---|---|---|
| committer | ramon <ramongomez@us.es> | 2012-01-16 18:50:05 +0000 |
| commit | 0fe2488796ad2746d7b7acdccfdeaace2ff8733b (patch) | |
| tree | b8d15f9e5ace1c036f60c0e26595358db6b37b5b | |
| parent | 020a0160ad0270bb1af9b96bcfc9293b64d77f27 (diff) | |
Versión 1.0.3, #414: Instalación completa en Debian 6, independizando el directorio para TFTP.
git-svn-id: https://opengnsys.es/svn/branches/version1.0@2440 a21b9725-9963-47de-94b9-378ad31fedc9
| -rwxr-xr-x | admin/Sources/Services/opengnsys.init | 2 | ||||
| -rwxr-xr-x | installer/opengnsys_installer.sh | 3 | ||||
| -rw-r--r-- | server/etc/smb-og.conf.tmpl | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/admin/Sources/Services/opengnsys.init b/admin/Sources/Services/opengnsys.init index cf580b89..aa82f783 100755 --- a/admin/Sources/Services/opengnsys.init +++ b/admin/Sources/Services/opengnsys.init @@ -76,7 +76,7 @@ fi config() { OSDISTRIB=$(lsb_release -is 2>/dev/null) case "$OSDISTRIB" in - Ubuntu) + Ubuntu|Debian|LinuxMint) INITFUNCTIONS=/lib/lsb/init-functions DAEMONSTART="start-stop-daemon --start --quiet --background --exec" EXTRAOPTS="--" diff --git a/installer/opengnsys_installer.sh b/installer/opengnsys_installer.sh index 085db0fc..86fc9bea 100755 --- a/installer/opengnsys_installer.sh +++ b/installer/opengnsys_installer.sh @@ -68,7 +68,7 @@ OSCODENAME=$(lsb_release -cs 2>/dev/null) # Configuración según la distribución de Linux. case "$OSDISTRIB" in - Ubuntu|Debian) + Ubuntu|Debian|LinuxMint) DEPENDENCIES=( subversion apache2 php5 libapache2-mod-php5 mysql-server php5-mysql isc-dhcp-server bittorrent tftp-hpa tftpd-hpa syslinux openbsd-inetd update-inetd build-essential g++-multilib libmysqlclient15-dev wget doxygen graphviz bittornado ctorrent samba unzip netpipes debootstrap schroot squashfs-tools ) UPDATEPKGLIST="apt-get update" INSTALLPKG="apt-get -y install --force-yes" @@ -85,6 +85,7 @@ case "$OSDISTRIB" in [ -f $SAMBAINIT ] || SAMBAINIT=/etc/init.d/samba # Debian 6 SAMBACFGDIR=/etc/samba TFTPCFGDIR=/var/lib/tftpboot + [ -d $TFTPCFGDIR ] || TFTPCFGDIR=/srv/tftp # Debian 6 ;; Fedora) DEPENDENCIES=( subversion httpd mod_ssl php mysql-server mysql-devel mysql-devel.i686 php-mysql dhcp bittorrent tftp-server syslinux binutils gcc gcc-c++ glibc-devel.i686 make wget doxygen graphviz python-tornado ctorrent samba unzip NetPIPE debootstrap schroot squashfs-tools ) # TODO comprobar paquetes diff --git a/server/etc/smb-og.conf.tmpl b/server/etc/smb-og.conf.tmpl index 894bbc72..13a1579a 100644 --- a/server/etc/smb-og.conf.tmpl +++ b/server/etc/smb-og.conf.tmpl @@ -2,7 +2,7 @@ comment = el directorio fisico ogclient debe estar como escritura browseable = no writeable = no - path = /var/lib/tftpboot + path = /opt/opengnsys/tftpboot guest ok = no [ogclient] |