#529 boot-tools soporte para ubuntu 12.04

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

4 files changed, 9 insertions, 12 deletions

diff --git a/client/boot-tools/includes/etc/initramfs-tools/hooks/oghooks b/client/boot-tools/includes/etc/initramfs-tools/hooks/oghooks
index afe21be6..e3c25677 100755
--- a/client/boot-tools/includes/etc/initramfs-tools/hooks/oghooks
+++ b/client/boot-tools/includes/etc/initramfs-tools/hooks/oghooks
@@ -51,7 +51,6 @@ copy_exec /bin/lsmod
 #mkdir -p ${DESTDIR}/opt/opengnsys/lib/engine
 #cp -prv /opt/opengnsys/client/lib/engine ${DESTDIR}/opt/opengnsys/lib/engine
 
-#rm -fr ${DESTDIR}/lib/modules/2.6.32-21-generic-pae/kernel/drivers/net/atl*
 manual_add_modules cifs
 manual_add_modules smbfs
 manual_add_modules atl1e
diff --git a/client/boot-tools/includes/usr/bin/boot-tools/boottoolsFsOpengnsys.sh b/client/boot-tools/includes/usr/bin/boot-tools/boottoolsFsOpengnsys.sh
index 21b7a54d..fa61db5d 100644
--- a/client/boot-tools/includes/usr/bin/boot-tools/boottoolsFsOpengnsys.sh
+++ b/client/boot-tools/includes/usr/bin/boot-tools/boottoolsFsOpengnsys.sh
@@ -11,8 +11,8 @@ VERSIONSVN=$(LANG=C svn info $SVNURL | awk '/Revision:/ {print "r"$2}')
 
 VERSIONBOOTTOOLS=ogLive
 
-NAMEISOCLIENT="/tmp/opengnsys_info_rootfs" 
-NAMEHOSTCLIENT="/tmp/opengnsys_chroot"
+NAMEISOCLIENTFILE="/tmp/opengnsys_info_rootfs" 
+NAMEHOSTCLIENTFILE="/tmp/opengnsys_chroot"
 	
 SVNCLIENTDIR=/tmp/opengnsys_installer/opengnsys/client/boot-tools
 SVNCLIENTSTRUCTURE=/tmp/opengnsys_installer/opengnsys/client/shared
@@ -115,10 +115,9 @@ cp -prv ${SVNOG2}/job_executer $OGCLIENTMOUNT/opt/opengnsys/bin/
 cp ${SVNCLIENTSTRUCTURE}/bin/ogAdmClient  $OGCLIENTMOUNT/bin
 
 
-echo ${VERSIONBOOTTOOLS}-${OSCODENAME}-${OSRELEASE}-${VERSIONSVN} > $NAMEISOCLIENT
-echo ${VERSIONBOOTTOOLS}-${OSCODENAME}-${VERSIONSVN} > $NAMEHOSTCLIENT
-echo ${VERSIONBOOTTOOLS}-${OSCODENAME}-${VERSIONSVN} > /etc/debian_chroot
-echo ${VERSIONBOOTTOOLS}-${OSCODENAME}-${VERSIONSVN} > /etc/opengnsys_chroot
+echo ${VERSIONBOOTTOOLS}-${OSCODENAME}-${OSRELEASE}-${VERSIONSVN} > $NAMEISOCLIENTFILE
+echo ${VERSIONBOOTTOOLS}-${OSCODENAME}-${VERSIONSVN} > $NAMEHOSTCLIENTFILE
+
 
 history -c
 
diff --git a/client/boot-tools/includes/usr/bin/boot-tools/boottoolsSoftwareCompile.sh b/client/boot-tools/includes/usr/bin/boot-tools/boottoolsSoftwareCompile.sh
index 8d0cede9..14237ce1 100755
--- a/client/boot-tools/includes/usr/bin/boot-tools/boottoolsSoftwareCompile.sh
+++ b/client/boot-tools/includes/usr/bin/boot-tools/boottoolsSoftwareCompile.sh
@@ -29,11 +29,9 @@ gdebi -n /var/cache/apt/archivesOG/xvesa.deb
 echo "partclone"
 gdebi -n /var/cache/apt/archivesOG/partclone_0.2.38_i386.deb
 
-#echo "busybox"
-#gdebi -n /var/cache/apt/archivesOG/busybox_1.17.1-10ubuntu1_i386.deb
 
-echo "busybox-static"
-gdebi -n /var/cache/apt/archivesOG/busybox-static_1.17.1-10ubuntu1_i386.deb
+#echo "En ubuntu oneiric es necesario la 1.17.1 de busybox-static"
+#gdebi -n /var/cache/apt/archivesOG/busybox-static_1.17.1-10ubuntu1_i386.deb
 
 
 history -c
\ No newline at end of file
diff --git a/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.basic b/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.basic
index e65da70e..7acf3f9f 100644
--- a/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.basic
+++ b/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.basic
@@ -4,7 +4,8 @@ install man-db
 install fbset
 install gdebi-core
 install bash-static
-#install busybox-static  #la version en oneiric no incluye el reboot y poweroff -> ver compilacion software 
+install busybox-static  
+#la version de busysbox-static en oneiric no incluye el reboot y poweroff -> ver compilacion software en boottoolSoftwareCompile.sh 
 install console-data
 install locales
 install lshw