- Timestamp:
- Mar 21, 2016, 4:54:33 PM (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3.2/mindi/mindi
r3534 r3535 271 271 return 272 272 fi 273 else274 echo -en "`basename $mappath | tr '.' '#' | sed 's/#kmap#gz//' | sed 's/#inc#gz//'` " | tr '#' '.'275 273 fi 276 274 … … 286 284 [ "$sss" = "" ] && sss=`grep -F "$included_item" $MINDI_TMP/keymaps.find` 287 285 for ii in $sss ; do 288 [ -e "$ii" ] && AddKeyboardMappingFile $ii286 [ -e "$ii" ] && AddKeyboardMappingFile $ii 289 287 done 290 288 else … … 500 498 return 501 499 fi 502 LogAll "INFO: Adding the following keyboard mapping tables:"500 echo -en "INFO: Adding keyboard mapping tables" 503 501 mkdir -p $bigdir/tmp 504 502 echo "keymap-lives-here $mappath" >> $bigdir/tmp/$MRCFG … … 1474 1472 MakeISO() { 1475 1473 1476 LogAll "INFO: Invoking $CMD "1474 LogAll "INFO: Invoking $CMD ." 1477 1475 (cd "$MINDI_TMP/mpt" ; $CMD .) > /dev/null 2> $MINDI_TMP/mkisofs.log 1478 1476 if [ $? -ne 0 ] ; then … … 1785 1783 cp $part $MINDI_CACHE 1786 1784 if [ "$ARCH" = "ia64" ] || [ "$BOOT_TYPE" = "UEFI" ]; then 1787 # Here we need to remount to put the boot image at the right place now it's available 1788 mount -t vfat $mount_opt $part $MINDI_TMP/mpt 2>> $LOGFILE 1789 # We don't need the previous content used to make it, free space 1790 rm -rf $MINDI_TMP/mpt/{EFI,initrd.img,vmlinuz,images/all.tar.gz} 1791 # We need the boot image now 1792 cp $MINDI_CACHE/mindi-bootroot.img $MINDI_TMP/mpt/images 1785 # We just need the EFI dir and the boot image for this case 1786 mkdir -p $MINDI_TMP/mpt2 $MINDI_TMP/mpt/images 1787 mount -o loop $MINDI_CACHE/mindi-bootroot.img $MINDI_TMP/mpt2 2>> $LOGFILE 1788 # We need again the kernel+initrd at the root for UEFI boot at least 1789 cp -a $MINDI_TMP/mpt2/EFI $MINDI_TMP/mpt2/vmlinuz $MINDI_TMP/mpt2/initrd.img $MINDI_TMP/mpt 1790 # We need the boot image now and what mindi needs at restore time as well 1791 cp -a $MINDI_TMP/mpt2/images/all.tar.gz $MINDI_CACHE/mindi-bootroot.img $MINDI_TMP/mpt/images 1792 umount $MINDI_TMP/mpt2 1793 LogFile "----------- target dir content -----------" 1794 LogFile "------------------------------------------" 1795 ls -lR $MINDI_TMP/mpt >> $LOGFILE 1796 LogFile "------------------------------------------" 1793 1797 MakeISO 1794 umount $MINDI_TMP/mpt || Die "Unable to unmount $MINDI_TMP/mpt"1795 1798 fi 1796 1799 else … … 1946 1949 echo -en "set " 1947 1950 else 1951 # syslinux family 1948 1952 echo -en "prompt 1\ndisplay message.txt\nF1 message.txt\nF2 boot1.txt\nF3 boot2.txt\nF4 pxe.txt\n" 1949 1953 fi … … 2012 2016 outstr="title $i\n\tkernel /vmlinuz root=/dev/ram0 rw ramdisk_size=$ramdisk_size ${ooo} $MINDI_ADDITIONAL_BOOT_PARAMS\n\tinitrd=/initrd.img\n" 2013 2017 elif [ "$type" = "grub2" ]; then 2014 outstr="menuentry '$i' {\n\tinsmod all_video\n\tinsmod gzio\n\tinsmod part_msdos\n\tinsmod part_gpt\n\tinsmod ext2\n\tinsmod xfs\n\techo 'Loading kernel...'\n\tlinux /vmlinuz root=/dev/ram0 rw ramdisk_size=$ramdisk_size ${ooo} $MINDI_ADDITIONAL_BOOT_PARAMS\n\techo 'Loading ramdisk...'\n\tinitrd /initrd.img\n}\n" 2018 if [ "$BOOT_TYPE" = "UEFI" ]; then 2019 lorder="linuxefi" 2020 iorder="initrdefi" 2021 else 2022 lorder="linux" 2023 iorder="initrd" 2024 fi 2025 outstr="menuentry '$i' {\n\tinsmod all_video\n\tinsmod gzio\n\tinsmod part_msdos\n\tinsmod part_gpt\n\tinsmod ext2\n\tinsmod xfs\n\techo 'Loading kernel...'\n\t$lorder /vmlinuz root=/dev/ram0 rw ramdisk_size=$ramdisk_size ${ooo} $MINDI_ADDITIONAL_BOOT_PARAMS\n\techo 'Loading ramdisk...'\n\t$iorder /initrd.img\n}\n" 2015 2026 else 2016 2027 ps="/" … … 2426 2437 done 2427 2438 if [ ! "$possible_kernels" ] && uname -a | grep Knoppix > /dev/null ; then 2428 possible_kernels=`find /boot/vmlinuz-[2 3].* | tail -n1`2439 possible_kernels=`find /boot/vmlinuz-[2-9].* | tail -n1` 2429 2440 fi 2430 2441 if [ ! "$possible_kernels" ] ; then
Note:
See TracChangeset
for help on using the changeset viewer.