Magellan Linux

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

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

revision 1025 by niro, Sun May 30 17:40:47 2010 UTC revision 1045 by niro, Sun May 30 23:08:26 2010 UTC
# Line 1  Line 1 
1  #!/bin/bash  #!/bin/bash
2  # $Id$  # $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 83  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 data/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
91   add_grub_conf "# splash image"   add_grub_conf "# splash image"
  # old logo  
  #add_grub_conf "splashimage /boot/magellan.xpm.gz"  
  #add_grub_conf "foreground FFFFFF"  
  #add_grub_conf "background 1B456B"  
   
  # the new one  
92   add_grub_conf "splashimage $(convert_device ${PARTITION_DISK_BOOT})/boot/${splashimage}"   add_grub_conf "splashimage $(convert_device ${PARTITION_DISK_BOOT})/boot/${splashimage}"
93   add_grub_conf "foreground FFFFFF"   add_grub_conf "foreground FFFFFF"
94   add_grub_conf "background 253861"   add_grub_conf "background 253861"
# Line 107  create_grub_conf() Line 102  create_grub_conf()
102    
103   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-::))"
104   add_grub_conf "root $(convert_device ${PARTITION_DISK_BOOT})"   add_grub_conf "root $(convert_device ${PARTITION_DISK_BOOT})"
105   add_grub_conf "kernel /boot/$(readlink ${INSTALL_ROOT}/boot/vmlinuz) root=$(get_uuid ${PARTITION_DISK_ROOT})"   add_grub_conf "kernel /boot/$(readlink ${INSTALL_ROOT}/boot/vmlinuz) root=UUID=$(get_uuid ${PARTITION_DISK_ROOT})"
106   add_grub_conf "initrd /boot/$(readlink ${INSTALL_ROOT}/boot/initrd)"   add_grub_conf "initrd /boot/$(readlink ${INSTALL_ROOT}/boot/initrd)"
107    
108   # add an empty line as spacer between other boot entries   # add an empty line as spacer between other boot entries
# Line 116  create_grub_conf() Line 111  create_grub_conf()
111    
112  install_bootloader()  install_bootloader()
113  {  {
114   create_device_map >&2   create_device_map &> /dev/null
115   echo 25   echo 25
116   create_grub_conf >&2   create_grub_conf &> /dev/null
117   echo 50   echo 50
118   install_grub >&2   install_grub &> /dev/null
119   echo 100   echo 100
120  }  }
121    

Legend:
Removed from v.1025  
changed lines
  Added in v.1045