Magellan Linux

  • Back to homepage
    • /[alx-svn]/alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh

    Diff of /alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh

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

    revision 1186 by niro, Wed Aug 5 18:12:25 2009 UTC revision 1187 by niro, Wed Aug 5 19:30:37 2009 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.3"  VERSION="0.3.4"
    25  TITLE="alxinstall-ng - ${VERSION}"  TITLE="alxinstall-ng - ${VERSION}"
    26    
    27  CDPATH="/mnt/cdrom"  CDPATH="/mnt/cdrom"
    # Line 480  get_blkid() Line 480  get_blkid()
    480   local dev="$1"   local dev="$1"
    481   [[ -z ${dev} ]] && die "no dev given"   [[ -z ${dev} ]] && die "no dev given"
    482    
    483   eval $(busybox.mkinitrd blkid ${dev} | grep "${dev}:" | sed 's/.*:\ //')   # check if given device is already an UUID
    484     if [[ ${dev/UUID=/}x != ${dev}x ]]
    485     then
    486     eval "${dev}"
    487     else
    488     eval $(busybox.mkinitrd blkid ${dev} | grep "${dev}:" | sed 's/.*:\ //')
    489     fi
    490   echo ${UUID}   echo ${UUID}
    491  }  }
    492    
    493  install_system_settings()  install_system_settings()
    494  {  {
    495   # schreibe fstab   # schreibe fstab
    496   echo -e "$(get_blkid ${BOOTHDD})\t/boot\text3\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die   echo -e "UUID=$(get_blkid ${BOOTHDD})\t/boot\text3\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die
    497   echo -e "$(get_blkid ${ROOTHDD})\t/\text3\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die   echo -e "UUID=$(get_blkid ${ROOTHDD})\t/\text3\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die
    498   echo -e "$(get_blkid ${SWAPHDD})\tswap\tswap\tpri=1\t0 0" >> ${INSTALLPATH}/etc/fstab || die   # not needed busybox loads all with swapon -a, even if not mentioned in fstab
    499     #echo -e "UUID='$(get_blkid ${SWAPHDD})'\tswap\tswap\tpri=1\t0 0" >> ${INSTALLPATH}/etc/fstab || die
    500   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
    501   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
    502    
    # Line 500  install_system_settings() Line 507  install_system_settings()
    507  install_system_settings_flash()  install_system_settings_flash()
    508  {  {
    509   # schreibe fstab   # schreibe fstab
    510   echo -e "$(get_blkid ${ROOTHDD})\t/\text3\tnoatime\t0 0" > ${INSTALLPATH}/etc/fstab || die   echo -e "UUID=$(get_blkid ${ROOTHDD})\t/\text3\tnoatime\t0 0" > ${INSTALLPATH}/etc/fstab || die
    511   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
    512   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
    513  }  }
    Legend:
    Removed from v.1186  
    changed lines
      Added in v.1187