Magellan Linux

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 713 by niro, Thu Apr 10 20:52:33 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 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
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 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 138  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 246  generate_iso() Line 256  generate_iso()
256   popd   popd
257  }  }
258    
 generate_dvd()  
 {  
  echo Generating DVD Image ...  
  install -d ${CDISOROOT}  
  pushd ${CDISOROOT} &&  
  growisofs -dvd-compat \  
  -rock \  
  -full-iso9660-filenames \  
  -allow-leading-dots \  
  -disable-deep-relocation \  
  -output ${LIVECDROOT}/${CDISONAME} \  
  -eltorito-boot isolinux/isolinux.bin \  
  -eltorito-catalog isolinux/boot.cat \  
  -no-emul-boot \  
  -boot-load-size 4 \  
  -boot-info-table \  
  -volid "${CDID}" \  
  ${CDISOROOT} #&> /dev/null  
  popd  
 }  
   
259  enter_livecd()  enter_livecd()
260  {  {
261   mount -t sysfs sysfs ${CDCHROOTDIR}/proc   mount -t sysfs sysfs ${CDCHROOTDIR}/sys
262   mount -t proc proc ${CDCHROOTDIR}/proc   mount -t proc proc ${CDCHROOTDIR}/proc
263   mount -o bind /dev ${CDCHROOTDIR}/dev   mount -o bind /dev ${CDCHROOTDIR}/dev
264    
# Line 278  enter_livecd() Line 267  enter_livecd()
267   HOME=/root \   HOME=/root \
268   TERM=$TERM PS1='\u:\w\$ ' \   TERM=$TERM PS1='\u:\w\$ ' \
269   PATH=/bin:/usr/bin:/sbin:/usr/sbin \   PATH=/bin:/usr/bin:/sbin:/usr/sbin \
270     http_proxy=${http_proxy} \
271     ftp_proxy=${ftp_proxy} \
272     no_proxy=${no_proxy} \
273   /bin/bash -i   /bin/bash -i
274    
275     umount ${CDCHROOTDIR}/dev
276     umount ${CDCHROOTDIR}/proc
277     umount ${CDCHROOTDIR}/sys
278  }  }
279    
280  usage()  usage()
# Line 292  usage() Line 288  usage()
288   echo "    initrd     - generates a livecd suitable initrd"   echo "    initrd     - generates a livecd suitable initrd"
289   echo "    bootloader - installs the bootloader"   echo "    bootloader - installs the bootloader"
290   echo "    isogen     - generate the final livecd iso image"   echo "    isogen     - generate the final livecd iso image"
  echo "    dvdgen     - same as isogen but creates a dvd-image"  
291   echo "    all        - runs all tasks to get a livecd from zero"   echo "    all        - runs all tasks to get a livecd from zero"
292     echo "    enter      - enters the rootfs of a livecd"
293   echo   echo
294   echo "    for example '$(basename $0) all default'"   echo "    for example '$(basename $0) all default'"
295   echo "    creates a livecd using the default profile."   echo "    creates a livecd using the default profile."
# Line 310  case $1 in Line 306  case $1 in
306   initrd) generate_initrd;;   initrd) generate_initrd;;
307   bootloader) install_bootloader;;   bootloader) install_bootloader;;
308   isogen) generate_iso;;   isogen) generate_iso;;
  dvdgen) generate_dvd;;  
309   all)   all)
310   bootstrap_system   bootstrap_system
311   prepare_iso   prepare_iso
312   generate_rootfs   generate_rootfs
313   generate_initrd   generate_initrd
314   install_bootloader   install_bootloader
315   if [[ ${DEFINE_DVD} = 1 ]]   generate_iso
  then  
  generate_dvd  
  else  
  generate_iso  
  fi  
316   ;;   ;;
317     enter) enter_livecd ;;
318   *|'') usage;;   *|'') usage;;
319  esac  esac

Legend:
Removed from v.471  
changed lines
  Added in v.713