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 2441 by niro, Tue Jan 7 14:46:13 2014 UTC revision 2443 by niro, Tue Jan 7 14:50:35 2014 UTC
    # Line 618  CHROOTEOF Line 618  CHROOTEOF
    618    
    619  install_system_settings()  install_system_settings()
    620  {  {
    621   # schreibe fstab   local CONFIG
    622   echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die  
    623   # not needed busybox loads all with swapon -a, even if not mentioned in fstab   # write fstab
    624   #echo -e "UUID='$(get_uuid ${SWAPHDD})'\tswap\tswap\tpri=1\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die   CONFIG="${INSTALLROOT}/etc/fstab"
    625   echo -e "proc\t/proc\tproc\tdefaults\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die   clearconfig
    626   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"
    627     addconfig -e "proc\t/proc\tproc\tdefaults\t0 0"
    628     addconfig -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0"
    629    
    630   # install network config skeleton   # install network config skeleton
    631   install -m0644 ${INSTALLROOT}/etc/alxconfig-ng/skel/net/net.eth0 ${INSTALLROOT}/etc/conf.d/ || dialog_die   CONFIG="${INSTALLROOT}/etc/conf.d/net.eth0"
    632     clearconfig
    633     addconfig 'ONBOOT="yes"'
    634     addconfig 'NETWORKING="dhcp"'
    635    
    636   # intel framebufer quirk   # intel framebuffer quirk
    637   if [[ -e /proc/fb ]]   if [ -e ${INSTALLROOT}/etc/splash/splash.conf ]
    638   then   then
    639   if [[ ! -z $(grep 'inteldrmfb' /proc/fb) ]]   if [ -e /proc/fb ]
    640   then   then
    641   fbdev=$(grep 'inteldrmfb' /proc/fb | sed 's:\([0-9]\).*:\1:')   if [[ ! -z $(grep 'inteldrmfb' /proc/fb) ]]
      if [[ ${fbdev} != 0 ]]  
    642   then   then
    643   sed -i "s:^\(SPLASH_DEV=\).*:\1\"/dev/fb${fbdev}\":" ${INSTALLROOT}/etc/splash/splash.conf || dialog_die   fbdev=$(grep 'inteldrmfb' /proc/fb | sed 's:\([0-9]\).*:\1:')
    644     if [[ ${fbdev} != 0 ]]
    645     then
    646     sed -i "s:^\(SPLASH_DEV=\).*:\1\"/dev/fb${fbdev}\":" ${INSTALLROOT}/etc/splash/splash.conf || dialog_die
    647     fi
    648   fi   fi
    649   fi   fi
    650   fi   fi
    Legend:
    Removed from v.2441  
    changed lines
      Added in v.2443