View | Details | Raw Unified | Return to bug 116510
Collapse All | Expand All

(-)prepare_suspend_to_disk (-1 / +5 lines)
Lines 27-32 Link Here
27
                    # choice anyway for now.
27
                    # choice anyway for now.
28
NEXT_BOOT=""
28
NEXT_BOOT=""
29
RUNNING=`uname -r`
29
RUNNING=`uname -r`
30
ARCH=`uname -m`
30
let PERCENT+=$STEP
31
let PERCENT+=$STEP
31
if [ "${BOOT_LOADER:-GRUB}" == "GRUB" ]; then
32
if [ "${BOOT_LOADER:-GRUB}" == "GRUB" ]; then
32
    progress "${_M01}"
33
    progress "${_M01}"
Lines 38-44 Link Here
38
            DEBUG "Found kernel symlink $BOOTING => $IMAGE" INFO
39
            DEBUG "Found kernel symlink $BOOTING => $IMAGE" INFO
39
            BOOTING=$IMAGE
40
            BOOTING=$IMAGE
40
        fi
41
        fi
41
        BOOTING="${BOOTING#vmlinuz-}"
42
        case $ARCH in
43
            ppc*)   BOOTING="${BOOTING#vmlinux-}" ;;
44
            *)      BOOTING="${BOOTING#vmlinuz-}" ;;
45
        esac
42
        if [ "$RUNNING" == "$BOOTING" ]; then
46
        if [ "$RUNNING" == "$BOOTING" ]; then
43
            NEXT_BOOT=${MENU_ENTRIES[$I]}
47
            NEXT_BOOT=${MENU_ENTRIES[$I]}
44
            DEBUG "running kernel corresponds to grub menu entry $NEXT_BOOT" DIAG
48
            DEBUG "running kernel corresponds to grub menu entry $NEXT_BOOT" DIAG

Return to bug 116510