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 473 by niro, Thu Apr 19 17:13:20 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 133  prepare_iso() Line 133  prepare_iso()
    133   echo Preparing LiveCD ISO Image ...   echo Preparing LiveCD ISO Image ...
    134    
    135   # fixes some issues with xfree/xorg xkb   # fixes some issues with xfree/xorg xkb
    136   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 ]]
    137   then   then
    138   rm ${CDCHROOTDIR}/etc/X11/xkb || die   rm ${CDCHROOTDIR}/etc/X11/xkb || die
    139   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.473