Ignore:
Timestamp:
Mar 7, 2015, 2:41:11 PM (5 years ago)
Author:
Bruno Cornec
Message:

Backports from 3.2 (rev 3336-3359):

  • Improve kernel 3.14+ detection for initramfs
  • Fix installation of parted2fdisk under rootfs by removing useless -s option of install
  • Remove usage of internal function basename in parted2fdisk use File::Basename instead
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/3.0/mindi/mindi

    r3347 r3360  
    733733    local lcMagicExt2fs="EXT2-fs: blocksize too small for device."
    734734    local lcMagicExt3fs="<3>EXT3-fs: blocksize too small for journal device."
    735     local lcMagicInitfs="<6>checking if image is initramfs...|[<]*6[>]*Unpacking initramfs...|<6>Trying to unpack rootfs image as initramfs"
     735    local lcMagicInitfs="<6>checking if image is initramfs...|[<]*6[>]*Unpacking initramfs...|[<]*6[>]*Trying to unpack rootfs image as initramfs"
    736736
    737737    # local variables
     
    25542554
    25552555TurnTgzIntoRdz() {
    2556     local tgz_dir_fname rdz_fname tempfile mountpoint old_pwd nodes kernelsize maxsize res currsize not_copied j k s w needed_modules_path
     2556    local tgz_dir_fname rdz_fname tempfile mountpoint old_pwd nodes kernelsize maxsize res currsize not_copied j k s w needed_modules_path d thelink
    25572557
    25582558    tgz_dir_fname=$1
     
    25912591        fi
    25922592    done
     2593
    25932594    LogFile "INFO: what is now in $mountpoint"
    25942595    ls -alR $mountpoint >> $LOGFILE
    25952596   
    25962597    # Check files before copying to discover configuration issues or McAfee preventing mindi reading these files
     2598    # copy from rootfs into mountpoint
    25972599    for f in $tgz_dir_fname/*; do
    25982600        if [ ! -r $f ]; then
     
    26022604        fi
    26032605    done
     2606    (cd etc ; ln -sf bashrc profile ; ln -sf bashrc shrc ; ln -sf ../proc/mounts mtab ; ln -sf ../sbin/init linuxrc)
     2607    ln -sf sbin/init linuxrc
    26042608    tar -zxf symlinks.tgz || Die "Cannot untar symlinks.tgz"
    26052609
     
    26192623   
    26202624    # Copy of files mandatory for ssh to automate mount if sshfs is used
    2621     mkdir $mountpoint/.ssh
     2625    mkdir -p $mountpoint/.ssh $mountpoint/tmp
    26222626    cp -a ~root/.ssh/* $mountpoint/.ssh 2> /dev/null
    26232627    cat > $mountpoint/tmp/myssh << EOF
Note: See TracChangeset for help on using the changeset viewer.