diff options
| author | adv <adv@uma.es> | 2011-04-14 14:22:52 +0000 |
|---|---|---|
| committer | adv <adv@uma.es> | 2011-04-14 14:22:52 +0000 |
| commit | 88b75ac0ccf3006a5d4a8449a078d6bdb3d31f68 (patch) | |
| tree | 4ba94013732faca741acefc3860be1478de6171b /client/boot-tools/clientstructure/etc | |
| parent | 3cd3133e29efbfdb693c697573039a90a0b7e9f1 (diff) | |
version1.0 #368 - Adaptando el antiguo ogclient a boot-tools
git-svn-id: https://opengnsys.es/svn/branches/version1.0@1854 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'client/boot-tools/clientstructure/etc')
5 files changed, 9 insertions, 3 deletions
diff --git a/client/boot-tools/clientstructure/etc/initramfs-tools/hooks/oghooks b/client/boot-tools/clientstructure/etc/initramfs-tools/hooks/oghooks index 15fd01cc..51f452ff 100755 --- a/client/boot-tools/clientstructure/etc/initramfs-tools/hooks/oghooks +++ b/client/boot-tools/clientstructure/etc/initramfs-tools/hooks/oghooks @@ -49,7 +49,7 @@ copy_exec /sbin/mount.cifs #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* +#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/clientstructure/etc/initramfs-tools/scripts/ogfunctions b/client/boot-tools/clientstructure/etc/initramfs-tools/scripts/ogfunctions index ce2716db..ef6f00c8 100644 --- a/client/boot-tools/clientstructure/etc/initramfs-tools/scripts/ogfunctions +++ b/client/boot-tools/clientstructure/etc/initramfs-tools/scripts/ogfunctions @@ -294,7 +294,7 @@ IP=$IPOPTS break; fi - case ${IP} in + case ${IP} in none|off) # Do nothing ;; diff --git a/client/boot-tools/clientstructure/etc/initramfs-tools/scripts/oginit b/client/boot-tools/clientstructure/etc/initramfs-tools/scripts/oginit index a6c05d5e..d91afaee 100755 --- a/client/boot-tools/clientstructure/etc/initramfs-tools/scripts/oginit +++ b/client/boot-tools/clientstructure/etc/initramfs-tools/scripts/oginit @@ -41,9 +41,12 @@ mountroot () . /scripts/functions . /scripts/ogfunctions + sleep 2 + [ "$ogdebug" == "true" ] && ogYesNo --timeout 5 --default no "Stop before get OG variables: y/N " [ $? == 0 ] && sh || echo " " + set -a log_success_msg "Checking kernel parameters" ogExportKernelParameters diff --git a/client/boot-tools/clientstructure/etc/inittab b/client/boot-tools/clientstructure/etc/inittab index 94c30028..6d3277fc 100644 --- a/client/boot-tools/clientstructure/etc/inittab +++ b/client/boot-tools/clientstructure/etc/inittab @@ -7,7 +7,7 @@ #::askfirst:/bin/sh # Start an "askfirst" shell on /dev/tty2-4 #tty1::respawn:/sbin/getty 38400 tty1 -tty1::respawn:/opt/opengnsys/etc/preinit/defaultTESTING.sh +tty1::respawn:/opt/opengnsys/etc/preinit/default.sh tty2::respawn:/sbin/getty 38400 tty2 tty3::respawn:/sbin/getty 38400 tty3 tty4::respawn:/sbin/getty 38400 tty4 diff --git a/client/boot-tools/clientstructure/etc/profile.d/loadenviron.sh b/client/boot-tools/clientstructure/etc/profile.d/loadenviron.sh index 0bf46a3e..c6e8f790 100755 --- a/client/boot-tools/clientstructure/etc/profile.d/loadenviron.sh +++ b/client/boot-tools/clientstructure/etc/profile.d/loadenviron.sh @@ -57,6 +57,9 @@ if [ -d $OPENGNSYS ]; then source $i done fi + + source /tmp/net-eth* 2>/dev/null + # Añadir dependencia de arquitectura ARCH=$(ogGetArch) if [ -n "$ARCH" ]; then |