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 6826 by niro, Thu Jul 23 11:26:26 2015 UTC revision 6832 by niro, Thu Jul 23 12:07:16 2015 UTC
    # Line 10  MLIBDIR="/usr/lib/alxinstall-ng" Line 10  MLIBDIR="/usr/lib/alxinstall-ng"
    10  source /mnt/cdrom/system/images.conf  source /mnt/cdrom/system/images.conf
    11    
    12  # includes  # includes
    13    source ${MLIBDIR}/functions/generic.sh
    14  source ${MLIBDIR}/functions/hwdetection.sh  source ${MLIBDIR}/functions/hwdetection.sh
    15    
    16  ### System/Config Version  ### System/Config Version
    # Line 58  die() Line 59  die()
    59   ERROR=$1   ERROR=$1
    60   RETVAL=$?   RETVAL=$?
    61   dialog_install_failure   dialog_install_failure
    62     trap_exit
    63   exit 1   exit 1
    64  }  }
    65    
    # Line 483  setup_hdd_partitions() Line 485  setup_hdd_partitions()
    485   ;;   ;;
    486    
    487   single|auto)   single|auto)
    488     BOOTHDD=""
    489     SWAPHDD=""
    490   ROOTHDD="${HDD}1"   ROOTHDD="${HDD}1"
    491   ;;   ;;
    492   esac   esac
    # Line 559  setup_hdd_format() Line 563  setup_hdd_format()
    563   fi   fi
    564   if [[ -n ${BOOTHDD} ]]   if [[ -n ${BOOTHDD} ]]
    565   then   then
    566   mke2fs -j -q ${BOOTHDD} || die   mkfs.${FORMAT_FILESYSTEM} -q ${BOOTHDD} || die
    567   fi   fi
    568   if [[ -n ${ROOTHDD} ]]   if [[ -n ${ROOTHDD} ]]
    569   then   then
    570   mke2fs -j -q ${ROOTHDD} || die   mkfs.${FORMAT_FILESYSTEM} -q ${ROOTHDD} || die
    571   fi   fi
    572  }  }
    573    
    # Line 714  is_initrd_supported() Line 718  is_initrd_supported()
    718    
    719  install_initrd_chroot()  install_initrd_chroot()
    720  {  {
    721     local CONFIG
    722    
    723   # only generate initrds if the cmd exists   # only generate initrds if the cmd exists
    724   is_initrd_supported || return 0   is_initrd_supported || return 0
    725    
    # Line 739  install_initrd_chroot() Line 745  install_initrd_chroot()
    745   fi   fi
    746    
    747   # install an appropriate uvesafb.conf   # install an appropriate uvesafb.conf
    748   install -d ${INSTALLPATH}/etc/modprobe.d || die   CONFIG=${INSTALLPATH}/etc/modprobe.d/uvesafb.conf
    749   echo "options uvesafb mode_option=1024x768-32@60 scroll=ywrap" > ${INSTALLPATH}/etc/modprobe.d/uvesafb.conf || die   clearconfig
    750     addconfig "options uvesafb mode_option=1024x768-32@60 scroll=ywrap"
    751    
    752   # install an appropriate viafb.conf   # install an appropriate viafb.conf
    753   echo "options viafb viafb_mode=1024x768 viafb_refresh=60" > ${INSTALLPATH}/etc/modprobe.d/viafb.conf || die   CONFIG=${INSTALLPATH}/etc/modprobe.d/viafb.conf
    754     clearconfig
    755     addconfig "options viafb viafb_mode=1024x768 viafb_refresh=60"
    756    
    757   # install an appropriate i810fb.conf   # install an appropriate i810fb.conf
    758   echo "options i810fb xres=1024 yres=768 bpp=16 mtrr=1 hsync1=30 hsync2=62 vsync1=30 vsync2=60"  > ${INSTALLPATH}/etc/modprobe.d/i810fb.conf || die   CONFIG=${INSTALLPATH}/etc/modprobe.d/i810fb.conf
    759     clearconfig
    760     addconfig "options i810fb xres=1024 yres=768 bpp=16 mtrr=1 hsync1=30 hsync2=62 vsync1=30 vsync2=60"
    761    
    762   cat > ${INSTALLPATH}/root/.installrc << CHROOTEOF   cat > ${INSTALLPATH}/root/.installrc << CHROOTEOF
    763  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 754  mkinitrd -f /boot/$(readlink /boot/initr Line 765  mkinitrd -f /boot/$(readlink /boot/initr
    765  exit 0  exit 0
    766  CHROOTEOF  CHROOTEOF
    767    
    768   ## enters chroot   ## enter chroot
    769   mount -t proc proc ${INSTALLPATH}/proc   mount -t proc proc ${INSTALLPATH}/proc
    770   mount -t sysfs sysfs ${INSTALLPATH}/sys   mount -t sysfs sysfs ${INSTALLPATH}/sys
    771   mount -o bind /dev ${INSTALLPATH}/dev   mount -o bind /dev ${INSTALLPATH}/dev
    # Line 917  run_install() Line 928  run_install()
    928   dialog_install_successful   dialog_install_successful
    929  }  }
    930    
    931    # set some proper traps
    932    trap "trap_exit" SIGINT SIGQUIT
    933    
    934  dialog_main  dialog_main
    935    
    936  exit 0  exit 0
    Legend:
    Removed from v.6826  
    changed lines
      Added in v.6832