diff options
| author | Dirk von Suchodoletz | 2006-10-03 23:21:47 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2006-10-03 23:21:47 +0200 |
| commit | 8b6272ebfe3d3d2c415b64fe4c14cea8baffff62 (patch) | |
| tree | 608d26c2a9fbaf95fa2d8e1c11deb74d0a4a6138 /initramfs | |
| parent | now /w grouptest. checks machine-setup in which slxgrp a clinet is, and (diff) | |
| download | core-8b6272ebfe3d3d2c415b64fe4c14cea8baffff62.tar.gz core-8b6272ebfe3d3d2c415b64fe4c14cea8baffff62.tar.xz core-8b6272ebfe3d3d2c415b64fe4c14cea8baffff62.zip | |
Naming in mkdxsinitrd and slxmkramfs (temporary directory where pre-cpio
initialramfs stuff could be found -> /tmp/slx-tmpramfs), see
MkinitrdHowto too ... (matched to documentation too)
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@436 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs')
| -rw-r--r-- | initramfs/initrd-stuff/etc/functions | 4 | ||||
| -rwxr-xr-x | initramfs/mkdxsinitrd | 6 | ||||
| -rwxr-xr-x | initramfs/slxmkramfs | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/initramfs/initrd-stuff/etc/functions b/initramfs/initrd-stuff/etc/functions index f241ebe1..6784c27e 100644 --- a/initramfs/initrd-stuff/etc/functions +++ b/initramfs/initrd-stuff/etc/functions @@ -401,14 +401,14 @@ local dst=/tmp/$(basename $1) # tftp get part case "$tftp" in */atftp) - atftp -g -r $1 -l $dst $2 2>/dev/null + atftp -g -r $1 -l $dst $2 2>&1>/dev/null ;; */tftp) # distinguish between busybox tftp and standalone (in.tftp) client if [ -x /bin/busybox ] ; then tftp -g -r $1 -l $dst $2 2>/dev/null else - echo "get $1 $dst" | tftp $2 2>/dev/null + echo "get $1 $dst" | tftp $2 2>&1>/dev/null fi ;; esac diff --git a/initramfs/mkdxsinitrd b/initramfs/mkdxsinitrd index 7af712ae..a2df3539 100755 --- a/initramfs/mkdxsinitrd +++ b/initramfs/mkdxsinitrd @@ -4,7 +4,7 @@ # ramdisks for linux diskless clients (stage2 system # setup) # -# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 18-09-2006 +# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 03-10-2006 # Nico Dietrich # Felix Endres # <mj0@uni-freiburg.de> (xenbr), 27-09-2006 @@ -357,7 +357,7 @@ goto_script_dir # set temporary setup directory, clean it and setup basic directory # structure if [ -z "$INSTDIR" ] ; then - INSTDIR=/tmp/dxs-instrd + INSTDIR=/tmp/slx-tmpramfs fi rm -rf ${INSTDIR} mkdir -p ${INSTDIR}/{dev,proc,tmp,mnt,root,bin,sys,lib} @@ -611,7 +611,7 @@ if [ -z "$FSMODULES" ] ; then FSMODULES="nbd nfs" fi if [ -z "$INITRD_PATH" ] ; then - INITRD_PATH="${ROOTDIR}/tmp/dxsinitrd.gz" + INITRD_PATH="${ROOTDIR}/tmp/slxinitramfs.gz" fi # define modules to put into initial ramdisk for debugging diff --git a/initramfs/slxmkramfs b/initramfs/slxmkramfs index b479eac5..beef6634 100755 --- a/initramfs/slxmkramfs +++ b/initramfs/slxmkramfs @@ -1,6 +1,6 @@ #!/bin/bash # -# universal (distro independent) generator for initial ramdisks for OpenSLX +# universal (distro independent) generator for initialramfs for OpenSLX # linux diskless clients (part of stage2 system setup). This script is the # successor of mkdxsinitrd. It expects all project files to be installed. It # does not work directly out of repository any more. @@ -543,7 +543,7 @@ if [ -z "$FSMODULES" ] ; then FSMODULES="nbd nfs" fi if [ -z "$INITRD_PATH" ] ; then - INITRD_PATH="${ROOTDIR}/tmp/dxsinitrd.gz" + INITRD_PATH="${ROOTDIR}/tmp/slxinitramfs.gz" fi # define modules to put into initial ramdisk for debugging |