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 471 by niro, Thu Apr 19 17:03:14 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 86  custom_packages() Line 86  custom_packages()
    86   if [[ -n ${packages} ]]   if [[ -n ${packages} ]]
    87   then   then
    88   :> ${CDCHROOTDIR}/.installrc   :> ${CDCHROOTDIR}/.installrc
    89    
    90     # respect proxies
    91     [[ -n ${http_proxy} ]] && add_initrc "export http_proxy=${http_proxy}"
    92     [[ -n ${ftp_proxy} ]] && add_initrc "export ftp_proxy=${ftp_proxy}"
    93     [[ -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 127  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
    # Line 278  enter_livecd() Line 287  enter_livecd()
    287   HOME=/root \   HOME=/root \
    288   TERM=$TERM PS1='\u:\w\$ ' \   TERM=$TERM PS1='\u:\w\$ ' \
    289   PATH=/bin:/usr/bin:/sbin:/usr/sbin \   PATH=/bin:/usr/bin:/sbin:/usr/sbin \
    290     http_proxy=${http_proxy} \
    291     ftp_proxy=${ftp_proxy} \
    292     no_proxy=${no_proxy} \
    293   /bin/bash -i   /bin/bash -i
    294  }  }
    295    
    # Line 294  usage() Line 306  usage()
    306   echo "    isogen     - generate the final livecd iso image"   echo "    isogen     - generate the final livecd iso image"
    307   echo "    dvdgen     - same as isogen but creates a dvd-image"   echo "    dvdgen     - same as isogen but creates a dvd-image"
    308   echo "    all        - runs all tasks to get a livecd from zero"   echo "    all        - runs all tasks to get a livecd from zero"
    309     echo "    enter      - enters the rootfs of a livecd"
    310   echo   echo
    311   echo "    for example '$(basename $0) all default'"   echo "    for example '$(basename $0) all default'"
    312   echo "    creates a livecd using the default profile."   echo "    creates a livecd using the default profile."
    # Line 324  case $1 in Line 337  case $1 in
    337   generate_iso   generate_iso
    338   fi   fi
    339   ;;   ;;
    340     enter) enter_livecd ;;
    341   *|'') usage;;   *|'') usage;;
    342  esac  esac
    Legend:
    Removed from v.471  
    changed lines
      Added in v.580