Changeset 1283


Ignore:
Timestamp:
Sep 29, 2009, 3:58:09 AM (9 years ago)
Author:
jrollins
Message:

make default suite 'squeeze', and clean up some logging

Location:
trunk/debirf/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/debirf/src/common

    r1195 r1283  
    3434# output debirf message to stdout
    3535msg() {
    36     echo "debirf: $@"
     36    echo "debirf> $@"
    3737}
    3838export -f msg
  • trunk/debirf/src/debirf

    r1280 r1283  
    8383
    8484create_debootstrap() {
     85    msg "distro/suite: ${DEBIRF_DISTRO}/${DEBIRF_SUITE}"
     86
    8587    local OPTS="--include=$INCLUDE --exclude=$EXCLUDE $DEBIRF_SUITE $DEBIRF_ROOT $DEBIRF_MIRROR"
    8688
     
    225227            ;;
    226228        *)
    227             DEBIRF_SUITE=${DEBIRF_SUITE:-"lenny"}
     229            DEBIRF_SUITE=${DEBIRF_SUITE:-"squeeze"}
    228230            ;;
    229231    esac
     
    257259    # check profile
    258260    if [ -d "$DEBIRF_PROFILE" ] ; then
    259         echo "Loading profile '$DEBIRF_PROFILE_NAME'..."
     261        msg "loading profile '$DEBIRF_PROFILE_NAME'..."
    260262        DEBIRF_CONF="$DEBIRF_PROFILE/debirf.conf"
    261263        DEBIRF_MODULES="$DEBIRF_PROFILE/modules"
     
    275277    # check modules directory
    276278    if [ ! -d "$DEBIRF_MODULES" ] || [ -z "$(ls "$DEBIRF_MODULES")" ] ; then
    277         echo "Modules directoy '$DEBIRF_MODULES' does not exist or is empty."
     279        echo "Modules directory '$DEBIRF_MODULES' does not exist or is empty."
    278280        usage_profile
    279281        exit 1
     
    316318    # check variables
    317319    if [ "$CHECK_VARS" ] ; then
    318         echo "Debirf variables:"
     320        msg "debirf variables:"
    319321        env | /bin/grep "^DEBIRF_"
    320322        read -p "enter to continue: " OK
     
    407409    if [ "$DEBIRF_KERNEL_PACKAGE" ] ; then
    408410        if [ -f "$DEBIRF_KERNEL_PACKAGE" ] ; then
    409             echo "Using kernel package '$DEBIRF_KERNEL_PACKAGE'."
     411            msg "using kernel package '$DEBIRF_KERNEL_PACKAGE'"
    410412        else
    411413            failure "Kernel package '$DEBIRF_KERNEL_PACKAGE' not found."
     
    418420        if [ -d "$DEBIRF_ROOT" ] ; then
    419421            if [ -z "$WRITE_MODE" ] ; then
    420                 echo "Debirf root already exists.  Select one of the following:"
     422                msg "debirf root already exists.  select one of the following:"
    421423                CASE1='new: delete the old root and create a new one'
    422424                CASE2='overwrite: leave the old root and debootstrap on top of it'
     
    473475       
    474476    else
    475         echo "Not building root."
     477        msg "not building root"
    476478    fi
    477479    ### END BUILD ROOT
     
    481483        msg "executing modules..."
    482484        run_modules
    483         msg "modules complete."
     485        msg "modules complete"
    484486    else
    485         echo "Not running modules."
     487        msg "not running modules"
    486488    fi
    487489    ### END RUN MODULES
     
    507509        msg "initrd: ${DEBIRF_BUILDD}/${INITRD}"
    508510    else
    509         echo "Not creating initramfs."
     511        msg "not creating initramfs."
    510512    fi
    511513    ### END BUILD INITRD
Note: See TracChangeset for help on using the changeset viewer.