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 1574 by niro, Mon Oct 18 11:46:02 2010 UTC revision 2389 by niro, Wed Jun 15 08:52:21 2011 UTC
    # Line 21  cdromdev="$(echo ${cdromdev} | sed 's/ / Line 21  cdromdev="$(echo ${cdromdev} | sed 's/ /
    21  ########################################  ########################################
    22    
    23  ### System/Config Version  ### System/Config Version
    24  VERSION="0.3.5"  VERSION="0.3.7"
    25  TITLE="alxinstall-ng - ${VERSION}"  TITLE="alxinstall-ng - ${VERSION}"
    26    
    27  CDPATH="/mnt/cdrom"  CDPATH="/mnt/cdrom"
    # Line 37  KERNELOPTS="quiet" Line 37  KERNELOPTS="quiet"
    37  # default specialdevices  # default specialdevices
    38  SPECIALDEVICE=""  SPECIALDEVICE=""
    39    
    40    # target filesystem
    41    FORMAT_FILESYSTEM="ext4"
    42    
    43  #################################################  #################################################
    44  #  DIALOG BOXEN #  #  DIALOG BOXEN #
    45  #################################################  #################################################
    # Line 120  dialog_setup_system_menu() Line 123  dialog_setup_system_menu()
    123   --cancel-label "Abbrechen" \   --cancel-label "Abbrechen" \
    124   --ok-label "Weiter" \   --ok-label "Weiter" \
    125   --stdout \   --stdout \
    126     --colors \
    127   --menu "\nWaehlen Sie die Installations-Methode" 14 70 5 \   --menu "\nWaehlen Sie die Installations-Methode" 14 70 5 \
    128   "1" "Automatisches Setup" \   "1" "Automatisches Setup (Empfohlen)" \
    129   "2" "Normale IDE-Disk (manuell)" \   "" "" \
    130   "3" "Flash-Speicher (manuell)")   "" "\Z1Experten Modi:\Zn" \
    131     "2" "Normale IDE-Disk (Manuell)" \
    132     "3" "Flash-Speicher (Manuell)")
    133   RES=$?   RES=$?
    134   [[ ${RES} -eq 1 ]] && return 1   [[ ${RES} -eq 1 ]] && return 1
    135   if [[ ${RES} -eq 0 ]]   if [[ ${RES} -eq 0 ]]
    # Line 132  dialog_setup_system_menu() Line 138  dialog_setup_system_menu()
    138   "1") run_install_auto ;;   "1") run_install_auto ;;
    139           "2") run_install_normal ;;           "2") run_install_normal ;;
    140   "3") run_install_flash ;;   "3") run_install_flash ;;
    141     "") dialog_setup_system_menu;;
    142   esac   esac
    143   fi   fi
    144  }  }
    # Line 427  run_hardware_detection() Line 434  run_hardware_detection()
    434   # check for special devices/clients:   # check for special devices/clients:
    435   # if zotac a zotac and the disk is a removeable device, then add rootdelay to kernelcmd   # if zotac a zotac and the disk is a removeable device, then add rootdelay to kernelcmd
    436   local removable=0   local removable=0
    437   if [[ ! -z $(lspci -v | grep -i zotac) ]]   if [[ ! -z $(hwinfo --bios --storage | grep -i zotac) ]]
    438   then   then
    439   for i in /sys/block/[hs]d*/removable   for i in /sys/block/[hs]d*/removable
    440   do   do
    # Line 621  install_initrd_chroot() Line 628  install_initrd_chroot()
    628   is_initrd_supported || return 0   is_initrd_supported || return 0
    629    
    630   cat > ${INSTALLPATH}/root/.bashrc << CHROOTEOF   cat > ${INSTALLPATH}/root/.bashrc << CHROOTEOF
    631  echo "MODULES=\"ext3 amd74xx piix sis5513 via82cxxx sd_mod ata_piix pata_amd pata_mpiix pata_oldpiix pata_sis pata_via sata_via sata_sis sata_nv\"" > /etc/conf.d/mkinitrd  echo "MODULES=\"${FORMAT_FILESYSTEM} amd74xx piix sis5513 via82cxxx sd_mod ata_piix pata_amd pata_mpiix pata_oldpiix pata_sis pata_via sata_via sata_sis sata_nv\"" > /etc/conf.d/mkinitrd
    632  mkinitrd -f /boot/$(readlink /boot/initrd) $(readlink /boot/vmlinuz | sed "s:kernel-::g") > /dev/null  mkinitrd -f /boot/$(readlink /boot/initrd) $(readlink /boot/vmlinuz | sed "s:kernel-::g") > /dev/null
    633  exit 0  exit 0
    634  CHROOTEOF  CHROOTEOF
    # Line 675  install_system_settings() Line 682  install_system_settings()
    682   # schreibe fstab   # schreibe fstab
    683   if is_uuid_supported   if is_uuid_supported
    684   then   then
    685   echo -e "UUID=$(get_uuid ${BOOTHDD})\t/boot\text3\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die   echo -e "UUID=$(get_uuid ${BOOTHDD})\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die
    686   echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\text3\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die   echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die
    687   else   else
    688   echo -e "${BOOTHDD}\t/boot\text3\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die   echo -e "${BOOTHDD}\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die
    689   echo -e "${ROOTHDD}\t/\text3\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die   echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die
    690   fi   fi
    691   # not needed busybox loads all with swapon -a, even if not mentioned in fstab   # not needed busybox loads all with swapon -a, even if not mentioned in fstab
    692   #echo -e "UUID='$(get_uuid ${SWAPHDD})'\tswap\tswap\tpri=1\t0 0" >> ${INSTALLPATH}/etc/fstab || die   #echo -e "UUID='$(get_uuid ${SWAPHDD})'\tswap\tswap\tpri=1\t0 0" >> ${INSTALLPATH}/etc/fstab || die
    # Line 695  install_system_settings_flash() Line 702  install_system_settings_flash()
    702   # schreibe fstab   # schreibe fstab
    703   if is_uuid_supported   if is_uuid_supported
    704   then   then
    705   echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\text3\tnoatime\t0 0" > ${INSTALLPATH}/etc/fstab || die   echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" > ${INSTALLPATH}/etc/fstab || die
    706   else   else
    707   echo -e "${ROOTHDD}\t/\text3\tnoatime\t0 0" > ${INSTALLPATH}/etc/fstab || die   echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" > ${INSTALLPATH}/etc/fstab || die
    708   fi   fi
    709   echo -e "proc\t/proc\tproc\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die   echo -e "proc\t/proc\tproc\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die
    710   echo -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die   echo -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die
    Legend:
    Removed from v.1574  
    changed lines
      Added in v.2389