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 1179 by niro, Tue Aug 4 22:39:22 2009 UTC revision 1180 by niro, Wed Aug 5 18:12:25 2009 UTC
    # Line 471  CHROOTEOF Line 471  CHROOTEOF
    471   rm ${INSTALLPATH}/root/.bashrc   rm ${INSTALLPATH}/root/.bashrc
    472  }  }
    473    
    474    get_blkid()
    475    {
    476     local UUID
    477     local SEC_TYPE
    478     local TYPE
    479    
    480     local dev="$1"
    481     [[ -z ${dev} ]] && die "no dev given"
    482    
    483     eval $(busybox.mkinitrd blkid ${dev} | grep "${dev}:" | sed 's/.*:\ //')
    484     echo ${UUID}
    485    }
    486    
    487  install_system_settings()  install_system_settings()
    488  {  {
    489   # schreibe fstab   # schreibe fstab
    490   echo -e "${BOOTHDD}\t/boot\text3\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die   echo -e "$(get_blkid ${BOOTHDD})\t/boot\text3\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die
    491   echo -e "${ROOTHDD}\t/\text3\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die   echo -e "$(get_blkid ${ROOTHDD})\t/\text3\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die
    492   echo -e "${SWAPHDD}\tswap\tswap\tpri=1\t0 0" >> ${INSTALLPATH}/etc/fstab || die   echo -e "$(get_blkid ${SWAPHDD})\tswap\tswap\tpri=1\t0 0" >> ${INSTALLPATH}/etc/fstab || die
    493   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
    494   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
    495    
    # Line 487  install_system_settings() Line 500  install_system_settings()
    500  install_system_settings_flash()  install_system_settings_flash()
    501  {  {
    502   # schreibe fstab   # schreibe fstab
    503   echo -e "${ROOTHDD}\t/\text3\tnoatime\t0 0" > ${INSTALLPATH}/etc/fstab || die   echo -e "$(get_blkid ${ROOTHDD})\t/\text3\tnoatime\t0 0" > ${INSTALLPATH}/etc/fstab || die
    504   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
    505   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
    506  }  }
    Legend:
    Removed from v.1179  
    changed lines
      Added in v.1180