From 7864e00b85d480fe606d57d7581c4634e0d846f1 Mon Sep 17 00:00:00 2001 From: "Jorge Manuel B. S. Vicetto" Date: Sun, 30 Oct 2011 13:41:51 +0000 Subject: [PATCH] More cleanups and syncing between specs. Change volid as it was too long. svn path=/trunk/; revision=823 --- releases/weekly/specs/amd64/hardened/admincd-stage1.spec | 1 + releases/weekly/specs/amd64/hardened/admincd-stage2.spec | 3 +-- releases/weekly/specs/x86/hardened/admincd-stage2.spec | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage1.spec b/releases/weekly/specs/amd64/hardened/admincd-stage1.spec index 22dc6cf8..2135a74f 100644 --- a/releases/weekly/specs/amd64/hardened/admincd-stage1.spec +++ b/releases/weekly/specs/amd64/hardened/admincd-stage1.spec @@ -6,6 +6,7 @@ profile: hardened/linux/amd64 snapshot: 2008.0 source_subpath: hardened/stage3-amd64-hardened-latest portage_confdir: /release/svn-releng/trunk/releases/weekly/portage/admincd + livecd/use: -* deprecated diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec b/releases/weekly/specs/amd64/hardened/admincd-stage2.spec index 5b4a5510..995db1c6 100644 --- a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec +++ b/releases/weekly/specs/amd64/hardened/admincd-stage2.spec @@ -6,13 +6,12 @@ profile: hardened/linux/amd64 snapshot: 2008.0 source_subpath: hardened/admincd-stage1-amd64-2008.0 -#livecd/bootargs: dokeymap livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 livecd/fstype: squashfs livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 livecd/iso: /release/buildroot/amd64-dev/builds/hardened/admincd-amd64-2008.0.iso livecd/type: gentoo-release-minimal -livecd/volid: Gentoo Linux Admin CD amd64 2008.0 +livecd/volid: Gentoo Linux Admin CD 2008.0 boot/kernel: gentoo diff --git a/releases/weekly/specs/x86/hardened/admincd-stage2.spec b/releases/weekly/specs/x86/hardened/admincd-stage2.spec index 3c3f6bb2..a557d77e 100644 --- a/releases/weekly/specs/x86/hardened/admincd-stage2.spec +++ b/releases/weekly/specs/x86/hardened/admincd-stage2.spec @@ -5,14 +5,14 @@ rel_type: hardened profile: hardened/linux/x86 snapshot: 2008.0 source_subpath: hardened/admincd-stage1-x86-2008.0 +portage_confdir: /release/svn-releng/trunk/releases/weekly/portage/admincd -#livecd/bootargs: dokeymap livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 livecd/fstype: squashfs livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 livecd/iso: /release/buildroot/x86-dev/builds/hardened/admincd-x86-2008.0.iso livecd/type: gentoo-release-minimal -livecd/volid: Gentoo Linux Admin CD x86 2008.0 +livecd/volid: Gentoo Linux Admin CD 2008.0 boot/kernel: gentoo