Changeset 2628 in /cluster/svnroot


Ignore:
Timestamp:
Sep 13, 2010 9:33:19 PM (10 years ago)
Author:
skylar
Message:

merging in runinram fix (#385)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • bccd-ng/trunk/trees/KNOPPIX/boot/isolinux/minirt/linuxrc

    r2573 r2628  
    649649copy_to()
    650650{
     651 /bbin/busybox ash
    651652 # preparations
    652  /bin/mkdir $TARGET
     653 /bbin/mkdir $TARGET
    653654 COPY="$SOURCE/$KNOPPIX_DIR"
    654655 # look if we copy to hd or to ram
    655  SIZE="$(/usr/bin/du -s $COPY | /usr/bin/gawk '{print int($1*1.1)}')"
     656 SIZE="$(/bbin/du -s $COPY | /bbin/awk '{print int($1*1.1)}')"
    656657 test -n "$SIZE" || SIZE="800000"
    657658 case "$1" in
     
    659660   TARGET_DEV="/dev/shm"
    660661   TARGET_DEV_DESC="ramdisk"
    661    FOUNDSPACE="$(/usr/bin/gawk '/MemTotal/{print $2}' /proc/meminfo)"
     662   FOUNDSPACE="$(/bbin/awk '/MemTotal/{print $2}' /proc/meminfo)"
    662663   /bin/mount -n -t tmpfs -o size=${SIZE}k $TARGET_DEV $TARGET
    663664  ;;
    664665  hd)
    665    TARGET_DEV=$(echo $CMDLINE | /usr/bin/tr ' ' '\n' | /bin/sed -n '/tohd=/s/.*=//p' | /usr/bin/tail -1)
     666   TARGET_DEV=$(echo $CMDLINE | /bbin/tr ' ' '\n' | /bin/sed -n '/tohd=/s/.*=//p' | /usr/bin/tail -1)
    666667   TARGET_DEV_DESC="$TARGET_DEV"
    667668
     
    687688   # check for enough free space
    688689   USED_SPACE=0
    689    test -r $TARGET/$KNOPPIX_DIR/$KNOPPIX_NAME && USED_SPACE=$(/usr/bin/du -s $TARGET/$KNOPPIX_DIR/$KNOPPIX_NAME | /usr/bin/gawk '{ print $1 }')
    690    FOUNDSPACE="$(/bin/df -k $TARGET | /usr/bin/tail -1 | /usr/bin/gawk '{ print $4+int('$USED_SPACE') }')"
     690   test -r $TARGET/$KNOPPIX_DIR/$KNOPPIX_NAME && USED_SPACE=$(/bbin/du -s $TARGET/$KNOPPIX_DIR/$KNOPPIX_NAME | /bbin/awk '{ print $1 }')
     691   FOUNDSPACE="$(/KNOPPIX/bin/df -k $TARGET | /KNOPPIX/usr/bin/tail -1 | /bbin/awk '{ print $4+int('$USED_SPACE') }')"
    691692  ;;
    692693  *)
     
    703704 # do the real copy
    704705 echo "${CRE}${GREEN}Copying KNOPPIX ${MEDIUM} to ${MAGENTA}$TARGET_DEV_DESC${GREEN}... Please be patient. ${NORMAL}"
    705  if [ -z "$COPY_COMMAND" -a -x /usr/bin/rsync ]; then
     706 if [ -z "$COPY_COMMAND" -a -x /KNOPPIX/usr/bin/rsync ]; then
    706707  # first cp the small files
    707708  /lib/ld-2.7.so /KNOPPIX/usr/bin/rsync -a --exclude="$KNOPPIX_DIR/$KNOPPIX_NAME*" $COPY $TARGET # Copy Knoppix to $TARGET
Note: See TracChangeset for help on using the changeset viewer.