Changeset 3428


Ignore:
Timestamp:
Aug 27, 2015, 2:48:37 AM (3 years ago)
Author:
bruno
Message:

Also copy EFI|boot dir to the ISO directly

Location:
branches/3.2
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/3.2/mindi/mindi

    r3427 r3428  
    19431943    [ -e "$MINDI_LIB/memdisk" ] && cp -f $MINDI_LIB/memdisk $mountpoint 2>> $LOGFILE
    19441944
    1945     #cp `dirname $kernelpath`/*.efi $mountpoint 2>> $LOGFILE
     1945    # copy boot stuff now generated in PrepareDataDiskImage
     1946    if [ "$BOOT_TYPE" = "UEFI" ]; then
     1947        (cd $mountpoint ; tar xfz $MINDI_CACHE/all.tar.gz ./EFI)
     1948    else
     1949        (cd $mountpoint ; tar xfz $MINDI_CACHE/all.tar.gz ./boot)
     1950    fi
     1951
    19461952    umount $mountpoint || Die "Cannot unmount mountpoint ($mountpoint)"
    19471953    echo -en "..."
     
    32753281fi
    32763282if [ -f $MINDI_LIB/rootfs/usr/bin/busybox ]; then
    3277     LogIt "INFO: Mindi-`$MINDI_LIB/rootfs/usr/bin/busybox 2>&1 | head -1`"
     3283    LogIt "INFO: You are using Mindi-`$MINDI_LIB/rootfs/usr/bin/busybox 2>&1 | head -1`"
    32783284else
    32793285    LogIt "ERROR: Unable to find mindi-busybox, please install it"
  • branches/3.2/mondo/src/mondoarchive/mondoarchive.c

    r3380 r3428  
    384384/* Report result of entire operation (success? errors?) */
    385385    if (!retval) {
    386         mvaddstr_and_log_it(g_currentY++, 0,
    387                             "Backup and/or verify ran to completion. Everything appears to be fine.");
     386        mvaddstr_and_log_it(g_currentY++, 0, "Backup and/or verify ran to completion. Everything appears to be fine.");
    388387    } else {
    389         mvaddstr_and_log_it(g_currentY++, 0,
    390                             "Backup and/or verify ran to completion. However, errors did occur.");
     388        mvaddstr_and_log_it(g_currentY++, 0, "Backup and/or verify ran to completion. However, errors did occur.");
    391389    }
    392390
    393391    if (does_file_exist(MINDI_CACHE"/mondorescue.iso")) {
    394         log_to_screen
    395             (MINDI_CACHE"/mondorescue.iso, a boot/utility CD, is available if you want it.");
     392        log_to_screen(MINDI_CACHE"/mondorescue.iso, a boot/utility CD, is available if you want it.");
    396393    }
    397394
Note: See TracChangeset for help on using the changeset viewer.