Magellan Linux

Diff of /trunk/mlivecdbuild/mlivecdbuild.sh

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

revision 143 by niro, Fri Jul 1 17:15:42 2005 UTC revision 144 by niro, Sun Jul 3 17:17:35 2005 UTC
# Line 144  create_chrootdirs() { Line 144  create_chrootdirs() {
144   ## needed empty files (to prevent warnings only)   ## needed empty files (to prevent warnings only)
145   touch ${CDCHROOTDIR}/etc/env.d/dummy || die   touch ${CDCHROOTDIR}/etc/env.d/dummy || die
146   touch ${CDCHROOTDIR}/etc/profile || die   touch ${CDCHROOTDIR}/etc/profile || die
147     mkdir -p ${CDCHROOTDIR}/etc/rc.d/init.d || die
148     touch ${CDCHROOTDIR}/etc/rc.d/init.d/functions || die
149     ln -snf /etc/rc.d/init.d ${CDCHROOTDIR}/etc/init.d || die
150    
151   if [ -n "${DIE}" ]   if [ -n "${DIE}" ]
152   then   then
# Line 530  prepare_iso() { Line 533  prepare_iso() {
533   rm -f ${LIVECDROOT}/${CDISONAME}   rm -f ${LIVECDROOT}/${CDISONAME}
534   fi   fi
535    
536   #fixes some issues with xfree/xorg xkb   # fixes some issues with xfree/xorg xkb
537   if [ -L "${CDCHROOTDIR}/etc/X11/xkb" -a -d "/usr/X11R6/lib/X11/xkb" ]   if [ -L "${CDCHROOTDIR}/etc/X11/xkb" -a -d "/usr/X11R6/lib/X11/xkb" ]
538   then   then
539   mecho fixing xkb symlink   mecho fixing xkb symlink
# Line 561  prepare_iso() { Line 564  prepare_iso() {
564    cat ${CDLAYOUTDIR}/issue > \    cat ${CDLAYOUTDIR}/issue > \
565   ${CDCHROOTDIR}/etc/issue && \   ${CDCHROOTDIR}/etc/issue && \
566    chmod 0644 ${CDCHROOTDIR}/etc/issue && \    chmod 0644 ${CDCHROOTDIR}/etc/issue && \
567    echo "HOSTNAME=\"${CDHOSTNAME}\"" > ${CDCHROOTDIR}/etc/hostname )    echo "${CDHOSTNAME}" > ${CDCHROOTDIR}/etc/hostname )
568   evaluate_retval   evaluate_retval
569    
570   mecho Setting up services ...   mecho Setting up services ...
571   ( cat >> ${CDCHROOTDIR}/root/.bashrc << "EOF"   ( cat >> ${CDCHROOTDIR}/root/.bashrc << "EOF"
572    
573    #change mountfs with mountfslivecd    # change mountfs with mountfslivecd
574    rc-config del mountfs    rc-config del mountfs
575    rc-config add mountfslivecd    rc-config add mountfslivecd
576    
577    #add hardware detection    # add hardware detection
578    rc-config add hwdetect    rc-config add hwdetect
579    
580    #del checkfs    # del checkfs
581    rc-config del checkfs    rc-config del checkfs
582    
583    #exit    #exit
584    exit    exit
585  EOF  EOF
586    #run it    # run it
587    enter_chroot    enter_chroot
588    
589    #clean up    # clean up
590    if [ -e ${CDCHROOTDIR}/root/.bashrc ]    if [ -e ${CDCHROOTDIR}/root/.bashrc ]
591    then    then
592   rm ${CDCHROOTDIR}/root/.bashrc   rm ${CDCHROOTDIR}/root/.bashrc
# Line 610  EOF Line 613  EOF
613   exit   exit
614  EOF  EOF
615    
616   #run it   # run it
617   enter_chroot   enter_chroot
618   if [ -e ${CDCHROOTDIR}/root/.bashrc ]   if [ -e ${CDCHROOTDIR}/root/.bashrc ]
619   then   then

Legend:
Removed from v.143  
changed lines
  Added in v.144