Magellan Linux

  • Back to homepage
    • /[magellan-source]/trunk/installer-simple/bin/installer.sh.in

    Diff of /trunk/installer-simple/bin/installer.sh.in

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

    revision 2442 by niro, Tue Jan 7 14:48:42 2014 UTC revision 2446 by niro, Tue Jan 7 14:56:12 2014 UTC
    # Line 468  install_system_image() Line 468  install_system_image()
    468   popd > /dev/null   popd > /dev/null
    469  }  }
    470    
    471  install_bootsector_chroot()  disabled_install_bootsector_chroot()
    472  {  {
    473   local my_roothdd   local my_roothdd
    474   local grubconf=${INSTALLROOT}/boot/grub/grub.conf   local grubconf="${INSTALLROOT}/boot/grub/grub.conf"
    475   local grub2conf=/boot/grub/grub.cfg   local grub2conf="/boot/grub/grub.cfg"
    476    
    477   # check for grub2   # check for grub2
    478   if [[ -f ${INSTALLROOT}/sbin/grub-mkconfig ]]   if [[ -f ${INSTALLROOT}/sbin/grub-mkconfig ]]
    # Line 488  install_bootsector_chroot() Line 488  install_bootsector_chroot()
    488   then   then
    489   sed -i "s:^\(export GRUB_CMDLINE_LINUX_DEFAULT=\).*:\1\"${KERNELOPTS}\":" ${INSTALLROOT}/etc/conf.d/grub || dialog_die   sed -i "s:^\(export GRUB_CMDLINE_LINUX_DEFAULT=\).*:\1\"${KERNELOPTS}\":" ${INSTALLROOT}/etc/conf.d/grub || dialog_die
    490   else   else
    491   echo "export GRUB_CMDLINE_LINUX_DEFAULT=\"${KERNELOPTS}\"" >  ${INSTALLROOT}/etc/conf.d/grub || dialog_die   CONFIG="${INSTALLROOT}/etc/conf.d/grub"
    492   fi   clearconfig
    493   echo 'grub-mkdevicemap' > ${INSTALLROOT}/root/.installrc || dialog_die   addconfig "export GRUB_CMDLINE_LINUX_DEFAULT=\"${KERNELOPTS}\""
    494   echo "LC_ALL=C grub-mkconfig -o ${grub2conf}  &> /dev/null" >> ${INSTALLROOT}/root/.installrc || dialog_die   fi
    495   echo "grub-install --no-floppy ${HDD} &> /dev/null" >> ${INSTALLROOT}/root/.installrc || dialog_die   CONFIG="${INSTALLROOT}/root/.installrc"
    496   echo "exit 0" >> ${INSTALLROOT}/root/.installrc || dialog_die   clearconfig
    497     # only grub 1.99
    498     addconfig 'type -P grub-mkdevicemap && grub-mkdevicemap'
    499     addconfig "grub-install --no-floppy ${HDD} &> /dev/null"
    500     addconfig "LC_ALL=C grub-mkconfig -o ${grub2conf}  &> /dev/null"
    501     addconfig "exit 0"
    502    
    503   # grub-legacy   # grub-legacy
    504   else   else
      ### grubconf schreiben  
    505   source ${INSTALLROOT}/boot/kernelversion   source ${INSTALLROOT}/boot/kernelversion
    506    
      #for alx only  
    507   if [ -e ${INSTALLROOT}/etc/alx_version ]   if [ -e ${INSTALLROOT}/etc/alx_version ]
    508   then   then
    509   OLD_ALXVER="${ALXVER}"   OLD_ALXVER="${ALXVER}"
    # Line 516  install_bootsector_chroot() Line 519  install_bootsector_chroot()
    519   # uuid support   # uuid support
    520   my_roothdd="UUID=$(get_uuid ${ROOTHDD})"   my_roothdd="UUID=$(get_uuid ${ROOTHDD})"
    521    
    522   : > ${grubconf} || dialog_die   CONFIG="${grubconf}"
    523   echo "default 0" >> ${grubconf} || dialog_die   clearconfig
    524   echo "timeout 3" >> ${grubconf} || dialog_die   addconfig "default 0"
    525     addconfig "timeout 3"
    526   # using current root password   # using current root password
    527   echo "password --md5 $(cat ${INSTALLROOT}/etc/shadow | grep root | cut -d: -f2)"  >> ${grubconf} || dialog_die   addconfig "password --md5 $(cat ${INSTALLROOT}/etc/shadow | grep root | cut -d: -f2)"
    528    
    529   echo  >> ${grubconf} || dialog_die   addconfig
    530   echo "# normal boot" >> ${grubconf} || dialog_die   addconfig "# normal boot"
    531   echo "title ${KRNVER}" >> ${grubconf} || dialog_die   addconfig "title ${KRNVER}"
    532   echo "root (hd0,0)" >> ${grubconf} || dialog_die   addconfig "root (hd0,0)"
    533   echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS}" >> ${grubconf} || dialog_die   addconfig "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS}"
    534   if is_initrd_supported   if is_initrd_supported
    535   then   then
    536   echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || dialog_die   addconfig "initrd /boot/${KRNINITRD}"
    537   fi   fi
    538    
    539   echo >> ${grubconf} || dialog_die   addconfig
    540   echo "# admin boot" >> ${grubconf} || dialog_die   addconfig "# admin boot"
    541   echo "title ${KRNVER} - Re-run hardware-detection" >> ${grubconf} || dialog_die   addconfig "title ${KRNVER} - Re-run hardware-detection"
    542   echo "lock"  >> ${grubconf} || dialog_die   addconfig "lock"
    543   echo "root (hd0,0)" >> ${grubconf} || dialog_die   addconfig "root (hd0,0)"
    544   echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} hardware-auto-detection" >> ${grubconf} || dialog_die   addconfig "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} hardware-auto-detection"
    545   if is_initrd_supported   if is_initrd_supported
    546   then   then
    547   echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || dialog_die   addconfig "initrd /boot/${KRNINITRD}"
    548   fi   fi
    549    
    550   echo >> ${grubconf} || dialog_die   addconfig
    551   echo "title ${KRNVER} - Reset *all* local settings" >> ${grubconf} || dialog_die   addconfig "title ${KRNVER} - Reset *all* local settings"
    552   echo "lock"  >> ${grubconf} || dialog_die   addconfig "lock"
    553   echo "root (hd0,0)" >> ${grubconf} || dialog_die   addconfig "root (hd0,0)"
    554   echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} alx-reset-settings" >> ${grubconf} || dialog_die   addconfig "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} alx-reset-settings"
    555   if is_initrd_supported   if is_initrd_supported
    556   then   then
    557   echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || dialog_die   addconfig "initrd /boot/${KRNINITRD}"
    558   fi   fi
    559    
    560   # bootsector schreiben chrooted schreiben (lfs/magellan)   # bootsector schreiben chrooted schreiben (lfs/magellan)
    # Line 569  CHROOTEOF Line 573  CHROOTEOF
    573   rm ${INSTALLROOT}/root/.installrc   rm ${INSTALLROOT}/root/.installrc
    574  }  }
    575    
    576  install_initrd_chroot()  disabled_install_initrd_chroot()
    577  {  {
    578   # only generate initrds if the cmd exists   # only generate initrds if the cmd exists
    579   is_initrd_supported || return 0   is_initrd_supported || return 0
    # Line 597  install_initrd_chroot() Line 601  install_initrd_chroot()
    601    
    602   # install an appropriate uvesafb.conf   # install an appropriate uvesafb.conf
    603   install -d ${INSTALLROOT}/etc/modprobe.d || dialog_die   install -d ${INSTALLROOT}/etc/modprobe.d || dialog_die
    604   echo "options uvesafb mode_option=1024x768-32@60 scroll=ywrap" > ${INSTALLROOT}/etc/modprobe.d/uvesafb.conf || dialog_die   CONFIG="${INSTALLROOT}/etc/modprobe.d/uvesafb.conf"
    605     clearconfig
    606     addconfig "options uvesafb mode_option=1024x768-32@60 scroll=ywrap"
    607    
    608   # install an appropriate viafb.conf   # install an appropriate viafb.conf
    609   echo "options viafb viafb_mode=1024x768 viafb_refresh=60" > ${INSTALLROOT}/etc/modprobe.d/viafb.conf || dialog_die   CONFIG="${INSTALLROOT}/etc/modprobe.d/viafb.conf"
    610     clearconfig
    611     addconfig "options viafb viafb_mode=1024x768 viafb_refresh=60"
    612    
    613   # install an appropriate i810fb.conf   # install an appropriate i810fb.conf
    614   echo "options i810fb xres=1024 yres=768 bpp=16 mtrr=1 hsync1=30 hsync2=62 vsync1=30 vsync2=60"  > ${INSTALLROOT}/etc/modprobe.d/i810fb.conf || dialog_die   CONFIG="${INSTALLROOT}/etc/modprobe.d/i810fb.conf"
    615     clearconfig
    616     addconfig "options i810fb xres=1024 yres=768 bpp=16 mtrr=1 hsync1=30 hsync2=62 vsync1=30 vsync2=60"
    617    
    618   cat > ${INSTALLROOT}/root/.installrc << CHROOTEOF   cat > ${INSTALLROOT}/root/.installrc << CHROOTEOF
    619  echo "MODULES=\"${FORMAT_FILESYSTEM} ${DISKMODS} ${OLDATAMODS} ${PATAMODS} ${SATAMODS} ${DRMMODS} ${FBMODS} ${OTHERMODS}\"" > /etc/conf.d/mkinitrd  echo "MODULES=\"${FORMAT_FILESYSTEM} ${DISKMODS} ${OLDATAMODS} ${PATAMODS} ${SATAMODS} ${DRMMODS} ${FBMODS} ${OTHERMODS}\"" > /etc/conf.d/mkinitrd
    # Line 618  CHROOTEOF Line 628  CHROOTEOF
    628    
    629  install_system_settings()  install_system_settings()
    630  {  {
    631   # schreibe fstab   local CONFIG
    632   echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die  
    633   # not needed busybox loads all with swapon -a, even if not mentioned in fstab   # write fstab
    634   #echo -e "UUID='$(get_uuid ${SWAPHDD})'\tswap\tswap\tpri=1\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die   CONFIG="${INSTALLROOT}/etc/fstab"
    635   echo -e "proc\t/proc\tproc\tdefaults\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die   clearconfig
    636   echo -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die   addconfig -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1"
    637     addconfig -e "proc\t/proc\tproc\tdefaults\t0 0"
    638     addconfig -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0"
    639    
    640   # install network config skeleton   # install network config skeleton
    641   install -m0644 ${INSTALLROOT}/etc/alxconfig-ng/skel/net/net.eth0 ${INSTALLROOT}/etc/conf.d/ || dialog_die   CONFIG="${INSTALLROOT}/etc/conf.d/net.eth0"
    642     clearconfig
    643     addconfig 'ONBOOT="yes"'
    644     addconfig 'NETWORKING="dhcp"'
    645    
    646   # intel framebuffer quirk   # intel framebuffer quirk
    647   if [ -e ${INSTALLROOT}/etc/splash/splash.conf ]   if [ -e ${INSTALLROOT}/etc/splash/splash.conf ]
    Legend:
    Removed from v.2442  
    changed lines
      Added in v.2446