Changeset 6448


Ignore:
Timestamp:
Dec 12, 2017, 1:03:41 PM (20 months ago)
Author:
jrpelegrina
Message:

Updated to new version of grub2(2.02~beta2-36ubuntu3.14)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • grub2/trunk/fuentes/postinst.in

    r5465 r6448  
    300300}
    301301
     302no_nvram_arg() {
     303    db_get grub2/update_nvram
     304    if [ "$RET" = false ]; then
     305        echo "--no-nvram"
     306    fi
     307}
     308
    302309run_grub_install()
    303310{
     
    384391        ;;
    385392    esac
    386 
    387     # LLIUREX HACK
    388     # ucf --three-way --debconf-ok --sum-file=/usr/share/grub/default/grub.md5sum ${tmp_default_grub} /etc/default/grub
    389 
     393    #LLIUREX HACK               
     394    #ucf --three-way --debconf-ok --sum-file=/usr/share/grub/default/grub.md5sum ${tmp_default_grub} /etc/default/grub
    390395    package="$(ucfq --with-colons /etc/default/grub | cut -d : -f 2)"
    391396    if echo $package | grep -q "^grub-" ; then
     
    717722            FORCE_EXTRA_REMOVABLE="--force-extra-removable"
    718723          fi
    719           run_grub_install --target="$target" "$FORCE_EXTRA_REMOVABLE"
     724          NO_NVRAM="$(no_nvram_arg)"
     725          run_grub_install --target="$target" "$FORCE_EXTRA_REMOVABLE" "$NO_NVRAM"
    720726        fi
    721727
     
    739745            # don't install it to any PReP partition.
    740746            prep_bootdev="$(/usr/lib/grub/powerpc-ieee1275/prep-bootdev)"
    741             run_grub_install --target=powerpc-ieee1275 $prep_bootdev
     747            NO_NVRAM="$(no_nvram_arg)"
     748            run_grub_install --target=powerpc-ieee1275 $prep_bootdev "$NO_NVRAM"
    742749          ;;
    743750        esac
Note: See TracChangeset for help on using the changeset viewer.