diff options
| author | Dirk von Suchodoletz | 2006-08-18 23:52:43 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2006-08-18 23:52:43 +0200 |
| commit | ebcfe2456b34ca8c3748e09a6ae5d53fe247c391 (patch) | |
| tree | 1e9a6c2d22bf49bf4cb01eae71836a35003dc4e2 /initrd | |
| parent | * largish step towards a working demuxer: demuxing and packing of tars works (diff) | |
| download | core-ebcfe2456b34ca8c3748e09a6ae5d53fe247c391.tar.gz core-ebcfe2456b34ca8c3748e09a6ae5d53fe247c391.tar.xz core-ebcfe2456b34ca8c3748e09a6ae5d53fe247c391.zip | |
(hopefully) fixed #71 - please check!
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@317 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initrd')
| -rwxr-xr-x | initrd/initrd-stuff/bin/hwautocfg | 5 | ||||
| -rwxr-xr-x | initrd/initrd-stuff/bin/servconfig | 6 | ||||
| -rw-r--r-- | initrd/initrd-stuff/etc/functions | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/initrd/initrd-stuff/bin/hwautocfg b/initrd/initrd-stuff/bin/hwautocfg index 866ea0d5..64ed8970 100755 --- a/initrd/initrd-stuff/bin/hwautocfg +++ b/initrd/initrd-stuff/bin/hwautocfg @@ -4,7 +4,7 @@ # script for linux diskless clients, using hwconfig from # knoppix as base tool # -# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 15-07-2006 +# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 18-07-2006 # Felix Endres # # Copyright: (c) 2003 - 2006 - RZ Universitaet Freiburg @@ -430,7 +430,8 @@ for hd in $(cat /tmp/hwsetup.info|sed -n -e '/HD$/,/device:/p'| \ sed -n -e "/ 44 /p"|sed -e "s/[[:space:]].*//") ; do # ext2fs_check_if_mount message supressed ( mkfs.ext2 -Fq $hdpartnr 2>/dev/null; mount -n -o nocheck,noexec \ - $hdpartnr /mnt/tmp 2>/dev/null; echo "$hdpartnr" > /tmp/tmpready ) & + $hdpartnr /mnt/tmp 2>/dev/null; + echo "$hdpartnr is mounted to /tmp" > /tmp/tmpready ) & echo -e "$hdpartnr\t/tmp\t\text2\t\tdefaults\t 0 0" >> /tmp/fstab part44=yes break diff --git a/initrd/initrd-stuff/bin/servconfig b/initrd/initrd-stuff/bin/servconfig index 1e50b6d7..c645cef6 100755 --- a/initrd/initrd-stuff/bin/servconfig +++ b/initrd/initrd-stuff/bin/servconfig @@ -4,8 +4,8 @@ # for linux diskless clients (executed within initial # ramdisk) # -# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 16-08-2006 -# Michael Janczyk, 31-05-2006 +# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 18-08-2006 +# Michael Janczyk <mj0>, 31-05-2006 # Lars Mueller <lm@opendiskless.org>, 23-06-2006 # Oliver Tappe <ot@opendiskless.org>, 23-06-2006 # @@ -334,7 +334,7 @@ fi # wait for completion of detection, setup process waitfor /tmp/tmpready 10000 # create some directories and correct permissions -tmpisdisk=`sed -n '/\/tmp/p' /mnt/etc/fstab` +tmpisdisk=`sed -n '/\/tmp/p' /tmp/tmpready` # if there is no local disk partition for /tmp then try to mount a rw # scratch space (if defined in $scratch) and prepared on server if [ -n "$scratch" -a -z "$tmpisdisk" ] ; then diff --git a/initrd/initrd-stuff/etc/functions b/initrd/initrd-stuff/etc/functions index cc1694b0..22827b01 100644 --- a/initrd/initrd-stuff/etc/functions +++ b/initrd/initrd-stuff/etc/functions @@ -2,7 +2,7 @@ # linux diskless clients (included by init, hwautocfg, # servconfig, ... within initial ramdisk) # -# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 17-08-2006 +# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 18-08-2006 # Felix Endres, 30-04-2006 # Tobias Maier # @@ -373,7 +373,7 @@ case "$tftp" in esac # unpack part (only gzip is supported) if [ -s $dst ] ; then - tar -xpzf $dst + tar -xpzf $dst 2>/dev/null [ "$DEBUGLEVEL" -le 2 ] && rm $dst return 0 else |