Magellan Linux

Diff of /trunk/mlivecdbuild/mlivecdbuild2.sh

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

revision 713 by niro, Thu Apr 10 20:52:33 2008 UTC revision 1402 by niro, Sun Jun 5 02:31:52 2011 UTC
# Line 19  CDID="mlcd-$(date +%F-%k%M)" Line 19  CDID="mlcd-$(date +%F-%k%M)"
19  PROFILES_DIR="/usr/lib/mlivecdbuild/profiles"  PROFILES_DIR="/usr/lib/mlivecdbuild/profiles"
20  GLOBAL_PROFILE="${PROFILES_DIR}/global"  GLOBAL_PROFILE="${PROFILES_DIR}/global"
21    
22    # get full path to isolinux.bin, may vary an multilib systems
23    if [[ -f /usr/lib64/mkinitrd/isolinux.bin ]]
24    then
25     ISOLINUX_BIN=/usr/lib64/mkinitrd/isolinux.bin
26    else
27     ISOLINUX_BIN=/usr/lib/mkinitrd/isolinux.bin
28    fi
29    
30  die() { echo "ERROR: $@"; exit 1; }  die() { echo "ERROR: $@"; exit 1; }
31    
32  # get_profile $filename  # get_profile $filename
# Line 94  custom_packages() Line 102  custom_packages()
102    
103   # do not auto-start any services!   # do not auto-start any services!
104   add_initrc "export MAGE_BOOTSTRAP=true"   add_initrc "export MAGE_BOOTSTRAP=true"
105     add_initrc 'die() { if [ $? -eq 1 ]; then echo "ERROR: $@"; exit 1; fi; }'
106    
107   local i   local i
108   for i in ${packages}   for i in ${packages}
109   do   do
110   add_initrc "mage ${cmd} ${i}"   add_initrc "mage ${cmd} ${i} || die ${i}"
111   done   done
112   add_initrc "mage clean"   add_initrc "mage clean"
113    
# Line 152  prepare_iso() Line 161  prepare_iso()
161    
162   echo Setting up services ...   echo Setting up services ...
163    
164   # add hardware detection  # # add hardware detection
165   MROOT="${CDCHROOTDIR}" rc-config add hwdetect || die "rc add hwdetect"  # MROOT="${CDCHROOTDIR}" rc-config add hwdetect || die "rc add hwdetect"
166    
167   # del checkfs   # del checkfs
168   MROOT="${CDCHROOTDIR}" rc-config del checkfs || die "rc del checkfs"   MROOT="${CDCHROOTDIR}" rc-config del checkfs || die "rc del checkfs"
# Line 204  install_bootloader() Line 213  install_bootloader()
213    
214   # iso linux binary   # iso linux binary
215   install -d ${CDISOROOT}/isolinux   install -d ${CDISOROOT}/isolinux
216   install /usr/lib/mkinitrd/isolinux.bin ${CDISOROOT}/isolinux || die   install ${ISOLINUX_BIN} ${CDISOROOT}/isolinux || die
217    
218   # kernel   # kernel
219   local kimg="$(basename $(readlink ${CDCHROOTDIR}/boot/vmlinuz))"   local kimg="$(basename $(readlink ${CDCHROOTDIR}/boot/vmlinuz))"

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