From 2144f262b363aa8e53c57845c91bf66f44156aa0 Mon Sep 17 00:00:00 2001 From: Dirk von Suchodoletz Date: Thu, 19 Jul 2007 17:51:24 +0000 Subject: Forgot to remove the debugging output for fileget ... git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1262 95ad53e4-c205-0410-b2fa-d234c58c8868 --- initramfs/initrd-stuff/etc/functions | 7 ------- initramfs/initrd-stuff/init | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) (limited to 'initramfs') diff --git a/initramfs/initrd-stuff/etc/functions b/initramfs/initrd-stuff/etc/functions index 7c91391c..c0a45725 100644 --- a/initramfs/initrd-stuff/etc/functions +++ b/initramfs/initrd-stuff/etc/functions @@ -358,12 +358,8 @@ if [ "x$filepath" != "x" ] ; then 2>/dev/null && { unpack /tmp/$(basename $cfgfile) && break; } ;; *) -echo "tftp -g -r $cfgfile -l /tmp/$(basename $cfgfile) $fileserv" >> /tmp/fileblub tftp -g -r $cfgfile -l /tmp/$(basename $cfgfile) $fileserv \ && unpack /tmp/$(basename $cfgfile) - ls -la /tmp/$(basename $cfgfile) >> /tmp/fileblub - echo "F: /tmp/$(basename $cfgfile)" >>/tmp/fileblub - ;; esac else @@ -385,14 +381,11 @@ and as last\n# distro/default" >> /tmp/confviafile 2>/dev/null && { unpack /tmp/$(basename $cfgfile) && break; } ;; tftp) -echo "tftp -g -r $cfgfile -l /tmp/$(basename $cfgfile) $fileserv" >> /tmp/fileblub tftp -g -r $cfgfile -l /tmp/$(basename $cfgfile) $fileserv \ && { unpack /tmp/$(basename $cfgfile) && break; } ;; esac done - ls -la /tmp/$(basename $cfgfile) >> /tmp/fileblub - echo "F: /tmp/$(basename $cfgfile)" >>/tmp/fileblub fi test -f /initramfs/machine-setup && \ cat /initramfs/machine-setup >> /tmp/confviafile diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init index 80d38e8b..266b7fba 100755 --- a/initramfs/initrd-stuff/init +++ b/initramfs/initrd-stuff/init @@ -518,7 +518,7 @@ if [ -z "${nbdmod}" -a -z "${nbdhost}" -a -z "${nfsroot}" ] ; then # information has to be read from dhcp and ldap configuration cfgcomplete fi -# call function for nfs mounts +# mount nfs rootfs if [ -z "${nbdmod}" -a -z "${nbdserver}" ] ; then [ $DEBUGLEVEL -eq 20 ] && echo "** started nfs mount" # read in extended machine-setup -- cgit v1.2.3-55-g7522