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

@@ -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

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
 

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