Magellan Linux

  • Back to homepage
    • /[alx-svn]/alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh.in

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

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

    revision 2735 by niro, Mon Jul 4 21:24:46 2011 UTC revision 2736 by niro, Thu Aug 11 14:58:15 2011 UTC
    # Line 34  CURRENTLINE=0 Line 34  CURRENTLINE=0
    34  # standard kernel opts  # standard kernel opts
    35  KERNELOPTS="quiet video=1024x768"  KERNELOPTS="quiet video=1024x768"
    36    
    37    # grub options
    38    GRUBLEGACYOPTS=""
    39    GRUB2OPTS=""
    40    
    41  # default specialdevices  # default specialdevices
    42  SPECIALDEVICE=""  SPECIALDEVICE=""
    43    
    # Line 444  run_hardware_detection() Line 448  run_hardware_detection()
    448   fi   fi
    449   done   done
    450    
    451   export KERNELOPTS="${KERNELOPTS} rootdelay=8"   # only add this for grub legacy, grub2 detect these settings on its own
    452     export GRUBLEGACYOPTS="rootdelay=8"
    453   export SPECIALDEVICE="zotac"   export SPECIALDEVICE="zotac"
    454   fi   fi
    455  }  }
    # Line 591  install_bootsector_chroot() Line 596  install_bootsector_chroot()
    596   echo "# normal boot" >> ${grubconf} || die   echo "# normal boot" >> ${grubconf} || die
    597   echo "title ${KRNVER}" >> ${grubconf} || die   echo "title ${KRNVER}" >> ${grubconf} || die
    598   echo "root (hd0,0)" >> ${grubconf} || die   echo "root (hd0,0)" >> ${grubconf} || die
    599   echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS}" >> ${grubconf} || die   echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS}" >> ${grubconf} || die
    600   if is_initrd_supported   if is_initrd_supported
    601   then   then
    602   echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die   echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die
    # Line 602  install_bootsector_chroot() Line 607  install_bootsector_chroot()
    607   echo "title ${KRNVER} - Re-run hardware-detection" >> ${grubconf} || die   echo "title ${KRNVER} - Re-run hardware-detection" >> ${grubconf} || die
    608   echo "lock"  >> ${grubconf} || die   echo "lock"  >> ${grubconf} || die
    609   echo "root (hd0,0)" >> ${grubconf} || die   echo "root (hd0,0)" >> ${grubconf} || die
    610   echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} hardware-auto-detection" >> ${grubconf} || die   echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} hardware-auto-detection" >> ${grubconf} || die
    611   if is_initrd_supported   if is_initrd_supported
    612   then   then
    613   echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die   echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die
    # Line 612  install_bootsector_chroot() Line 617  install_bootsector_chroot()
    617   echo "title ${KRNVER} - Reset *all* local settings" >> ${grubconf} || die   echo "title ${KRNVER} - Reset *all* local settings" >> ${grubconf} || die
    618   echo "lock"  >> ${grubconf} || die   echo "lock"  >> ${grubconf} || die
    619   echo "root (hd0,0)" >> ${grubconf} || die   echo "root (hd0,0)" >> ${grubconf} || die
    620   echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} alx-reset-settings" >> ${grubconf} || die   echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} alx-reset-settings" >> ${grubconf} || die
    621   if is_initrd_supported   if is_initrd_supported
    622   then   then
    623   echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die   echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die
    Legend:
    Removed from v.2735  
    changed lines
      Added in v.2736