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 712 by niro, Thu Apr 10 20:50:31 2008 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
    101   add_initrc "mage install ${i}"   add_initrc "mage ${cmd} ${i}"
    102   done   done
    103   add_initrc "mage clean"   add_initrc "mage clean"
    104    
    # 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
    # Line 144  prepare_iso() Line 147  prepare_iso()
    147   install -m 0644 $(get_profile fstab) ${CDCHROOTDIR}/etc/fstab || die   install -m 0644 $(get_profile fstab) ${CDCHROOTDIR}/etc/fstab || die
    148   install -m 0644 $(get_profile motd) ${CDCHROOTDIR}/etc/motd || die   install -m 0644 $(get_profile motd) ${CDCHROOTDIR}/etc/motd || die
    149   install -m 0644 $(get_profile issue) ${CDCHROOTDIR}/etc/issue || die   install -m 0644 $(get_profile issue) ${CDCHROOTDIR}/etc/issue || die
    150     install -m 0644 $(get_profile net.eth0) ${CDCHROOTDIR}/etc/conf.d/net.eth0 || die
    151   echo "${CDHOSTNAME}" > ${CDCHROOTDIR}/etc/hostname || die   echo "${CDHOSTNAME}" > ${CDCHROOTDIR}/etc/hostname || die
    152    
    153   echo Setting up services ...   echo Setting up services ...
    # Line 275  generate_dvd() Line 279  generate_dvd()
    279    
    280  enter_livecd()  enter_livecd()
    281  {  {
    282   mount -t sysfs sysfs ${CDCHROOTDIR}/proc   mount -t sysfs sysfs ${CDCHROOTDIR}/sys
    283   mount -t proc proc ${CDCHROOTDIR}/proc   mount -t proc proc ${CDCHROOTDIR}/proc
    284   mount -o bind /dev ${CDCHROOTDIR}/dev   mount -o bind /dev ${CDCHROOTDIR}/dev
    285    
    # Line 288  enter_livecd() Line 292  enter_livecd()
    292   ftp_proxy=${ftp_proxy} \   ftp_proxy=${ftp_proxy} \
    293   no_proxy=${no_proxy} \   no_proxy=${no_proxy} \
    294   /bin/bash -i   /bin/bash -i
    295    
    296     umount ${CDCHROOTDIR}/dev
    297     umount ${CDCHROOTDIR}/proc
    298     umount ${CDCHROOTDIR}/sys
    299  }  }
    300    
    301  usage()  usage()
    Legend:
    Removed from v.472  
    changed lines
      Added in v.712