diff --git a/opengnsys-client/boot/ej_script_init.sh b/opengnsys-client/boot/ej_script_init.sh index b8841e3e..407a4fe4 100755 --- a/opengnsys-client/boot/ej_script_init.sh +++ b/opengnsys-client/boot/ej_script_init.sh @@ -17,6 +17,10 @@ mount -t nfs -onolock $DHCP_SERVER:/opt/opengnsys/images $OGIMAGES export PATH=$OGBIN:$OGLIB/engine/bin:$PATH export LD_LIBRARY_PATH=$OGLIB:$LD_LIBRARY_PATH +insmod $OGLIB/modules/psmouse.ko +mkdir -p /usr/local/Trolltech/QtEmbedded-4.5.1/lib/ +ln -s $OGLIB/fonts /usr/local/Trolltech/QtEmbedded-4.5.1/lib/fonts + . ATA.lib bash diff --git a/opengnsys-client/boot/initrd-generator b/opengnsys-client/boot/initrd-generator index 69e4eae9..c0508b6c 100755 --- a/opengnsys-client/boot/initrd-generator +++ b/opengnsys-client/boot/initrd-generator @@ -7,6 +7,8 @@ TMPINITRD=$TMP/initrd NEWROOT=$TMPINITRD/newroot DEST=$PWD LINUX=1 +CHROOTINITSCRIPT=/oginit +INITSCRIPT=$NEWROOT$CHROOTINITSCRIPT # Comprueba los argumentos pasados para modificar los valores por defecto function parsearParametros @@ -53,7 +55,7 @@ function descomprimir fi if [ -f $NEWROOT ];then - rm -rf $NEWROOT + rm -rf $NEWROOT fi mkdir -p $NEWROOT @@ -150,6 +152,9 @@ function agregarNuevoArranque cd $NEWROOT cd etc/ + #echo "s/debian-installer$/${OGINIT//\//\\\/}/" + #cat inittab | sed "s/debian-installer$/${OGINIT//\//\\\/}/" > inittab + perl -i -p -e "s/\/sbin\/debian-installer\$/${CHROOTINITSCRIPT//\//\/}/" inittab # Script inicial que ejecuta el resto de scripts de /etc/rcS.d/ #echo "#! /bin/sh" >> rc @@ -167,27 +172,20 @@ function agregarNuevoArranque #echo "::shutdown:/bin/umount -a -r" >> inittab #echo "::shutdown:/sbin/swapoff -a" >> inittab - # Ahora agregamos los scripts a rcS.d - cd rcS.d - # Primero ejecutamos el dhcp - echo "mkdir -p /var/state/dhcp" > S01dhclient - echo "/sbin/dhclient" >> S01dhclient - chmod +x S01dhclient + echo "#! /bin/sh" > $INITSCRIPT + echo "set -e" >> $INITSCRIPT + echo "mkdir -p /var/state/dhcp" >> $INITSCRIPT + echo "/sbin/dhclient" >> $INITSCRIPT # Montamos NFS y ejecutamos el script con nombre nuestra ip - echo "DHCP_SERVER=\`grep -h dhcp-server-identifier /var/lib/dhcp3/dhclient.* | sed 's/[^0-9]*\(.*\);/\1/' | head -1\`" > S02montarnfs - echo "IP=\`grep -h fixed-address /var/lib/dhcp3/dhclient.* | sed 's/[^0-9]*\(.*\);/\1/' | head -1\`" >> S02montarnfs - echo "mkdir -p /opt/opengnsys" >> S02montarnfs - echo "mount -t nfs -onolock \$DHCP_SERVER:/opt/opengnsys/client/ /opt/opengnsys/" >> S02montarnfs - echo "/opt/opengnsys/init/\$IP.sh" >> S02montarnfs - echo "sh" >> S02montarnfs - #echo "sh" >> S02montarnfs - chmod +x S02montarnfs + echo "DHCP_SERVER=\`grep -h dhcp-server-identifier /var/lib/dhcp3/dhclient.* | sed 's/[^0-9]*\(.*\);/\1/' | head -1\`" >> $INITSCRIPT + echo "IP=\`grep -h fixed-address /var/lib/dhcp3/dhclient.* | sed 's/[^0-9]*\(.*\);/\1/' | head -1\`" >> $INITSCRIPT + echo "mkdir -p /opt/opengnsys" >> $INITSCRIPT + echo "mount -t nfs -onolock \$DHCP_SERVER:/opt/opengnsys/client/ /opt/opengnsys/" >> $INITSCRIPT + echo "/opt/opengnsys/init/\$IP.sh" >> $INITSCRIPT - # Si el script anterior termina sin reinicar apagamos nosotros - echo "halt" > S99halt - chmod +x S99halt + chmod +x $INITSCRIPT } function comprimir diff --git a/opengnsys-client/boot/bin/awk b/opengnsys-client/nfsexport/bin/awk similarity index 100% rename from opengnsys-client/boot/bin/awk rename to opengnsys-client/nfsexport/bin/awk diff --git a/opengnsys-client/boot/bin/browser b/opengnsys-client/nfsexport/bin/browser similarity index 100% rename from opengnsys-client/boot/bin/browser rename to opengnsys-client/nfsexport/bin/browser diff --git a/opengnsys-client/boot/bin/chntpw b/opengnsys-client/nfsexport/bin/chntpw similarity index 100% rename from opengnsys-client/boot/bin/chntpw rename to opengnsys-client/nfsexport/bin/chntpw diff --git a/opengnsys-client/boot/bin/ctorrent b/opengnsys-client/nfsexport/bin/ctorrent similarity index 100% rename from opengnsys-client/boot/bin/ctorrent rename to opengnsys-client/nfsexport/bin/ctorrent diff --git a/opengnsys-client/boot/bin/fdisk b/opengnsys-client/nfsexport/bin/fdisk similarity index 100% rename from opengnsys-client/boot/bin/fdisk rename to opengnsys-client/nfsexport/bin/fdisk diff --git a/opengnsys-client/boot/bin/hidrac b/opengnsys-client/nfsexport/bin/hidrac similarity index 100% rename from opengnsys-client/boot/bin/hidrac rename to opengnsys-client/nfsexport/bin/hidrac diff --git a/opengnsys-client/boot/bin/kexec b/opengnsys-client/nfsexport/bin/kexec similarity index 100% rename from opengnsys-client/boot/bin/kexec rename to opengnsys-client/nfsexport/bin/kexec diff --git a/opengnsys-client/boot/bin/mkntfs b/opengnsys-client/nfsexport/bin/mkntfs similarity index 100% rename from opengnsys-client/boot/bin/mkntfs rename to opengnsys-client/nfsexport/bin/mkntfs diff --git a/opengnsys-client/boot/bin/ntfscat b/opengnsys-client/nfsexport/bin/ntfscat similarity index 100% rename from opengnsys-client/boot/bin/ntfscat rename to opengnsys-client/nfsexport/bin/ntfscat diff --git a/opengnsys-client/boot/bin/ntfsclone b/opengnsys-client/nfsexport/bin/ntfsclone similarity index 100% rename from opengnsys-client/boot/bin/ntfsclone rename to opengnsys-client/nfsexport/bin/ntfsclone diff --git a/opengnsys-client/boot/bin/ntfscluster b/opengnsys-client/nfsexport/bin/ntfscluster similarity index 100% rename from opengnsys-client/boot/bin/ntfscluster rename to opengnsys-client/nfsexport/bin/ntfscluster diff --git a/opengnsys-client/boot/bin/ntfscmp b/opengnsys-client/nfsexport/bin/ntfscmp similarity index 100% rename from opengnsys-client/boot/bin/ntfscmp rename to opengnsys-client/nfsexport/bin/ntfscmp diff --git a/opengnsys-client/boot/bin/ntfscp b/opengnsys-client/nfsexport/bin/ntfscp similarity index 100% rename from opengnsys-client/boot/bin/ntfscp rename to opengnsys-client/nfsexport/bin/ntfscp diff --git a/opengnsys-client/boot/bin/ntfsfix b/opengnsys-client/nfsexport/bin/ntfsfix similarity index 100% rename from opengnsys-client/boot/bin/ntfsfix rename to opengnsys-client/nfsexport/bin/ntfsfix diff --git a/opengnsys-client/boot/bin/ntfsinfo b/opengnsys-client/nfsexport/bin/ntfsinfo similarity index 100% rename from opengnsys-client/boot/bin/ntfsinfo rename to opengnsys-client/nfsexport/bin/ntfsinfo diff --git a/opengnsys-client/boot/bin/ntfslabel b/opengnsys-client/nfsexport/bin/ntfslabel similarity index 100% rename from opengnsys-client/boot/bin/ntfslabel rename to opengnsys-client/nfsexport/bin/ntfslabel diff --git a/opengnsys-client/boot/bin/ntfsls b/opengnsys-client/nfsexport/bin/ntfsls similarity index 100% rename from opengnsys-client/boot/bin/ntfsls rename to opengnsys-client/nfsexport/bin/ntfsls diff --git a/opengnsys-client/boot/bin/ntfsresize b/opengnsys-client/nfsexport/bin/ntfsresize similarity index 100% rename from opengnsys-client/boot/bin/ntfsresize rename to opengnsys-client/nfsexport/bin/ntfsresize diff --git a/opengnsys-client/boot/bin/ntfsundelete b/opengnsys-client/nfsexport/bin/ntfsundelete similarity index 100% rename from opengnsys-client/boot/bin/ntfsundelete rename to opengnsys-client/nfsexport/bin/ntfsundelete diff --git a/opengnsys-client/boot/bin/parted b/opengnsys-client/nfsexport/bin/parted similarity index 100% rename from opengnsys-client/boot/bin/parted rename to opengnsys-client/nfsexport/bin/parted diff --git a/opengnsys-client/boot/bin/partimage b/opengnsys-client/nfsexport/bin/partimage similarity index 100% rename from opengnsys-client/boot/bin/partimage rename to opengnsys-client/nfsexport/bin/partimage diff --git a/opengnsys-client/boot/bin/sfdisk b/opengnsys-client/nfsexport/bin/sfdisk similarity index 100% rename from opengnsys-client/boot/bin/sfdisk rename to opengnsys-client/nfsexport/bin/sfdisk diff --git a/opengnsys-client/boot/bin/tftp b/opengnsys-client/nfsexport/bin/tftp similarity index 100% rename from opengnsys-client/boot/bin/tftp rename to opengnsys-client/nfsexport/bin/tftp diff --git a/opengnsys-client/boot/etc/lang.es_ES.UTF-8.conf b/opengnsys-client/nfsexport/etc/lang.es_ES.UTF-8.conf similarity index 100% rename from opengnsys-client/boot/etc/lang.es_ES.UTF-8.conf rename to opengnsys-client/nfsexport/etc/lang.es_ES.UTF-8.conf diff --git a/opengnsys-client/boot/etc/lang.es_ES.conf b/opengnsys-client/nfsexport/etc/lang.es_ES.conf similarity index 100% rename from opengnsys-client/boot/etc/lang.es_ES.conf rename to opengnsys-client/nfsexport/etc/lang.es_ES.conf diff --git a/opengnsys-client/nfsexport/lib/modules/psmouse.ko b/opengnsys-client/nfsexport/lib/modules/psmouse.ko new file mode 100644 index 00000000..f305164d Binary files /dev/null and b/opengnsys-client/nfsexport/lib/modules/psmouse.ko differ