From 69ac785a45428721f71b54f0a258fcfc82031785 Mon Sep 17 00:00:00 2001 From: Ben Kohler Date: Fri, 24 Aug 2018 07:58:56 -0500 Subject: [PATCH] specs/{amd64,x86}/hardened: comment cdtar to enable UEFI bootloader --- .../weekly/specs/amd64/hardened/admincd-stage2-selinux.spec | 2 +- releases/weekly/specs/amd64/hardened/admincd-stage2.spec | 2 +- releases/weekly/specs/x86/hardened/admincd-stage2.spec | 2 +- .../weekly/specs/x86/hardened/installcd-stage2-minimal.spec | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec b/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec index 31f54e65..87155f71 100644 --- a/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec +++ b/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec @@ -8,7 +8,7 @@ source_subpath: hardened/livecd-stage1-amd64-latest-selinux portage_confdir: @REPO_DIR@/releases/weekly/portage/isos livecd/bootargs: dokeymap -livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 +#livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 livecd/fstype: squashfs livecd/iso: admincd-amd64-latest.iso livecd/type: gentoo-release-minimal diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec b/releases/weekly/specs/amd64/hardened/admincd-stage2.spec index 7148645a..949c6085 100644 --- a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec +++ b/releases/weekly/specs/amd64/hardened/admincd-stage2.spec @@ -8,7 +8,7 @@ source_subpath: hardened/livecd-stage1-amd64-latest portage_confdir: @REPO_DIR@/releases/weekly/portage/isos livecd/bootargs: dokeymap -livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 +#livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 livecd/fstype: squashfs livecd/iso: admincd-amd64-latest.iso livecd/type: gentoo-release-minimal diff --git a/releases/weekly/specs/x86/hardened/admincd-stage2.spec b/releases/weekly/specs/x86/hardened/admincd-stage2.spec index c061ab47..9f773e9b 100644 --- a/releases/weekly/specs/x86/hardened/admincd-stage2.spec +++ b/releases/weekly/specs/x86/hardened/admincd-stage2.spec @@ -8,7 +8,7 @@ source_subpath: hardened/livecd-stage1-x86-latest portage_confdir: @REPO_DIR@/releases/weekly/portage/isos livecd/bootargs: dokeymap -livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 +#livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 livecd/fstype: squashfs livecd/iso: admincd-x86-latest.iso livecd/type: gentoo-release-minimal diff --git a/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec b/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec index 50d153e5..7080346e 100644 --- a/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec +++ b/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec @@ -7,7 +7,7 @@ snapshot: latest source_subpath: hardened/livecd-stage1-x86-hardened-latest livecd/bootargs: dokeymap -livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 +#livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 livecd/fstype: squashfs livecd/iso: install-x86-minimal-latest.iso livecd/type: gentoo-release-minimal