Changeset e0dace0


Ignore:
Timestamp:
07/15/14 13:59:10 (10 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, releng/10.0.3, releng/10.1, releng/10.1.1, releng/10.1.2
Children:
ac59194
Parents:
04aeb2a (diff), 1fff3bab (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of github.com:pcbsd/pcbsd

Location:
src-sh
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • src-sh/pc-installdialog/pc-installdialog.sh

    r366cd80 r1fff3bab  
    446446get_hardware_info() 
    447447{ 
    448  
    449448  #This is to detect an active network card for FreeBSD & PC-BSD 
    450449   ifconfig | grep -q 'status: active' 
    451450   if [ $? -eq 0 ] ; then 
    452      echo "Compatible Network Card Detected: NIC is up" 
     451     echo "Compatible Network Card Detected: NIC is up" >> /tmp/.hardwareinfo.$$ 
    453452   else 
    454      echo "No Compatible Network Card Detected: NIC is down"     
     453     echo "No Compatible Network Card Detected: NIC is down" >> /tmp/.hardwareinfo.$$   
    455454     fi 
    456    echo "Detected Hard Disks:" 
    457    $PCSYS disk-list 
    458    rtn 
     455   echo "Detected Hard Disks:" >> /tmp/.hardwareinfo.$$ 
     456   $PCSYS disk-list >> /tmp/.hardwareinfo.$$ 
     457   dialog --tailbox /tmp/.hardwareinfo.$$ 30 60 
     458   rm /tmp/.hardwareinfo.$$ 
    459459} 
    460460 
  • src-sh/libsh/functions.sh

    r234414e r04aeb2a  
    824824     # Re-install GRUB on this disk 
    825825     echo "Installing GRUB to $disk" >&2 
    826      grub-install /dev/${disk} 
     826     grub-install --modules='zfs part_gpt part_bsd geli' /dev/${disk} 
    827827  done 
    828828  return 0 
  • src-sh/lpreserver/backend/functions.sh

    r5969632 r04aeb2a  
    519519   # Lastly we need to stamp GRUB 
    520520   echo "Stamping GRUB on: $disk" 
    521    rc_halt_s "grub-install --force /dev/${disk}" 
     521   rc_halt_s "grub-install --modules='zfs part_gpt part_bsd geli' --force /dev/${disk}" 
    522522 
    523523   echo "Added $disk ($aDev) to zpool $pool. Resilver will begin automatically." 
  • src-sh/pc-sysinstall/backend/functions-unmount.sh

    r75eb09a r04aeb2a  
    263263 
    264264    # Stamp GRUB now 
    265     rc_halt "chroot ${FSMNT} grub-install --force $gDisk" 
     265    rc_halt "chroot ${FSMNT} grub-install --modules='zfs part_gpt part_bsd geli' --force $gDisk" 
    266266  done < ${TMPDIR}/.grub-install 
    267267 
Note: See TracChangeset for help on using the changeset viewer.