]> git.proxmox.com Git - mirror_edk2.git/blobdiff - DuetPkg/CreateBootDisk.sh
projects / mirror_edk2.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix a security hole in shell binaries:
[mirror_edk2.git] / DuetPkg / CreateBootDisk.sh
diff --git a/DuetPkg/CreateBootDisk.sh b/DuetPkg/CreateBootDisk.sh
old mode 100644 (file)
new mode 100755 (executable)
index 69c66f3..bfe1abd
--- a/DuetPkg/CreateBootDisk.sh
+++ b/DuetPkg/CreateBootDisk.sh
@@ -3,6 +3,7 @@
 # Set up environment at fisrt.
 export BUILD_DIR=$WORKSPACE/Build/DuetPkg/DEBUG_UNIXGCC
 export BASETOOLS_DIR=$WORKSPACE/Conf/BaseToolsSource/Source/C/bin
+export BOOTSECTOR_BIN_DIR=$WORKSPACE/DuetPkg/BootSector/bin
 export DISK_LABEL=DUET
 export PROCESS_MARK=TRUE
 
@@ -13,8 +14,8 @@ if [ \
      "$*" = "--help" \
    ]
 then
-       echo "Usage: CreateBootDisk [usb|floppy|ide] MediaPath DevicePath [FAT12|FAT16|FAT32]"
-       echo "e.g. : CreateBootDisk floppy /media/floppy0 /dev/fd0 FAT12 "
+       echo "Usage: CreateBootDisk [usb|floppy|ide] MediaPath DevicePath [FAT12|FAT16|FAT32] [IA32|X64]"
+       echo "e.g. : CreateBootDisk floppy /media/floppy0 /dev/fd0 FAT12 IA32"
        PROCESS_MARK=FALSE
 fi
 
@@ -36,16 +37,24 @@ then
                                echo Create boot sector ...
                                ## Linux version of GenBootSector has not pass build yet.
                                $BASETOOLS_DIR/GnuGenBootSector -i $EFI_BOOT_DEVICE -o FDBs.com
-                               $BASETOOLS_DIR/BootSectImage -g FDBs.com $BUILD_DIR/IA32/DuetPkg/BootSector/BootSector/OUTPUT/bootsect.com -f
-                               $BASETOOLS_DIR/GnuGenBootSector -o $EFI_BOOT_DEVICE -i $BUILD_DIR/IA32/DuetPkg/BootSector/BootSector/OUTPUT/bootsect.com
+                               $BASETOOLS_DIR/BootSectImage -g FDBs.com $BOOTSECTOR_BIN_DIR/bootsect.com -f
+                               $BASETOOLS_DIR/GnuGenBootSector -o $EFI_BOOT_DEVICE -i $BOOTSECTOR_BIN_DIR/bootsect.com
        
                                cp $BUILD_DIR/FV/Efildr $EFI_BOOT_MEDIA
        
                                mkdir -p $EFI_BOOT_MEDIA/efi
                                mkdir -p $EFI_BOOT_MEDIA/efi/boot
-
-                               cp $WORKSPACE/EdkShellBinPkg/Bin/Ia32/Shell.efi $EFI_BOOT_MEDIA/efi/boot/bootia32.efi 
-       
+                               if [ "$5" = IA32 ]
+                               then
+                                       cp $WORKSPACE/EdkShellBinPkg/MinimumShell/Ia32/Shell.efi $EFI_BOOT_MEDIA/efi/boot/bootia32.efi 
+                               else
+                                       if [ "$5" = X64 ]
+                                       then
+                                               cp $WORKSPACE/EdkShellBinPkg/MinimumShell/X64/Shell.efi $EFI_BOOT_MEDIA/efi/boot/bootx64.efi 
+                                       else
+                                               echo Wrong Arch!
+                                       fi
+                               fi
                                echo Done.
                        else
                                echo "Wrong FAT type $4 for floppy!"
@@ -60,8 +69,8 @@ then
        
                                ## Linux version of GenBootSector has not pass build yet.
                                $BASETOOLS_DIR/GnuGenBootSector -i $EFI_BOOT_MEDIA -o FDBs.com
-                               $BASETOOLS_DIR/BootSectImage -g FDBs.com $BUILD_DIR/IA32/DuetPkg/BootSector/BootSector/OUTPUT/Bootsect.com -f
-                               $BASETOOLS_DIR/GnuGenBootSector -o $EFI_BOOT_MEDIA -i $BUILD_DIR/IA32/DuetPkg/BootSector/BootSector/OUTPUT/Bootsect.com
+                               $BASETOOLS_DIR/BootSectImage -g FDBs.com $BOOTSECTOR_BIN_DIR/bootsect.com -f
+                               $BASETOOLS_DIR/GnuGenBootSector -o $EFI_BOOT_MEDIA -i $BOOTSECTOR_BIN_DIR/bootsect.com
                                echo Done.
                        else
                                echo "Wrong FAT type" $4 "for floppy!"
@@ -72,11 +81,21 @@ then
 
                        if [ "$4" = FAT16 ]
                        then
-                               if [ "$5" = step2 ]
+                               if [ "$6" = step2 ]
                                then
                                        cp $BUILD_DIR/FV/Efildr16 $EFI_BOOT_MEDIA
                                        mkdir $EFI_BOOT_MEDIA/efi/boot
-                                       cp $WORKSPACE/EdkShellBinPkg/bin/ia32/Shell.efi $EFI_BOOT_MEDIA/efi/boot/bootia32.efi
+                                       if [ "$5" = IA32 ]
+                                       then
+                                               cp $WORKSPACE/EdkShellBinPkg/MinimumShell/Ia32/Shell.efi $EFI_BOOT_MEDIA/efi/boot/bootia32.efi 
+                                       else
+                                               if [ "$5" = X64 ]
+                                               then
+                                                       cp $WORKSPACE/EdkShellBinPkg/MinimumShell/X64/Shell.efi $EFI_BOOT_MEDIA/efi/boot/bootx64.efi 
+                                               else
+                                                       echo Wrong Arch!
+                                               fi
+                                       fi
                                        echo "step2 Done!"
                                else
                                        echo Format $EFI_BOOT_DEVICE ...
@@ -84,19 +103,29 @@ then
                                        echo Create boot sector ...
                                        ## Linux version of GenBootSector & Bootsectimage has not pass build yet.
                                        $BASETOOLS_DIR/GnuGenBootSector -i $EFI_BOOT_DEVICE -o UsbBs16.com
-                                       $BASETOOLS_DIR/BootSectImage -g UsbBs16.com $BUILD_DIR/IA32/DuetPkg/BootSector/BootSector/OUTPUT/Bs16.com -f
-                                       $BASETOOLS_DIR/GnuGenBootSector -o $EFI_BOOT_DEVICE -i $BUILD_DIR/IA32/DuetPkg/BootSector/BootSector/OUTPUT/Bs16.com
-                                       $BASETOOLS_DIR/GnuGenBootSector -m -o $EFI_BOOT_DEVICE -i $BUILD_DIR/IA32/DuetPkg/BootSector/BootSector/OUTPUT/Mbr.com
+                                       $BASETOOLS_DIR/BootSectImage -g UsbBs16.com $BOOTSECTOR_BIN_DIR/bs16.com -f
+                                       $BASETOOLS_DIR/GnuGenBootSector -o $EFI_BOOT_DEVICE -i $BOOTSECTOR_BIN_DIR/bs16.com
+                                       $BASETOOLS_DIR/GnuGenBootSector -m -o $EFI_BOOT_DEVICE -i $BOOTSECTOR_BIN_DIR/Mbr.com
                                        echo Done.
                                        echo PLEASE UNPLUG USB, THEN PLUG IT AGAIN TO DO STEP2!
                                fi
                        elif [ "$4" = FAT32 ]
                        then 
-                               if [ "$5" = step2 ]
+                               if [ "$6" = step2 ]
                                then
                                        cp $BUILD_DIR/FV/Efildr20 $EFI_BOOT_MEDIA
                                        mkdir $EFI_BOOT_MEDIA/efi/boot
-                                       cp $WORKSPACE/EdkShellBinPkg/bin/ia32/Shell.efi $EFI_BOOT_MEDIA/efi/boot/bootia32.efi
+                                       if [ "$5" = IA32 ]
+                                       then
+                                               cp $WORKSPACE/EdkShellBinPkg/MinimumShell/Ia32/Shell.efi $EFI_BOOT_MEDIA/efi/boot/bootia32.efi 
+                                       else
+                                               if [ "$5" = X64 ]
+                                               then
+                                                       cp $WORKSPACE/EdkShellBinPkg/MinimumShell/X64/Shell.efi $EFI_BOOT_MEDIA/efi/boot/bootx64.efi 
+                                               else
+                                                       echo Wrong Arch!
+                                               fi
+                                       fi
                                        echo "step2 Done!"
                                else
                                        echo Format $EFI_BOOT_DEVICE ...
@@ -104,9 +133,9 @@ then
                                        echo Create boot sector ...
                                        ## Linux version of GenBootSector & Bootsectimage has not pass build yet.
                                        $BASETOOLS_DIR/GnuGenBootSector -i $EFI_BOOT_DEVICE -o UsbBs32.com
-                                       $BASETOOLS_DIR/BootSectImage -g UsbBs32.com $BUILD_DIR/IA32/DuetPkg/BootSector/BootSector/OUTPUT/Bs32.com -f
-                                       $BASETOOLS_DIR/GnuGenBootSector -o $EFI_BOOT_DEVICE -i $BUILD_DIR/IA32/DuetPkg/BootSector/BootSector/OUTPUT/Bs32.com
-                                       $BASETOOLS_DIR/GnuGenBootSector -m -o $EFI_BOOT_DEVICE -i $BUILD_DIR/IA32/DuetPkg/BootSector/BootSector/OUTPUT/Mbr.com
+                                       $BASETOOLS_DIR/BootSectImage -g UsbBs32.com $BOOTSECTOR_BIN_DIR/bs32.com -f
+                                       $BASETOOLS_DIR/GnuGenBootSector -o $EFI_BOOT_DEVICE -i $BOOTSECTOR_BIN_DIR/bs32.com
+                                       $BASETOOLS_DIR/GnuGenBootSector -m -o $EFI_BOOT_DEVICE -i $BOOTSECTOR_BIN_DIR/Mbr.com
                                        echo Done.
                                        echo PLEASE UNPLUG USB, THEN PLUG IT AGAIN TO DO STEP2!
                                fi                      
EFI Development Kit II mirror for PVE