Changeset 3426


Ignore:
Timestamp:
Aug 27, 2015, 2:02:34 AM (3 years ago)
Author:
bruno
Message:
  • Fix some log msgs
  • Fix DESC on RHEL7
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/3.2/mindi/mindi

    r3425 r3426  
    17121712            DESC="$DESC $(tac /var/log/pacman.log | grep -m1 'full system upgrade' | cut -d']' -f1)]"
    17131713        fi
     1714    elif [ -x "/etc/os-release" ]; then
     1715        DESC=`grep PRETTY_NAME /etc/os-release | cut -d= -f2`
     1716    elif [ -x "/usr/bin/pbdistrocheck" ]; then
     1717        # For pb >= 0.9.8
     1718        DESC=`/usr/bin/pbdistrocheck -s | cut -d, -f1-4 | sed 's/,/-/g'`
    17141719    elif [ -r /etc/issue.net ]; then
    17151720        DESC=`head -1 /etc/issue.net`
    17161721    elif [ -r /etc/issue ]; then
    17171722        DESC=`head -1 /etc/issue`
    1718     elif [ -x "/usr/bin/pbdistrocheck" ]; then
    1719         # For pb >= 0.9.8
    1720         DESC=`/usr/bin/pbdistrocheck -s | cut -d, -f1-4`
    17211723    else
    17221724        DESC="Unknown desc"
     
    31993201           kernelname=$KERVERRUN
    32003202        else
    3201            LogAll "Using modules for kernel: ${kernelname}"
     3203           LogAll "INFO: Using modules for kernel: ${kernelname}"
    32023204        fi
    32033205        LogAll "INFO: kernelname = $kernelname"
     
    32633265    LogIt "------------------------------------------------------------------------------"
    32643266else
    3265     LogFile "INFO: You are using Mindi-Linux v$MINDI_VERSION to make boot+data disks"
     3267    LogFile "INFO: You are using Mindi v$MINDI_VERSION to make boot+data disks"
    32663268fi
    32673269if [ -f $MINDI_LIB/rootfs/usr/bin/busybox ]; then
    3268     LogIt "Mindi-`$MINDI_LIB/rootfs/usr/bin/busybox 2>&1 | head -1`"
     3270    LogIt "INFO: Mindi-`$MINDI_LIB/rootfs/usr/bin/busybox 2>&1 | head -1`"
    32693271else
    32703272    LogIt "ERROR: Unable to find mindi-busybox, please install it"
Note: See TracChangeset for help on using the changeset viewer.