Changeset 1015


Ignore:
Timestamp:
Mar 7, 2008, 5:43:32 PM (10 years ago)
Author:
jrollins
Message:

change DISTRO to SUITE

Location:
trunk/debirf
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/debirf/debian/changelog

    r1014 r1015  
    44    bashism in script.
    55  * add DEBIRF_KEYRING variable to debirf.conf files.
     6  * change DISTRO to SUITE (closes CMRG #89)
    67
    7  -- Jameson Rollins <jrollins@fifthhorseman.net>  Wed, 05 Mar 2008 19:02:24 -0500
     8 -- Jameson Rollins <jrollins@fifthhorseman.net>  Wed, 05 Mar 2008 19:12:33 -0500
    89
    910debirf (0.17-1) unstable; urgency=low
  • trunk/debirf/docs/example-profiles/minimal/debirf.conf

    r1014 r1015  
    1212#DEBIRF_MIRROR="http://mirrors.kernel.org/debian"
    1313
    14 # what distribution should debirf be built from?
    15 #DEBIRF_DISTRO="lenny"
     14# what suite should debirf be built from?
     15#DEBIRF_SUITE="lenny"
    1616
    1717# what keyring should be used to verify the debootstrap?
  • trunk/debirf/docs/example-profiles/rescue/debirf.conf

    r1014 r1015  
    1212#DEBIRF_MIRROR="http://mirrors.kernel.org/debian"
    1313
    14 # what distribution should debirf be built from?
    15 #DEBIRF_DISTRO="lenny"
     14# what suite should debirf be built from?
     15#DEBIRF_SUITE="lenny"
    1616
    1717# what keyring should be used to verify the debootstrap?
  • trunk/debirf/docs/example-profiles/xkiosk/debirf.conf

    r1014 r1015  
    1212#DEBIRF_MIRROR="http://mirrors.kernel.org/debian"
    1313
    14 # what distribution should debirf be built from?
    15 #DEBIRF_DISTRO="lenny"
     14# what suite should debirf be built from?
     15#DEBIRF_SUITE="lenny"
    1616
    1717# what keyring should be used to verify the debootstrap?
  • trunk/debirf/fs/usr/bin/debirf

    r1014 r1015  
    8989    fi
    9090    if [ "$ROOT_BUILD" = 'true' ] ; then
    91         /usr/sbin/debootstrap  --include="$INCLUDE" --exclude="$EXCLUDE" ${DEBIRF_KROPT+"$DEBIRF_KROPT"} "$DEBIRF_DISTRO" "$DEBIRF_ROOT" "$DEBIRF_MIRROR"
    92     else
    93         fakeroot_if_needed fakechroot /usr/sbin/debootstrap --variant=fakechroot --include="$INCLUDE" --exclude="$EXCLUDE" ${DEBIRF_KROPT+"$DEBIRF_KROPT"} "$DEBIRF_DISTRO" "$DEBIRF_ROOT" "$DEBIRF_MIRROR"
     91        /usr/sbin/debootstrap  --include="$INCLUDE" --exclude="$EXCLUDE" ${DEBIRF_KROPT+"$DEBIRF_KROPT"} "$DEBIRF_SUITE" "$DEBIRF_ROOT" "$DEBIRF_MIRROR"
     92    else
     93        fakeroot_if_needed fakechroot /usr/sbin/debootstrap --variant=fakechroot --include="$INCLUDE" --exclude="$EXCLUDE" ${DEBIRF_KROPT+"$DEBIRF_KROPT"} "$DEBIRF_SUITE" "$DEBIRF_ROOT" "$DEBIRF_MIRROR"
    9494    fi
    9595    fakeroot_if_needed mv "$DEBIRF_ROOT"/var/log/bootstrap.log "$DEBIRF_BUILDD"/.bootstrap.log
     
    443443        # determine initrd name
    444444        KERNEL_VERS=$(ls -1 "$DEBIRF_ROOT/lib/modules" | head -n1)
    445         DEBIRF_INITRD="${DEBIRF_BUILDD}/${DEBIRF_LABEL}_${DEBIRF_DISTRO}_${KERNEL_VERS}.cgz"
     445        DEBIRF_INITRD="${DEBIRF_BUILDD}/${DEBIRF_LABEL}_${DEBIRF_SUITE}_${KERNEL_VERS}.cgz"
    446446       
    447447        msg "creating debirf initrd ('$DEBIRF_METHOD')..."
  • trunk/debirf/fs/usr/share/debirf/debirf.conf.defaults

    r980 r1015  
    11### debirf.conf defaults
    22
    3 # debirf label
     3# label
    44DEBIRF_LABEL=${DEBIRF_LABEL:-"debirf"}
    55
     
    1313DEBIRF_MIRROR=${DEBIRF_MIRROR:-"http://mirrors.kernel.org/debian"}
    1414
    15 # what distribution should debirf be built from?
    16 DEBIRF_DISTRO=${DEBIRF_DISTRO:-"lenny"}
     15# Debian suite
     16DEBIRF_SUITE=${DEBIRF_SUITE:-"lenny"}
    1717
    18 # what keyring should be used to verify the debootstrap?
     18# Debian debootstrap verification keyring
    1919DEBIRF_KEYRING=${DEBIRF_KEYRING:-"/usr/share/keyrings/debian-archive-keyring.gpg"}
Note: See TracChangeset for help on using the changeset viewer.