Magellan Linux

  • Back to homepage
    • /[magellan-source]/trunk/mlivecdbuild/mlivecdbuild.sh

    Diff of /trunk/mlivecdbuild/mlivecdbuild.sh

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

    revision 26 by niro, Wed Jan 5 05:29:26 2005 UTC revision 144 by niro, Sun Jul 3 17:17:35 2005 UTC
    # Line 13  export CDCHROOTDIR=${LIVECDROOT}/chroot Line 13  export CDCHROOTDIR=${LIVECDROOT}/chroot
    13  export CDISOROOT=${LIVECDROOT}/isoroot  export CDISOROOT=${LIVECDROOT}/isoroot
    14  export CDMAGEDIR=${LIVECDROOT}/files/mage-src  export CDMAGEDIR=${LIVECDROOT}/files/mage-src
    15  export CDMAGERC=${CDMAGEDIR}/mage.rc  export CDMAGERC=${CDMAGEDIR}/mage.rc
    16  export CDISONAME=magellan-livecd-i486.iso  export CDISONAME=magellan-livecd.iso
    17  export CDHOSTNAME=magellan-i486  export CDHOSTNAME=magellan-live
    18  export CDTOOLCHAIN=${LIVECDROOT}/files/magellan-toolchain-0.3-i486.tar.bz2  export CDTOOLCHAIN=${LIVECDROOT}/files/magellan-toolchain-0.3-i486.tar.bz2
    19  export CDLAYOUTDIR=${LIVECDROOT}/files/  export CDLAYOUTDIR=${LIVECDROOT}/files/
    20    
     ###export CDLAYOUTFILE=magellan_layout-i486  
    21  export CDLAYOUTFILE=magellan_layout-i686-mage-0.3.99-r1-kernel26  export CDLAYOUTFILE=magellan_layout-i686-mage-0.3.99-r1-kernel26
    22    
    23    
    24  #usbstick: vfat doesn't like CAPS and strings longer than 8 chars  # usbstick: vfat doesn't like CAPS and strings longer than 8 chars
    25  export CDID=cdid  export CDID=cdid
    26  export VERSION=0.3.6-r7  export VERSION=0.3.6-r7
    27  export CDINITRD=${LIVECDROOT}/mntinitrd  export CDINITRD=${LIVECDROOT}/mntinitrd
    28  export CDISOLOOP=${LIVECDROOT}/isoloop  export CDISOLOOP=${LIVECDROOT}/isoloop
    29  #export CDISOLOOPSIZE=400000  
    30  #autodeterminate loopsize + 20MB will be used later in script  # kernel 2.4.22 needs cloop-1.02, smaller or above will not work >:/ *grrr*
     #export CDISOLOOPSIZE="$(expr 20000 + $(du -Ds ${CDCHROOTDIR}|cut -d 'c' -f1))"  
     #kernel 2.4.22 needs cloop-1.02, smaller or above will not work >:/ *grrr*  
    31  export CLOOPFILE=cloop-1.02-precompiled.tar.bz2  export CLOOPFILE=cloop-1.02-precompiled.tar.bz2
    32  export CLOOPDIR=cloop-1.02  export CLOOPDIR=cloop-1.02
    33    
    34  #busybox-0.60.3 is official stable  # busybox-0.60.3 is official stable
     #export BUSYBOXFILE=busybox-0.60.3-precompiled.tar.bz2  
     #export BUSYBOXDIR=busybox-0.60.3  
    35  export BUSYBOXFILE=busybox-1.00-precompiled.tar.bz2  export BUSYBOXFILE=busybox-1.00-precompiled.tar.bz2
    36  export BUSYBOXDIR=busybox-1.00  export BUSYBOXDIR=busybox-1.00
    37    
    # Line 87  showversion() { Line 82  showversion() {
    82  }  }
    83    
    84  create_chrootdirs() {  create_chrootdirs() {
    85   #creating directories   # creating directories
    86   mkdir -p ${CDCHROOTDIR}/{bin,boot,dev/shm,etc,home,lib/dev-state,mnt,proc} \   mkdir -p ${CDCHROOTDIR}/{bin,boot,dev/shm,etc,home,lib/dev-state,mnt,proc} \
    87   &>/dev/null || die   &>/dev/null || die
    88   mkdir -p ${CDCHROOTDIR}/etc/{opt,env.d} &>/dev/null || die   mkdir -p ${CDCHROOTDIR}/etc/{opt,env.d} &>/dev/null || die
    # Line 136  create_chrootdirs() { Line 131  create_chrootdirs() {
    131    
    132   ##Creating the bash and sh symlinks   ##Creating the bash and sh symlinks
    133   ln -s /tools/bin/{bash,cat,pwd,stty} ${CDCHROOTDIR}/bin &>/dev/null || die   ln -s /tools/bin/{bash,cat,pwd,stty} ${CDCHROOTDIR}/bin &>/dev/null || die
    134   ln -s /tools/bin/perl ${CDCHROOTDIR}/usr/bin &>/dev/null || die   #ln -s /tools/bin/perl ${CDCHROOTDIR}/usr/bin &>/dev/null || die
    135   ln -s /tools/lib/libgcc_s.so.1 ${CDCHROOTDIR}/usr/lib &>/dev/null || die   ln -s /tools/lib/libgcc_s.so.1 ${CDCHROOTDIR}/usr/lib &>/dev/null || die
    136   ln -s bash ${CDCHROOTDIR}/bin/sh &>/dev/null || die   ln -s bash ${CDCHROOTDIR}/bin/sh &>/dev/null || die
      #needed by >=mage-0.3.4-r2  
    137   ln -s /tools/bin/{basename,cut,fgrep,grep} ${CDCHROOTDIR}/bin &>/dev/null || die   ln -s /tools/bin/{basename,cut,fgrep,grep} ${CDCHROOTDIR}/bin &>/dev/null || die
    138   ln -s /tools/bin/whoami ${CDCHROOTDIR}/usr/bin &>/dev/null || die   ln -s /tools/bin/whoami ${CDCHROOTDIR}/usr/bin &>/dev/null || die
      #needed by >=mage-0.3.6-r2  
    139   ln -s /tools/bin/{date,ls,egrep,wc} ${CDCHROOTDIR}/bin &>/dev/null || die   ln -s /tools/bin/{date,ls,egrep,wc} ${CDCHROOTDIR}/bin &>/dev/null || die
    140   ln -s /tools/sbin/ldconfig ${CDCHROOTDIR}/sbin/ldconfig &>/dev/null || die   ln -s /tools/sbin/ldconfig ${CDCHROOTDIR}/sbin/ldconfig &>/dev/null || die
       
      #needed by >=mage-0.3.6-r6  
      touch ${CDCHROOTDIR}/etc/env.d/dummy || die  
      touch ${CDCHROOTDIR}/etc/profile || die  
    141   ln -s /tools/bin/sed ${CDCHROOTDIR}/bin || die   ln -s /tools/bin/sed ${CDCHROOTDIR}/bin || die
    142   ln -s /tools/bin/dirname ${CDCHROOTDIR}/usr/bin || die   ln -s /tools/bin/dirname ${CDCHROOTDIR}/usr/bin || die
    143    
    144     ## needed empty files (to prevent warnings only)
    145     touch ${CDCHROOTDIR}/etc/env.d/dummy || die
    146     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
    153   return 1   return 1
    # Line 188  chroot_generate() { Line 184  chroot_generate() {
    184   create_chrootdirs   create_chrootdirs
    185   evaluate_retval   evaluate_retval
    186    
    187   mecho Creating needed devices for devfs ...   mecho Creating needed devices for devfs/udev ...
    188   ( mknod -m 611 ${CDCHROOTDIR}/dev/console c 5 1 &>/dev/null && \   ( mknod -m 611 ${CDCHROOTDIR}/dev/console c 5 1 &>/dev/null && \
    189   chgrp 4 ${CDCHROOTDIR}/dev/console &>/dev/null &&   chgrp 4 ${CDCHROOTDIR}/dev/console &>/dev/null &&
    190   mknod -m 666 ${CDCHROOTDIR}/dev/null c 1 3 &>/dev/null )   mknod -m 666 ${CDCHROOTDIR}/dev/null c 1 3 &>/dev/null )
    # Line 216  dialout:x:10: Line 212  dialout:x:10:
    212  audio:x:11:  audio:x:11:
    213  EOF  EOF
    214   evaluate_retval   evaluate_retval
       
      #touch ${LIVECDROOT}/.chrootok  
    215  }  }
    216    
    217  enter_chroot() {  enter_chroot() {
    218   secho Entering Chroot ...   secho Entering Chroot ...
    219   mount proc ${CDCHROOTDIR}/proc -t proc   mount proc ${CDCHROOTDIR}/proc -t proc
    220   mount devfs ${CDCHROOTDIR}/dev -t devfs   # devfs is deprecated with kernel-2.6
    221     #mount devfs ${CDCHROOTDIR}/dev -t devfs
    222     mount -o bind /dev ${CDCHROOTDIR}/dev
    223    
    224   getstate   getstate
    225   if [ "${CDSTATE}" != "null" ]   if [ "${CDSTATE}" != "null" ]
    # Line 247  enter_chroot() { Line 243  enter_chroot() {
    243    
    244  install_mage_bashrc() {  install_mage_bashrc() {
    245   cat >> ${CDCHROOTDIR}/root/.bashrc << "EOF"   cat >> ${CDCHROOTDIR}/root/.bashrc << "EOF"
      #secho Installing MAGE ...  
       
      #not needed anymore  
      #mecho Creating MAGE directories ...  
      #( source /bootstrap/mage.rc && \  
      #  install -d ${PKGDIR} && \  
      #  install -d ${BUILDDIR} && \  
      #  install -d ${INSTALLDB} && \  
      #  install -d ${MAGEDIR} && \  
      #  install -d /etc && \  
      #  install -d /sbin && \  
      #  install -d /usr/lib/mage )  
      #evaluate_retval  
       
      #not needed anymore  
      #mecho Installing MAGE files ...  
      #( install -m0755 --owner root --group root \  
      # /bootstrap/{depwanderer.sh,mage3.sh,mage3.functions.sh} \  
      # /usr/lib/mage && \  
      #  ln -s /usr/lib/mage/mage3.sh /sbin/mage && \  
      #  install -m0644 /bootstrap/mage.rc /etc )  
      #evaluate_retval  
       
    246   mecho Updating MAGE tree ...   mecho Updating MAGE tree ...
    247   mage update &> /dev/null   mage update &> /dev/null
    248   evaluate_retval   evaluate_retval
    # Line 291  install_cdlayout_bashrc() { Line 264  install_cdlayout_bashrc() {
    264   evaluate_retval   evaluate_retval
    265   fi   fi
    266   done   done
    267    
    268   #needed for >=mage-0.3.6   #needed for >=mage-0.3.6
    269   mecho Running etc-update ...   mecho Running etc-update ...
    270   etc-update   etc-update
    # Line 330  EOF Line 303  EOF
    303    
    304  cleanup_chrootdir() {  cleanup_chrootdir() {
    305   secho Cleaning up Chroot directory ...   secho Cleaning up Chroot directory ...
    306    
    307   mecho Deleting bootstrap files ...   mecho Deleting bootstrap files ...
    308   rm -rf ${CDCHROOTDIR}/bootstrap   rm -rf ${CDCHROOTDIR}/bootstrap
    309   evaluate_retval   evaluate_retval
    # Line 350  cleanup_chrootdir() { Line 323  cleanup_chrootdir() {
    323  build_bootstrap() {  build_bootstrap() {
    324   secho Preparing Chroot ...   secho Preparing Chroot ...
    325   mecho Copy MAGE files to Chroot ...   mecho Copy MAGE files to Chroot ...
      #( mkdir ${CDCHROOTDIR}/bootstrap && \  
      #  cp ${CDMAGEDIR}/{depwanderer.sh,mage3.sh,mage3.functions.sh} \  
      # ${CDCHROOTDIR}/bootstrap && \  
      #  cp ${CDMAGERC} ${CDCHROOTDIR}/bootstrap )  
    326   ( install -d ${CDCHROOTDIR}/bootstrap && \   ( install -d ${CDCHROOTDIR}/bootstrap && \
    327    cp -R ${CDMAGEDIR}/* ${CDCHROOTDIR}/bootstrap )    cp -R ${CDMAGEDIR}/* ${CDCHROOTDIR}/bootstrap )
    328   evaluate_retval   evaluate_retval
    329    
    330   #installing mage to CDCHROOTDIR   # installing mage to CDCHROOTDIR
    331   mecho Installing Mage ...   mecho Installing Mage ...
    332   ( chmod 0755 ${CDCHROOTDIR}/bootstrap/setup_mage.sh && \   ( chmod 0755 ${CDCHROOTDIR}/bootstrap/setup_mage.sh && \
    333    ${CDCHROOTDIR}/bootstrap/setup_mage.sh \    ${CDCHROOTDIR}/bootstrap/setup_mage.sh \
    # Line 378  build_bootstrap() { Line 347  build_bootstrap() {
    347    
    348   mecho Mounting Chroot filesystems ...   mecho Mounting Chroot filesystems ...
    349   ( mount proc ${CDCHROOTDIR}/proc -t proc && \   ( mount proc ${CDCHROOTDIR}/proc -t proc && \
    350    mount devfs ${CDCHROOTDIR}/dev -t devfs )    mount -o bind /dev ${CDCHROOTDIR}/dev )
    351   evaluate_retval   evaluate_retval
    352    
    353   secho Starting bootstrap ...   secho Starting bootstrap ...
    # Line 391  build_bootstrap() { Line 360  build_bootstrap() {
    360   ( umount ${CDCHROOTDIR}/proc && \   ( umount ${CDCHROOTDIR}/proc && \
    361   umount ${CDCHROOTDIR}/dev )   umount ${CDCHROOTDIR}/dev )
    362   evaluate_retval   evaluate_retval
    363    
    364   touch ${LIVECDROOT}/.bootstrapok   touch ${LIVECDROOT}/.bootstrapok
    365  }  }
    366    
    367    
     ############# new initrd style with busybox and cloop support ######################  
    368  build_initrd() {  build_initrd() {
    369   secho Building initrd ...   secho Building initrd ...
    370    
    # Line 411  build_initrd() { Line 379  build_initrd() {
    379   mecho Removing old initrd.gz   mecho Removing old initrd.gz
    380   rm -f ${LIVECDROOT}/initrd.gz   rm -f ${LIVECDROOT}/initrd.gz
    381   fi   fi
    382    
    383   if [ -d ${LIVECDROOT}/tmp/${CLOOPDIR} ]   if [ -d ${LIVECDROOT}/tmp/${CLOOPDIR} ]
    384   then   then
    385   mecho Removing old cloop files   mecho Removing old cloop files
    386   rm -rf ${LIVECDROOT}/tmp/${CLOOPDIR}   rm -rf ${LIVECDROOT}/tmp/${CLOOPDIR}
    387   fi   fi
    388    
    389   if [ -d ${LIVECDROOT}/tmp/${BUSYBOXDIR} ]   if [ -d ${LIVECDROOT}/tmp/${BUSYBOXDIR} ]
    390   then   then
    391   mecho Removing old busybox files   mecho Removing old busybox files
    392   rm -rf ${LIVECDROOT}/tmp/${BUSYBOXDIR}   rm -rf ${LIVECDROOT}/tmp/${BUSYBOXDIR}
    393   fi   fi
    394    
    395   mecho Unpacking needed files ...   mecho Unpacking needed files ...
    396   ( mkdir -p ${LIVECDROOT}/tmp && \   ( mkdir -p ${LIVECDROOT}/tmp && \
    397    tar xjf ${CDLAYOUTDIR}/${CLOOPFILE} -C ${LIVECDROOT}/tmp && \    tar xjf ${CDLAYOUTDIR}/${CLOOPFILE} -C ${LIVECDROOT}/tmp && \
    398    tar xjf ${CDLAYOUTDIR}/${BUSYBOXFILE} -C ${LIVECDROOT}/tmp )    tar xjf ${CDLAYOUTDIR}/${BUSYBOXFILE} -C ${LIVECDROOT}/tmp )
    399   evaluate_retval   evaluate_retval
    400    
    401   mecho Creating Image file ...   mecho Creating Image file ...
    402   dd if=/dev/zero of=${LIVECDROOT}/initrd bs=1024 count=6144 \   dd if=/dev/zero of=${LIVECDROOT}/initrd bs=1024 count=6144 \
    403   &> /dev/null   &> /dev/null
    # Line 452  proc            /proc         proc   def Line 420  proc            /proc         proc   def
    420  EOF  EOF
    421   #installing cloop   #installing cloop
    422    cp ${LIVECDROOT}/tmp/${CLOOPDIR}/cloop.o ${CDINITRD}/lib/modules/misc && \    cp ${LIVECDROOT}/tmp/${CLOOPDIR}/cloop.o ${CDINITRD}/lib/modules/misc && \
    423      
    424   #installing busybox   #installing busybox
    425    cp ${LIVECDROOT}/tmp/${BUSYBOXDIR}/busybox ${CDINITRD}/bin && \    cp ${LIVECDROOT}/tmp/${BUSYBOXDIR}/busybox ${CDINITRD}/bin && \
    426    chmod 0755 ${CDINITRD}/bin/busybox && \    chmod 0755 ${CDINITRD}/bin/busybox && \
    # Line 464  EOF Line 432  EOF
    432                  rm -f ${CDINITRD}/bin/$i                  rm -f ${CDINITRD}/bin/$i
    433                  ln ${CDINITRD}/bin/busybox ${CDINITRD}/bin/$i                  ln ${CDINITRD}/bin/busybox ${CDINITRD}/bin/$i
    434            done && \            done && \
    435    #symlink bin to sbin -> init inmod resist normally in sbin    #symlink bin to sbin -> init & insmod resist normally in sbin
    436    ln -s bin ${CDINITRD}/sbin && \    ln -s bin ${CDINITRD}/sbin && \
    437    ln -s ../bin ${CDINITRD}/usr/bin && \    ln -s ../bin ${CDINITRD}/usr/bin && \
    438    ln -s ../bin ${CDINITRD}/usr/sbin && \    ln -s ../bin ${CDINITRD}/usr/sbin && \
    # Line 475  EOF Line 443  EOF
    443    ./MAKEDEV -v generic-nopty &> /dev/null && \    ./MAKEDEV -v generic-nopty &> /dev/null && \
    444    cd ${LIVECDROOT} && \    cd ${LIVECDROOT} && \
    445    mknod -m 600 ${CDINITRD}/dev/console c 5 1 && \    mknod -m 600 ${CDINITRD}/dev/console c 5 1 && \
    446    mknod -m 666 ${CDINITRD}/dev/null c 1 3    mknod -m 666 ${CDINITRD}/dev/null c 1 3
    447    cp ${CDCHROOTDIR}/etc/conf.d/kernel ${CDINITRD}/etc/conf.d/kernel )    cp ${CDCHROOTDIR}/etc/conf.d/kernel ${CDINITRD}/etc/conf.d/kernel )
    448   evaluate_retval   evaluate_retval
    449    
    # Line 498  EOF Line 466  EOF
    466   evaluate_retval   evaluate_retval
    467   fi   fi
    468    
    469   #install modules   # install modules
    470   install -d ${CDINITRD}/modules   install -d ${CDINITRD}/modules
    471   source ${CDISOROOT}/isolinux/kernelversion   source ${CDCHROOTDIR}/boot/kernelversion
    472   CDMODDIR=${CDCHROOTDIR}/lib/modules/${KRNLIB}/kernel   CDMODDIR=${CDCHROOTDIR}/lib/modules/${KRNLIB}/kernel
    473    
    474   if [ -e ${CDLAYOUTDIR}/mods_scsi ]   if [ -e ${CDLAYOUTDIR}/mods_scsi ]
    # Line 509  EOF Line 477  EOF
    477   install -d ${CDINITRD}/modules/scsi   install -d ${CDINITRD}/modules/scsi
    478   for i in $(< ${CDLAYOUTDIR}/mods_scsi)   for i in $(< ${CDLAYOUTDIR}/mods_scsi)
    479   do   do
      #cp -a ${CDMODDIR}/scsi/${i}.* ${CDINITRD}/modules/scsi  
    480   find ${CDMODDIR} -type f -name ${i}* -exec cp -a '{}' ${CDINITRD}/modules/scsi ';'   find ${CDMODDIR} -type f -name ${i}* -exec cp -a '{}' ${CDINITRD}/modules/scsi ';'
    481   done   done
    482   cat ${CDLAYOUTDIR}/mods_scsi > ${CDINITRD}/mods_scsi   cat ${CDLAYOUTDIR}/mods_scsi > ${CDINITRD}/mods_scsi
    # Line 521  EOF Line 488  EOF
    488   install -d ${CDINITRD}/modules/usb   install -d ${CDINITRD}/modules/usb
    489   for i in $(< ${CDLAYOUTDIR}/mods_usb)   for i in $(< ${CDLAYOUTDIR}/mods_usb)
    490   do   do
      #cp -a ${CDMODDIR}/usb/${i}.* ${CDINITRD}/modules/usb  
    491   find ${CDMODDIR} -type f -name ${i}* -exec cp -a '{}' ${CDINITRD}/modules/usb ';'   find ${CDMODDIR} -type f -name ${i}* -exec cp -a '{}' ${CDINITRD}/modules/usb ';'
    492   done   done
    493   cat ${CDLAYOUTDIR}/mods_usb > ${CDINITRD}/mods_usb   cat ${CDLAYOUTDIR}/mods_usb > ${CDINITRD}/mods_usb
    494   fi   fi
    495    
    496   #install insmod   #install insmod
      #[ -L ${CDINITRD}/bin/insmod ] && rm ${CDINITRD}/bin/insmod  
    497   cp -a ${CDCHROOTDIR}/sbin/insmod.static ${CDINITRD}/bin/insmod.static   cp -a ${CDCHROOTDIR}/sbin/insmod.static ${CDINITRD}/bin/insmod.static
    498   cp -a ${CDCHROOTDIR}/sbin/insmod.static.old ${CDINITRD}/bin/insmod.static.old   cp -a ${CDCHROOTDIR}/sbin/insmod.static.old ${CDINITRD}/bin/insmod.static.old
    499    
    # Line 537  EOF Line 502  EOF
    502   cat ${CDCHROOTDIR}/etc/passwd > ${CDINITRD}/etc/passwd   cat ${CDCHROOTDIR}/etc/passwd > ${CDINITRD}/etc/passwd
    503   cat ${CDCHROOTDIR}/etc/group > ${CDINITRD}/etc/group   cat ${CDCHROOTDIR}/etc/group > ${CDINITRD}/etc/group
    504    
       
    505   #install static sed   #install static sed
    506   install -d ${CDINITRD}/bin   install -d ${CDINITRD}/bin
    507   tar xjf ${CDLAYOUTDIR}/${SEDFILE} -C ${LIVECDROOT}/tmp   tar xjf ${CDLAYOUTDIR}/${SEDFILE} -C ${LIVECDROOT}/tmp
    # Line 558  EOF Line 522  EOF
    522    
    523   touch ${LIVECDROOT}/.initrdok   touch ${LIVECDROOT}/.initrdok
    524  }  }
     #########################################################################################  
    525    
    526    
    527  prepare_iso() {  prepare_iso() {
    # Line 570  prepare_iso() { Line 533  prepare_iso() {
    533   rm -f ${LIVECDROOT}/${CDISONAME}   rm -f ${LIVECDROOT}/${CDISONAME}
    534   fi   fi
    535    
    536  # mecho Preparing Chroot ...   # fixes some issues with xfree/xorg xkb
     # ( mkdir -p ${CDCHROOTDIR}/fake/{needwrite,ramdisk} && \  
     #  touch ${CDCHROOTDIR}/fake/{needwrite,ramdisk}/.keep && \  
     # for i in dev etc var tmp root home  
     # do  
     # mv ${CDCHROOTDIR}/${i} \  
     # ${CDCHROOTDIR}/fake/needwrite/  
     # ln -s fake/needwrite/${i} ${CDCHROOTDIR}/${i}  
     # done )  
     # evaluate_retval  
       
      #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 612  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  #  mv ${CDCHROOTDIR}/etc/login.defs \    echo "${CDHOSTNAME}" > ${CDCHROOTDIR}/etc/hostname )
     # ${CDCHROOTDIR}/etc/login.defs-orig &&  
     #  sed \  
     # -e 's%#MOTD_FILE%MOTD_FILE%' \  
     #     ${CDCHROOTDIR}/etc/login.defs-orig > ${CDCROOTDIR}/etc/login.defs &&  
     #  rm -f ${CDCHROOTDIR}/etc/login.defs-orig &&  
     #  cat ${CDLAYOUTDIR}/create_ramdisk > \  
     # ${CDCHROOTDIR}/etc/rc.d/init.d/create_ramdisk && \  
     #  chmod 0755 ${CDCHROOTDIR}/etc/rc.d/init.d/create_ramdisk && \  
     #  ln -s ../init.d/create_ramdisk \  
     #   ${CDCHROOTDIR}/etc/rc.d/rcsysinit.d/S00create_ramdisk && \  
     #  
     #  cat ${CDLAYOUTDIR}/network_detect > \  
     # ${CDCHROOTDIR}/etc/rc.d/init.d/network_detect && \  
     #  chmod 0755 ${CDCHROOTDIR}/etc/rc.d/init.d/network_detect && \  
     #  ln -s ../init.d/network_detect \  
     #   ${CDCHROOTDIR}/etc/rc.d/rcsysinit.d/S20network_detect && \  
     #  ln -s ../init.d/hwdetect \  
     #   ${CDCHROOTDIR}/etc/rc.d/rc3.d/S18hwdetect && \  
     #  ln -s ../init.d/hwdetect \  
     #   ${CDCHROOTDIR}/etc/rc.d/rc4.d/S18hwdetect && \  
     #  ln -s ../init.d/hwdetect \  
     #   ${CDCHROOTDIR}/etc/rc.d/rc5.d/S18hwdetect && \  
       echo "HOSTNAME=\"${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    #add createramdisk ## not needed anymore -> mountfslivecd does the job    # change mountfs with mountfslivecd
       #rc-config add createramdisk  
       
       #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 670  EOF Line 596  EOF
    596   rm  ${CDCHROOTDIR}/root/.bash_history   rm  ${CDCHROOTDIR}/root/.bash_history
    597    fi )    fi )
    598   evaluate_retval   evaluate_retval
    599    
    600   mecho Cleaning unwanted files ...   mecho Cleaning unwanted files ...
    601   ( if [ -e ${CDCHROOTDIR}/etc/mtab ]   ( if [ -e ${CDCHROOTDIR}/etc/mtab ]
    602    then    then
    603     rm ${CDCHROOTDIR}/etc/mtab     rm ${CDCHROOTDIR}/etc/mtab
    604    fi && \    fi && \
    605    touch ${CDCHROOTDIR}/etc/mtab #&& \    touch ${CDCHROOTDIR}/etc/mtab
     #  rm ${CDCHROOTDIR}/etc/rc.d/rc3.d/S20network && \  
     #  rm ${CDCHROOTDIR}/etc/rc.d/rc0.d/K80network && \  
     #  rm ${CDCHROOTDIR}/etc/rc.d/rc6.d/K80network && \  
     #  rm ${CDCHROOTDIR}/etc/rc.d/rcsysinit.d/S40mountfs && \  
     #  rm ${CDCHROOTDIR}/etc/rc.d/rcsysinit.d/S30checkfs && \  
     #  rm ${CDCHROOTDIR}/bin/pidof && \  
     #  ln -s /sbin/killall5 ${CDCHROOTDIR}/bin/pidof )  
    606   )   )
    607   evaluate_retval   evaluate_retval
    608    
     # ###########################################  
     # # bad fix cause mingetty is not installed #  
     # #echo "Please enter 'foobar' as root password:"  
     # cat > ${CDCHROOTDIR}/root/.bashrc << "EOF"  
     # echo "Please enter 'foobar' as root password:"  
     # passwd root  
     # exit  
     #EOF  
     # enter_chroot  
     # rm ${CDCHROOTDIR}/root/.bashrc  
     # cat >> ${CDCHROOTDIR}/etc/issue << "EOF"  
     #Login with user:root password:foobar  
     #  
     #EOF  
     # ###########################################  
       
    609   # mingetty needs a passwordless user for autologin   # mingetty needs a passwordless user for autologin
    610   # so we unset the password for 'root'   # so we unset the password for 'root'
    611   cat > ${CDCHROOTDIR}/root/.bashrc << "EOF"   cat > ${CDCHROOTDIR}/root/.bashrc << "EOF"
    # Line 710  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
    # Line 744  generate_iso() { Line 647  generate_iso() {
    647   rm -f ${CDISOROOT}/$CDID   rm -f ${CDISOROOT}/$CDID
    648   evaluate_retval   evaluate_retval
    649   fi   fi
    650    
    651   #for loopback only   #for loopback only
    652   if [ -f ${CDISOROOT}/livecdrootfs ]   if [ -f ${CDISOROOT}/livecdrootfs ]
    653   then   then
    # Line 755  generate_iso() { Line 658  generate_iso() {
    658   evaluate_retval   evaluate_retval
    659   fi   fi
    660   fi   fi
    661    
    662   #for cloop loopback only   #for cloop loopback only
    663   if [ -f ${CDISOROOT}/livecdrootfs.cloop ]   if [ -f ${CDISOROOT}/livecdrootfs.cloop ]
    664   then   then
    # Line 766  generate_iso() { Line 669  generate_iso() {
    669   evaluate_retval   evaluate_retval
    670   fi   fi
    671   fi   fi
    672    
    673   #for squashfs loopback only   #for squashfs loopback only
    674   if [ -f ${CDISOROOT}/livecdrootfs.sqsh ]   if [ -f ${CDISOROOT}/livecdrootfs.sqsh ]
    675   then   then
    # Line 784  generate_iso() { Line 687  generate_iso() {
    687   rm -rf ${CDISOROOT}/isolinux   rm -rf ${CDISOROOT}/isolinux
    688   evaluate_retval   evaluate_retval
    689   fi   fi
    690    
    691   mecho Creating CD ID ...   mecho Creating CD ID ...
    692   ( mkdir -p ${CDISOROOT} && \   ( mkdir -p ${CDISOROOT} && \
    693    touch ${CDISOROOT}/$CDID )    touch ${CDISOROOT}/$CDID )
    # Line 798  generate_iso() { Line 701  generate_iso() {
    701   ${CDISOROOT}/isolinux && \   ${CDISOROOT}/isolinux && \
    702    rm -rf ${CDCHROOTDIR}/usr/src/* && \    rm -rf ${CDCHROOTDIR}/usr/src/* && \
    703    cp -R ${CDCHROOTDIR}/boot/* ${CDISOROOT}/isolinux && \    cp -R ${CDCHROOTDIR}/boot/* ${CDISOROOT}/isolinux && \
       #mv ${CDCHROOTDIR}/boot/* ${CDCHROOTDIR}/isolinux && \  
       #rm -rf ${CDCHROOTDIR}/boot && \  
       #ln -s isolinux ${CDCHROOTDIR}/boot && \  
    704    cp ${CDLAYOUTDIR}/isolinux.cfg ${CDISOROOT}/isolinux && \    cp ${CDLAYOUTDIR}/isolinux.cfg ${CDISOROOT}/isolinux && \
    705    cp ${CDLAYOUTDIR}/boot.lss ${CDISOROOT}/isolinux && \    cp ${CDLAYOUTDIR}/boot.lss ${CDISOROOT}/isolinux && \
    706    cp ${CDLAYOUTDIR}/boot.msg ${CDISOROOT}/isolinux && \    cp ${CDLAYOUTDIR}/boot.msg ${CDISOROOT}/isolinux && \
    707    cp ${CDLAYOUTDIR}/help.msg ${CDISOROOT}/isolinux && \    cp ${CDLAYOUTDIR}/help.msg ${CDISOROOT}/isolinux && \
    708    cp ${LIVECDROOT}/initrd.gz ${CDISOROOT}/isolinux && \    cp ${LIVECDROOT}/initrd.gz ${CDISOROOT}/isolinux && \
    709    source ${CDISOROOT}/isolinux/kernelversion && \    source ${CDISOROOT}/isolinux/kernelversion && \
       #mv ${CDCHROOTDIR}/isolinux/${KRNIMG} \  
       # ${CDCHROOTDIR}/isolinux/livecdkernel )  
    710    cp ${CDISOROOT}/isolinux/${KRNIMG} \    cp ${CDISOROOT}/isolinux/${KRNIMG} \
    711     ${CDISOROOT}/isolinux/${CDKERNELNAME} )     ${CDISOROOT}/isolinux/${CDKERNELNAME} )
    712   evaluate_retval   evaluate_retval
    # Line 822  generate_iso() { Line 720  generate_iso() {
    720    export CDISOLOOPSIZE="$(expr 20000 + $(du -Ds chroot|cut -d 'c' -f1))" && \    export CDISOLOOPSIZE="$(expr 20000 + $(du -Ds chroot|cut -d 'c' -f1))" && \
    721    dd if=/dev/zero of=${LIVECDROOT}/livecdrootfs bs=1024 count=${CDISOLOOPSIZE} &> /dev/null )    dd if=/dev/zero of=${LIVECDROOT}/livecdrootfs bs=1024 count=${CDISOLOOPSIZE} &> /dev/null )
    722   evaluate_retval   evaluate_retval
    723    
    724   mecho Formating rootfs loopfile ...   mecho Formating rootfs loopfile ...
    725   mke2fs -m 0 -i 1024 -F ${LIVECDROOT}/livecdrootfs &> /dev/null   mke2fs -m 0 -i 1024 -F ${LIVECDROOT}/livecdrootfs &> /dev/null
    726   evaluate_retval   evaluate_retval
    727    
    728   mecho Mounting Image file ...   mecho Mounting Image file ...
    729   ( mkdir -p ${CDISOLOOP} && \   ( mkdir -p ${CDISOLOOP} && \
    730   mount -o loop ${LIVECDROOT}/livecdrootfs ${CDISOLOOP} )   mount -o loop ${LIVECDROOT}/livecdrootfs ${CDISOLOOP} )
    731   evaluate_retval   evaluate_retval
    732    
    733   mecho Copying rootfs to loopfile ...   mecho Copying rootfs to loopfile ...
    734   cp -a ${CDCHROOTDIR}/* ${CDISOLOOP}   cp -a ${CDCHROOTDIR}/* ${CDISOLOOP}
    735   evaluate_retval   evaluate_retval
    736    
    737   mecho Unmounting Image file ...   mecho Unmounting Image file ...
    738   umount ${CDISOLOOP}   umount ${CDISOLOOP}
    739   evaluate_retval   evaluate_retval
    740    
    741   mecho Compressing rootfs loopfile ...   mecho Compressing rootfs loopfile ...
    742   ( cat ${LIVECDROOT}/livecdrootfs | ${LIVECDROOT}/tmp/${CLOOPDIR}/create_compressed_fs - 131072 > livecdrootfs.cloop ) >/dev/null 2>&1   ( cat ${LIVECDROOT}/livecdrootfs | ${LIVECDROOT}/tmp/${CLOOPDIR}/create_compressed_fs - 131072 > livecdrootfs.cloop ) >/dev/null 2>&1
    743   evaluate_retval   evaluate_retval
    744    
    745   mecho Moving rootfs loopfile to isoroot ...   mecho Moving rootfs loopfile to isoroot ...
    746   ( rm -f ${LIVECDROOT}/livecdrootfs && \   ( rm -f ${LIVECDROOT}/livecdrootfs && \
    747     mv ${LIVECDROOT}/livecdrootfs.cloop ${CDISOROOT} )     mv ${LIVECDROOT}/livecdrootfs.cloop ${CDISOROOT} )
    748   evaluate_retval   evaluate_retval
    749   ;;   ;;
    750    
    751   squashfs)   squashfs)
    752   mecho Generating squashfs compressed rootfs loopfile ...   mecho Generating squashfs compressed rootfs loopfile ...
    753   mksquashfs ${CDCHROOTDIR} ${LIVECDROOT}/livecdrootfs.sqsh >/dev/null 2>&1   mksquashfs ${CDCHROOTDIR} ${LIVECDROOT}/livecdrootfs.sqsh >/dev/null 2>&1
    754   evaluate_retval   evaluate_retval
    755    
    756   mecho Moving rootfs loopfile to isoroot ...   mecho Moving rootfs loopfile to isoroot ...
    757   mv ${LIVECDROOT}/livecdrootfs.sqsh ${CDISOROOT}   mv ${LIVECDROOT}/livecdrootfs.sqsh ${CDISOROOT}
    758   evaluate_retval   evaluate_retval
    759   ;;   ;;
    760   esac   esac
    761   fi   fi
    762    
    763   mecho Generating ISO Image ...   mecho Generating ISO Image ...
    764   ( cd ${CDISOROOT} && \   ( cd ${CDISOROOT} && \
    765    mkisofs -R -l -L -D -o ${LIVECDROOT}/${CDISONAME} \    mkisofs -R -l -L -D -o ${LIVECDROOT}/${CDISONAME} \
    # Line 1096  case "$1" in Line 994  case "$1" in
    994   echo -e "    makeall      -    builds stright ahead the livecd\n"   echo -e "    makeall      -    builds stright ahead the livecd\n"
    995   ;;   ;;
    996  esac  esac
       
    Legend:
    Removed from v.26  
    changed lines
      Added in v.144