Magellan Linux

Diff of /trunk/installer/include/prepare_bootloader.sh

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

revision 774 by niro, Wed Sep 24 11:07:50 2008 UTC revision 1034 by niro, Sun May 30 18:29:43 2010 UTC
# Line 1  Line 1 
1  # $Header: /home/cvsd/magellan-cvs/magellan-src/installer/include/prepare_bootloader.sh,v 1.2 2008-09-24 11:07:50 niro Exp $  #!/bin/bash
2    # $Id$
3    
4  source include/hwdetection.sh  source /etc/installer.conf
5    source ${INSTALLER_DIR}/include/hwdetection.sh
6    
7  : ${INSTALL_ROOT="/mnt/magellan"}  : ${INSTALL_ROOT="/mnt/magellan"}
8    
# Line 82  create_grub_conf() Line 84  create_grub_conf()
84   splashimage="magellan.xpm.gz"   splashimage="magellan.xpm.gz"
85    
86   # forcefully use gfxsplash   # forcefully use gfxsplash
87   [[ ! -f ${INSTALL_ROOT}/boot/${splashimage} ]] && cp magellan-black2.xpm.gz ${INSTALL_ROOT}/boot/${splashimage}   [[ ! -f ${INSTALL_ROOT}/boot/${splashimage} ]] && cp ${INSTALLER_DIR}/data/magellan-black2.xpm.gz ${INSTALL_ROOT}/boot/${splashimage}
88    
89   if [[ -f ${INSTALL_ROOT}/boot/${splashimage} ]]   if [[ -f ${INSTALL_ROOT}/boot/${splashimage} ]]
90   then   then
# Line 106  create_grub_conf() Line 108  create_grub_conf()
108    
109   add_grub_conf "title Magellan-Linux $(< ${INSTALL_ROOT}/etc/mageversion) ($(readlink ${INSTALL_ROOT}/boot/vmlinuz | sed s:kernel-::))"   add_grub_conf "title Magellan-Linux $(< ${INSTALL_ROOT}/etc/mageversion) ($(readlink ${INSTALL_ROOT}/boot/vmlinuz | sed s:kernel-::))"
110   add_grub_conf "root $(convert_device ${PARTITION_DISK_BOOT})"   add_grub_conf "root $(convert_device ${PARTITION_DISK_BOOT})"
111   add_grub_conf "kernel /boot/$(readlink ${INSTALL_ROOT}/boot/vmlinuz) root=${PARTITION_DISK_ROOT}"   add_grub_conf "kernel /boot/$(readlink ${INSTALL_ROOT}/boot/vmlinuz) root=$(get_uuid ${PARTITION_DISK_ROOT})"
112   add_grub_conf "initrd /boot/$(readlink ${INSTALL_ROOT}/boot/initrd)"   add_grub_conf "initrd /boot/$(readlink ${INSTALL_ROOT}/boot/initrd)"
113    
114   # add an empty line as spacer between other boot entries   # add an empty line as spacer between other boot entries
# Line 115  create_grub_conf() Line 117  create_grub_conf()
117    
118  install_bootloader()  install_bootloader()
119  {  {
120   create_device_map >&2   create_device_map &> /dev/null
121   echo 25   echo 25
122   create_grub_conf >&2   create_grub_conf &> /dev/null
123   echo 50   echo 50
124   create_initrd >&2   install_grub &> /dev/null
  echo 75  
  install_grub >&2  
125   echo 100   echo 100
126  }  }
127    

Legend:
Removed from v.774  
changed lines
  Added in v.1034