Magellan Linux

  • Back to homepage
    • /[magellan-source]/trunk/mlivecdbuild/mlivecdbuild2.sh

    Diff of /trunk/mlivecdbuild/mlivecdbuild2.sh

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 472 by niro, Thu Apr 19 17:09:17 2007 UTC revision 580 by niro, Fri Oct 12 21:29:13 2007 UTC
    # Line 72  add_initrc() Line 72  add_initrc()
    72   local var="$1"   local var="$1"
    73    
    74   # sanity checks   # sanity checks
    75   [ -z "${CDCHROOTDIR}" ] && die "\$CDCHROOTDIR not given."   [[ -z ${CDCHROOTDIR} ]] && die "\$CDCHROOTDIR not given."
    76   echo "${var}" >> ${CDCHROOTDIR}/.installrc || die "add_initrc() adding \$var"   echo "${var}" >> ${CDCHROOTDIR}/.installrc || die "add_initrc() adding \$var"
    77  }  }
    78    
    # Line 92  custom_packages() Line 92  custom_packages()
    92   [[ -n ${ftp_proxy} ]] && add_initrc "export ftp_proxy=${ftp_proxy}"   [[ -n ${ftp_proxy} ]] && add_initrc "export ftp_proxy=${ftp_proxy}"
    93   [[ -n ${no_proxy} ]] && add_initrc "export no_proxy=${no_proxy}"   [[ -n ${no_proxy} ]] && add_initrc "export no_proxy=${no_proxy}"
    94    
    95     # do not auto-start any services!
    96     add_initrc "export MAGE_BOOTSTRAP=true"
    97    
    98   local i   local i
    99   for i in ${packages}   for i in ${packages}
    100   do   do
    # Line 133  prepare_iso() Line 136  prepare_iso()
    136   echo Preparing LiveCD ISO Image ...   echo Preparing LiveCD ISO Image ...
    137    
    138   # fixes some issues with xfree/xorg xkb   # fixes some issues with xfree/xorg xkb
    139   if [ -L "${CDCHROOTDIR}/etc/X11/xkb" -a -d "/usr/X11R6/lib/X11/xkb" ]   if [[ -L ${CDCHROOTDIR}/etc/X11/xkb ]] && [[ -d /usr/X11R6/lib/X11/xkb ]]
    140   then   then
    141   rm ${CDCHROOTDIR}/etc/X11/xkb || die   rm ${CDCHROOTDIR}/etc/X11/xkb || die
    142   mv ${CDCHROOTDIR}/usr/X11R6/lib/X11/xkb ${CDCHROOTDIR}/etc/X11 || die   mv ${CDCHROOTDIR}/usr/X11R6/lib/X11/xkb ${CDCHROOTDIR}/etc/X11 || die
    Legend:
    Removed from v.472  
    changed lines
      Added in v.580