Magellan Linux

Diff of /alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh

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

revision 1122 by niro, Sat Jun 28 00:37:45 2008 UTC revision 1123 by niro, Tue Aug 4 18:09:51 2009 UTC
# Line 21  cdromdev="$(echo ${cdromdev} | sed 's/ / Line 21  cdromdev="$(echo ${cdromdev} | sed 's/ /
21  ########################################  ########################################
22    
23  ### System/Config Version  ### System/Config Version
24  VERSION="0.3.1"  VERSION="0.3.2"
25  TITLE="alxinstall-ng - ${VERSION}"  TITLE="alxinstall-ng - ${VERSION}"
26    
27  CDPATH="/mnt/cdrom"  CDPATH="/mnt/cdrom"
# Line 402  install_bootsector_chroot() Line 402  install_bootsector_chroot()
402   [[ -z ${KRNVER} ]] && KRNVER="AutoSta_LX"   [[ -z ${KRNVER} ]] && KRNVER="AutoSta_LX"
403   [[ -z ${KRNINITRD} ]] && KRNINITRD="initrd"   [[ -z ${KRNINITRD} ]] && KRNINITRD="initrd"
404    
405   echo "default 0" > ${INSTALLPATH}/boot/grub/grub.conf || die   local grubconf=${INSTALLPATH}/boot/grub/grub.conf
406   echo "timeout 0" >> ${INSTALLPATH}/boot/grub/grub.conf ||die   : > ${grubconf} || die
407     echo "default 0" >> ${grubconf} || die
408     echo "timeout 3" >> ${grubconf} || die
409     # using current root password
410     echo "password --md5 $(cat ${INSTALLPATH}/etc/shadow | grep root | cut -d: -f2)"  >> ${grubconf} || die
411    
412     echo  >> ${grubconf} || die
413     echo "# normal boot" >> ${grubconf} || die
414     echo "title ${KRNVER}" >> ${grubconf} || die
415     echo "root (hd0,0)" >> ${grubconf} || die
416     echo "kernel /boot/vmlinuz root=${ROOTHDD} quiet" >> ${grubconf} || die
417     echo "initrd /boot/initrd" >> ${grubconf} || die
418    
419     echo >> ${grubconf} || die
420     echo "# admin boot" >> ${grubconf} || die
421     echo "title ${KRNVER} - Re-run hardware-detection" >> ${grubconf} || die
422     echo "lock"  >> ${grubconf} || die
423     echo "root (hd0,0)" >> ${grubconf} || die
424     echo "kernel /boot/vmlinuz root=${ROOTHDD} quiet hardware-auto-detection" >> ${grubconf} || die
425     echo "initrd /boot/initrd" >> ${grubconf} || die
426    
427     echo >> ${grubconf} || die
428     echo "title ${KRNVER} - Reset *all* local settings" >> ${grubconf} || die
429     echo "lock"  >> ${grubconf} || die
430     echo "root (hd0,0)" >> ${grubconf} || die
431     echo "kernel /boot/vmlinuz root=${ROOTHDD} quiet alx-reset-settings" >> ${grubconf} || die
432     echo "initrd /boot/initrd" >> ${grubconf} || die
433    
  echo -e "\ntitle=${KRNVER}" >> ${INSTALLPATH}/boot/grub/grub.conf || die  
  echo "root (hd0,0)" >> ${INSTALLPATH}/boot/grub/grub.conf || die  
   
  echo "kernel /boot/vmlinuz root=${ROOTHDD} quiet" >> ${INSTALLPATH}/boot/grub/grub.conf || die  
  echo "initrd /boot/initrd" >> ${INSTALLPATH}/boot/grub/grub.conf || die  
   
434   # bootsector schreiben chrooted schreiben (lfs/magellan)   # bootsector schreiben chrooted schreiben (lfs/magellan)
435   cat > ${INSTALLPATH}/root/.bashrc << CHROOTEOF   cat > ${INSTALLPATH}/root/.bashrc << CHROOTEOF
436  /usr/sbin/grub --no-floppy --batch << "EOF" 1> /dev/null 2> /dev/null  /usr/sbin/grub --no-floppy --batch << "EOF" 1> /dev/null 2> /dev/null

Legend:
Removed from v.1122  
changed lines
  Added in v.1123