Changeset 540


Ignore:
Timestamp:
10/01/12 10:41:12 (8 years ago)
Author:
bas
Message:

Makefile.in:

  • When creating a tarball clean up the directory

initrd/functions/stubs/disks:

  • better grub2 installation detection, borrowed from 1.5 version
Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile.in

    r537 r540  
    7575
    7676# build everything, install nothing
    77 build:  initrd_install kernel $(ROOT_DIR)/build
     77build:  tar_clean initrd_install kernel $(ROOT_DIR)/build
     78
     79tar_clean:
     80        ( rm -rf $(TAR_DIR)/* )
    7881
    7982$(ROOT_DIR)/build:
  • trunk/initrd/functions/stubs/disks

    r464 r540  
    637637    target=$1
    638638
     639    GRUB2_INSTALL=grub-install
     640    GRUB2_MKCONFIG=grub-mkconfig
     641    GRUB2_CONFIG=/boot/grub/grub.cfg
     642
     643    ## Determine the grub2 command it is linux distribution depended
     644    #
     645    if [ -d /a/boot/grub2 ]
     646    then
     647        GRUB2_INSTALL=grub2-install
     648        GRUB2_MKCONFIG=grub2-mkconfig
     649        GRUB2_CONFIG=/boot/grub2/grub.cfg
     650    fi
     651
    639652    logmsg "Using GRUB2 install method! :: $target"
    640653
    641     logmsg "chroot /a grub-install --no-floppy $target"
    642     chroot /a grub-install --no-floppy $target
    643 
    644     logmsg " /a grub-mkconfig -o /boot/grub/grub.cfg"
    645     chroot /a grub-mkconfig -o /boot/grub/grub.cfg
    646 }
     654    logmsg "chroot /a $GRUB2_INSTALL --no-floppy $target"
     655    chroot /a $GRUB2_INSTALL --no-floppy $target
     656
     657    logmsg " /a $GRUB2_MKCONFIG -o $GRUB2_CONFIG"
     658    chroot /a $GRUB2_MKCONFIG -o $GRUB2_CONFIG
     659}
Note: See TracChangeset for help on using the changeset viewer.