diff options
| author | Esteban Carnevale <alfplayer@mailoo.org> | 2013-09-02 20:03:39 -0300 |
|---|---|---|
| committer | Esteban Carnevale <alfplayer@mailoo.org> | 2013-09-02 20:03:39 -0300 |
| commit | a5139a6e4ed897d59c900d8ea991c60a19d01862 (patch) | |
| tree | f82a2c95fe0f34ddf5e7e4d88bfa33548e8269a8 /configs/releng/build.sh | |
| parent | 2ad1f4471698f00cc3985437f461e2e17aeccfa3 (diff) | |
| parent | 491b627eb4b6af909ba8e19751378672930328eb (diff) | |
Merge branch 'master' of archiso into helper/rebrandhelper/rebrand
Conflicts:
Makefile
configs/releng/build.sh
configs/releng/mkinitcpio.conf
configs/releng/root-image/root/customize_root_image.sh
configs/releng/syslinux/parabolaiso_pxe32.cfg
configs/releng/syslinux/parabolaiso_pxe64.cfg
configs/releng/syslinux/parabolaiso_sys32.cfg
configs/releng/syslinux/parabolaiso_sys64.cfg
docs/README.build
parabolaiso/mkparabolaiso
Diffstat (limited to 'configs/releng/build.sh')
| -rwxr-xr-x | configs/releng/build.sh | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 03bd844..e7ce4a4 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -79,7 +79,6 @@ make_setup_mkinitcpio() { make_customize_root_image() { cp -af ${script_path}/root-image ${work_dir}/${arch} - patch ${work_dir}/${arch}/root-image/usr/bin/pacman-key < ${script_path}/pacman-key-4.0.3_unattended-keyring-init.patch curl -o ${work_dir}/${arch}/root-image/etc/pacman.d/mirrorlist 'https://parabolagnulinux.org/mirrorlist/?country=all&protocol=http&use_mirror_status=on' lynx -dump -nolist 'https://wiki.parabolagnulinux.org/index.php/Installation_Guide?action=render' >> ${work_dir}/${arch}/root-image/root/install.txt @@ -129,7 +128,10 @@ make_isolinux() { # Prepare /EFI make_efi() { mkdir -p ${work_dir}/iso/EFI/boot - cp ${work_dir}/x86_64/root-image/usr/lib/gummiboot/gummibootx64.efi ${work_dir}/iso/EFI/boot/bootx64.efi + cp ${work_dir}/x86_64/root-image/usr/lib/prebootloader/PreLoader.efi ${work_dir}/iso/EFI/boot/bootx64.efi + cp ${work_dir}/x86_64/root-image/usr/lib/prebootloader/HashTool.efi ${work_dir}/iso/EFI/boot/ + + cp ${work_dir}/x86_64/root-image/usr/lib/gummiboot/gummibootx64.efi ${work_dir}/iso/EFI/boot/loader.efi mkdir -p ${work_dir}/iso/loader/entries cp ${script_path}/efiboot/loader/loader.conf ${work_dir}/iso/loader/ @@ -160,7 +162,10 @@ make_efiboot() { cp ${work_dir}/iso/${install_dir}/boot/x86_64/parabolaiso.img ${work_dir}/efiboot/EFI/parabolaiso/parabolaiso.img mkdir -p ${work_dir}/efiboot/EFI/boot - cp ${work_dir}/x86_64/root-image/usr/lib/gummiboot/gummibootx64.efi ${work_dir}/efiboot/EFI/boot/bootx64.efi + cp ${work_dir}/x86_64/root-image/usr/lib/prebootloader/PreLoader.efi ${work_dir}/efiboot/EFI/boot/bootx64.efi + cp ${work_dir}/x86_64/root-image/usr/lib/prebootloader/HashTool.efi ${work_dir}/efiboot/EFI/boot/ + + cp ${work_dir}/x86_64/root-image/usr/lib/gummiboot/gummibootx64.efi ${work_dir}/efiboot/EFI/boot/loader.efi mkdir -p ${work_dir}/efiboot/loader/entries cp ${script_path}/efiboot/loader/loader.conf ${work_dir}/efiboot/loader/ |