Changeset 3585 in MondoRescue for branches

Timestamp:

Jun 2, 2016, 12:57:12 PM (9 years ago)

Author:

Bruno Cornec

Message:

• Mindi now is able to generate bootable ISO images from existing kernel/initrd/bootloader

For this, split code of PrepareDataDiskImages into PrepareBootDir and PrepareAllTar called directly in case of the --ironic option.
This should allow a call in an Ironic config to create the IPA bootable image for the agent_ilo driver

• Extend online help with more options supported

File:

• branches/3.2/mindi/mindi (modified) (6 diffs)

branches/3.2/mindi/mindi

@@ -127 +127 @@
 fi
 
-ISO_OPT="-J -r -v -p Mindi -publisher http://www.mondorescue.org -A Mindi -V Mindi_Image -o $MINDI_CACHE/mindi.iso "
+ISO_OPT="-J -r -v -p Mindi -publisher http://www.mondorescue.org -A Mindi -V Mindi-Image -o $MINDI_CACHE/mindi.iso "
 
 # Mindi set this as default in case it's invoked alone
@@ -2079 +2079 @@
 }
 
+PrepareBootDir() {
+
+        local detect
+# Needs a bigdir variable setup before calling it
+
+    # copy (e)lilo/isolinux/grub/whatever stuff into it as well
+    # to get it on the media (in addition to the boot part
+    # and also to support UEFI boot mechanism
+    if [ "$boottype" != "" ]; then
+        detect="no"
+    else
+        detect="yes"
+        boottype=syslinux
+    fi
+    bootdir=$bigdir/$boottype
+    bootconf="$bootdir/$boottype.cfg"
+    mkdir -p $bootdir
+    FindLdlinux32Binary
+
+    if [ "$BOOT_TYPE" != "BIOS" ]; then
+        if [ "$BOOT_TYPE" = "UNKNOWN" ]; then
+            LogAll "ERROR: UNKNOWN BOOT_TYPE. Please report upstream"
+            MindiExit -1
+        fi
+
+        mountefi=0
+        # EFI or UEFI
+        # TODO: names are hard-coded for now
+        if [ "$BOOT_TYPE" = "UEFI" ]; then
+            # UEFI
+            efidir=$bigdir/EFI/BOOT
+            # Auto-detection if needed
+            if [ $detect = "yes" ]; then
+
+                # mount /boot/efi if needed
+                df -T | grep /boot/efi | grep -qE 'vfat'
+                if [ $? -ne 0 ]; then
+                    mount /boot/efi
+                    if [ $? -ne 0 ]; then
+                        echo "ERROR: You have to mount your (U)EFI partition when using mindi"
+                        MindiExit -1
+                    fi
+                    mountefi=1
+                fi
+
+                # On RHEL6 grub works
+                dname=`pbdistrocheck | grep -E '^Name:' | cut -d':' -f2`
+                dver=`pbdistrocheck | grep -E '^Ver:' | cut -d':' -f2`
+                if [ $dname = "rhel" ] && [ $dver = "6" ]; then
+                    boottype=grub
+                elif [ $dname = "rhel" ] && [ $dver = "7" ]; then
+                    boottype=grub2
+                elif [ $dname = "debian" ] && [ $dver = "8" ]; then
+                    boottype=grub2
+                else
+                    # Use syslinux.efi as the default boot loader ... but it doesn't work for now :-(
+                    boottype=syslinux
+                fi
+            fi
+            if [ "$boottype" = "syslinux" ]; then
+                if [ ! "$bootbin" ]; then
+                    FindSyslinux64EFI
+                    bootbin=$SYSLINUX64EFI
+                fi
+                bootconf="$efidir/syslinux.cfg"
+            elif [ "$boottype" = "grub" ]; then
+                if [ ! "$bootbin" ]; then
+                    bootbin=`find /boot/efi -iname "grub*.efi" | head -1`
+                fi
+                bootconf="$efidir/BOOTX64.conf"
+            elif [ "$boottype" = "grub2" ]; then
+                if [ ! "$bootbin" ]; then
+                    bootbin=`find /boot/efi -iname "grub*.efi" | head -1`
+                fi
+                bootconf="$efidir/grub.cfg"
+            fi
+
+            # Depending on the arch, the target boot file is different
+            if [ "$ARCH" = "x86_64" ] ; then
+                tgbin="BOOTX64.efi"
+            elif [ "$ARCH" = "armv8" ]; then
+                tgbin="BOOTAA64.efi"
+            else
+                # i?386
+                tgbin="BOOTIA32"
+            fi
+        else
+            # EFI
+            efidir=$bootdir
+            bootbin=`find /boot/efi -iname "elilo.efi" | head -1`
+            tgbin=$bootbin
+            boottype=elilo
+            bootconf="$efidir/elilo.conf"
+        fi
+        LogAll "INFO: Found $boottype boot type"
+        mkdir -p $efidir
+        cp $bootbin $efidir/$tgbin
+
+        if [ $mountefi -eq 1 ]; then
+            umount /boot/efi 2>&1 > /dev/null
+        fi
+
+        if [ $boottype = "syslinux" ]; then
+            FindLdlinuxe64Binary
+            if [ -e "$LDLINUXE64" ]; then
+                LogFile "INFO: Copying $LDLINUXE64 to $efidir"
+                cp $LDLINUXE64 $efidir 2>> $LOGFILE || Die "Cannot copy $LDLINUXE64 to $efidir). Did you run out of disk space?"
+                cp $LDLINUXE64/../libutil.c32 $efidir 2>> $LOGFILE || Die "Cannot copy libutil.c32 to $efidir). Did you run out of disk space?"
+                if [ -e $LDLINUXE64/../isolinux.c32 ]; then
+                    cp $LDLINUXE64/../isolinux.c32 $efidir 2>> $LOGFILE || Die "Cannot copy isolinux.c32 to $efidir). Did you run out of disk space?"
+                fi
+            fi
+        fi
+        # tgdir for syslinux
+        tgdir=$bigdir/EFI
+    else
+        # tgdir for syslinux
+        tgdir=$bootdir
+    fi
+    # In all cases prepare syslinux content for BIOS mode
+    # so that we can have multi boot mode media BIOS+UEFI
+    # Useful for syslinux 5.x
+    if [ -e "$LDLINUXC32" ]; then
+        LogFile "INFO: Copying $LDLINUXC32 to $tgdir"
+        cp $LDLINUXC32 "$tgdir" 2>> $LOGFILE || Die "Cannot copy $LDLINUXC32 to $tgdir. Did you run out of disk space?"
+    fi
+    if [ -e $LDLINUXC32/../isolinux.c32 ]; then
+        LogFile "INFO: Copying isolinux.c32 to $tgdir"
+        cp $LDLINUXC32/../isolinux.c32 $tgdir 2>> $LOGFILE || Die "Cannot copy isolinux.c32 to $tgdir). Did you run out of disk space?"
+    fi
+
+    # Here we need to know the ramdisk_size
+    size_of_all_tools=`du -sk $bigdir | cut -f1`
+    export ramdisk_size=$(($size_of_all_tools+$EXTRA_SPACE))
+    LogFile "INFO: Ramdisk will be $ramdisk_size KB"
+
+    MakeBootConfFile $boottype > $bootconf
+    LogFile "Boot Conf file $bootconf content is:"
+    LogFile "------------------------------------"
+    cat $bootconf >> $LOGFILE
+    LogFile "------------------------------------"
+    if [ "$BOOT_TYPE" = "UEFI" ]; then
+        # Also generate the syslinux conf
+        MakeBootConfFile syslinux > "$bigdir/EFI/syslinux.cfg"
+        LogFile "Boot Conf file $bigdir/EFI/syslinux.cfg content is:"
+        LogFile "---------------------------------------------------"
+        cat $bigdir/EFI/syslinux.cfg >> $LOGFILE
+        LogFile "---------------------------------------------------"
+    fi
+
+}
+
+PrepareAllTar() {
+    echo -en "INFO: Tarring and zipping the data content..."
+    (cd "$bigdir" ; tar -b 4096 -cf - . 2>> $MINDI_TMP/$$.log | gzip -9 > $MINDI_CACHE/all.tar.gz || LogAll "ERROR: Problem creating all.tar.gz" $MINDI_TMP/$$.log)
+    LogFile "Size of the data content"
+    LogFile "------------------------"
+    du -sk $MINDI_CACHE/*gz >> $LOGFILE
+    LogFile "------------------------"
+    echo -e "$DONE"
+
+    [ "$bigdir" != "/" ] && rm -rf $bigdir
+}
 
 PrepareDataDiskImages() {
@@ -2119 +2282 @@
 
     CopyDependenciesToDirectory < $needlist $bigdir `wc -l $needlist` 1
+    rm -f $needlist
     echo -e "$DONE"
 
@@ -2190 +2354 @@
     fi
 
-    # copy (e)lilo/isolinux/grub/whatever stuff into it as well
-    # to get it on the media (in addition to the boot part
-    # and also to support UEFI boot mechanism
-    bootdir=$bigdir/syslinux
-    bootconf="$bootdir/syslinux.cfg"
-    boottype=syslinux
-    mkdir -p $bootdir
-    FindLdlinux32Binary
-    if [ "$BOOT_TYPE" != "BIOS" ]; then
-        if [ "$BOOT_TYPE" = "UNKNOWN" ]; then
-            LogAll "ERROR: UNKNOWN BOOT_TYPE. Please report upstream"
-            MindiExit -1
-        fi
-        # EFI or UEFI
-        # TODO: names are hard-coded for now
-        if [ "$BOOT_TYPE" = "UEFI" ]; then
-            # UEFI
-            efidir=$bigdir/EFI/BOOT
-            # On RHEL6 grub works
-            dname=`pbdistrocheck | grep -E '^Name:' | cut -d':' -f2`
-            dver=`pbdistrocheck | grep -E '^Ver:' | cut -d':' -f2`
-            if [ $dname = "rhel" ] && [ $dver = "6" ]; then
-                bootbin=`find /boot/efi -iname "grub*.efi" | head -1`
-                bootconf="$efidir/BOOTX64.conf"
-                boottype=grub
-            elif [ $dname = "rhel" ] && [ $dver = "7" ]; then
-                bootbin=`find /boot/efi -iname "grub*.efi" | head -1`
-                bootconf="$efidir/grub.cfg"
-                boottype=grub2
-            elif [ $dname = "debian" ] && [ $dver = "8" ]; then
-                bootbin=`find /boot/efi -iname "grub*.efi" | head -1`
-                bootconf="$efidir/grub.cfg"
-                boottype=grub2
-            else
-                # Use syslinux.efi as the default boot loader ... but it doesn't work for now :-(
-                FindSyslinux64EFI
-                bootbin=$SYSLINUX64EFI
-                bootconf="$efidir/syslinux.cfg"
-            fi
-
-            # Depending on the arch, the target boot file is different
-            if [ "$ARCH" = "x86_64" ] ; then
-                tgbin="BOOTX64.efi"
-            elif [ "$ARCH" = "armv8" ]; then
-                tgbin="BOOTAA64.efi"
-            else
-                # i?386
-                tgbin="BOOTIA32"
-            fi
-        else
-            # EFI
-            efidir=$bootdir
-            bootbin=`find /boot/efi -iname "elilo.efi" | head -1`
-            tgbin=$bootbin
-            boottype=elilo
-            bootconf="$efidir/elilo.conf"
-        fi
-        LogAll "INFO: Found $boottype boot type"
-
-        # Copy it so that CD-ROM menu entry is satisfied
-        mountefi=0
-        df -T | grep /boot/efi | grep -qE 'vfat'
-        if [ $? -ne 0 ]; then
-            mount /boot/efi
-            if [ $? -ne 0 ]; then
-                echo "ERROR: You have to mount your (U)EFI partition when using mindi"
-                MindiExit -1
-            fi
-            mountefi=1
-        fi
-        mkdir -p $efidir
-        cp $bootbin $efidir/$tgbin
-        if [ $mountefi -eq 1 ]; then
-            umount /boot/efi 2>&1 > /dev/null
-        fi
-
-        if [ $boottype = "syslinux" ]; then
-            FindLdlinuxe64Binary
-            if [ -e "$LDLINUXE64" ]; then
-                LogFile "INFO: Copying $LDLINUXE64 to $efidir"
-                cp $LDLINUXE64 $efidir 2>> $LOGFILE || Die "Cannot copy $LDLINUXE64 to $efidir). Did you run out of disk space?"
-                cp $LDLINUXE64/../libutil.c32 $efidir 2>> $LOGFILE || Die "Cannot copy $LDLINUXE64 to $efidir). Did you run out of disk space?"
-            fi
-        fi
-        # In all cases prepare syslinux content for BIOS mode
-        # so that we can have multi boot mode media BIOS+UEFI
-        if [ -e "$LDLINUXC32" ]; then
-            LogFile "INFO: Copying $LDLINUXC32 to $bigdir/EFI"
-            cp $LDLINUXC32 "$bigdir/EFI" 2>> $LOGFILE || Die "Cannot copy $LDLINUXC32 to $bigtdir/EFI. Did you run out of disk space?"
-        fi
-    else
-        # Useful for syslinux 5.x
-        if [ -e "$LDLINUXC32" ]; then
-            LogFile "INFO: Copying $LDLINUXC32 to $bootdir"
-            cp $LDLINUXC32 $bootdir 2>> $LOGFILE || Die "Cannot copy $LDLINUXC32 to $bootdir. Did you run out of disk space?"
-        fi
-    fi
-
-    # Here we need to know the ramdisk_size
-    size_of_all_tools=`du -sk $bigdir | cut -f1`
-    export ramdisk_size=$(($size_of_all_tools+$EXTRA_SPACE))
-    LogFile "INFO: Ramdisk will be $ramdisk_size KB"
-
-    MakeBootConfFile $boottype > $bootconf
-    LogFile "Boot Conf file $bootconf content is:"
-    LogFile "------------------------------------"
-    cat $bootconf >> $LOGFILE
-    LogFile "------------------------------------"
-    if [ "$BOOT_TYPE" = "UEFI" ]; then
-        # Also generate the syslinux conf
-        MakeBootConfFile syslinux > "$bigdir/EFI/syslinux.cfg"
-        LogFile "Boot Conf file $bigdir/EFI/syslinux.cfg content is:"
-        LogFile "---------------------------------------------------"
-        cat $bigdir/EFI/syslinux.cfg >> $LOGFILE
-        LogFile "---------------------------------------------------"
-    fi
-
-    echo -en "INFO: Tarring and zipping the data content..."
-    (cd "$bigdir" ; tar -b 4096 -cf - . 2>> $MINDI_TMP/$$.log | gzip -9 > $MINDI_CACHE/all.tar.gz || LogAll "ERROR: Problem creating all.tar.gz" $MINDI_TMP/$$.log)
-    LogFile "Size of the data content"
-    LogFile "------------------------"
-    du -sk $MINDI_CACHE/*gz >> $LOGFILE
-    LogFile "------------------------"
-    echo -e "$DONE"
-
-    [ "$bigdir" != "/" ] && rm -rf $bigdir
-    rm -f $needlist
+    PrepareBootDir
+    PrepareAllTar
 }
 
@@ -3312 +3351 @@
         export MONDO_SHARE=""
         MindiExit 0
+    elif [ "$1" = "--ironic" ] ; then
+        [ ! "$2" ] && [ ! -f "$2" ] && Die "Please specify the kernel to use"
+        [ ! "$3" ] && [ ! -f "$3" ] && Die "Please specify the initramfs to use"
+        [ "$4" ] && [ "$4" != "UEFI" ] && [ "$4" != "BIOS" ] && Die "Please specify the boot mode as BIOS or UEFI"
+        #TODO: See how we can influence the boot loader
+        [ "$5" ] && [ "$5" != "isolinux" ] && [ "$5" != "grub" ] && [ "$5" != "grub2" ] && Die "Please specify the boot loader as isolinux or grub or grub2"
+        if [ "$5" ]; then
+            boottype=$5
+        fi
+        [ "$6" ] && [ ! -e "$6" ] && Die "Please specify an existing boot loader path for $boottype"
+        if [ "$6" ]; then
+            bootbin=$6
+        fi
+        kernelpath=$2
+        BOOT_TYPE=$4
+        bigdir=$MINDI_TMP/bigdir
+        PrepareBootDir
+        PrepareAllTar
+        cp $3 $MINDI_TMP/initrd.img
+        MakeBootableDevice ISO
+        MindiExit 0
     elif [ "$#" -ge "9" ] && [ "$1" = "--custom" ] ; then
         MONDO_TMP=$2
@@ -3394 +3454 @@
         fi
     else
-        LogScreen "Syntax: mindi (--custom ....)"
+        LogScreen "Syntax: mindi [--custom ....MondoRescue parameters...]"
+        LogScreen "        mindi --ironic kernel initrd [BIOS|UEFI] [syslinux|grub|grub2] [/path/to/bootloader]"
+        LogScreen "        mindi --locatedeps file"
+        LogScreen "        mindi --makemessage"
+        LogScreen "        mindi --makemountlist file"
+        LogScreen "        mindi --makebcf bootloader"
+        LogScreen "        mindi -V"
         MindiExit -1
     fi