remove unneeded/obsolete gk_mainargs from *cd-stage2*.spec

There is no reason for the livecd initramfs to need to be able to open
mdraid/dmraid/lvm arrays, so we can remove this support from the
genkernel call.  The livecds will still have all the tools needed to
create/maintain/use these kinds of volumes later.

Modern genkernel also autodetects makeopts so we do not need to set that
explicitly.

15 files changed, 2 insertions, 15 deletions

diff --git a/releases/weekly/specs/alpha/installcd-stage2-minimal.spec b/releases/weekly/specs/alpha/installcd-stage2-minimal.spec
index f556611c..5bbbce01 100644
--- a/releases/weekly/specs/alpha/installcd-stage2-minimal.spec
+++ b/releases/weekly/specs/alpha/installcd-stage2-minimal.spec
@@ -10,7 +10,6 @@ livecd/bootargs: dokeymap
 livecd/cdtar: /space/armin76/tmp/aboot-1.0_pre20040408-r2-cdtar-weekly.tar.bz2
 livecd/fsscript: /space/armin76/releng/releases/weekly/scripts/livecd.sh
 livecd/fstype: squashfs
-livecd/gk_mainargs: --lvm --dmraid --mdadm
 livecd/iso: /space/catalyst/builds/default/install-alpha-minimal-2008.0.iso
 livecd/type: gentoo-release-minimal
 livecd/volid: Gentoo alpha latest
diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec b/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec
index 63aab88a..87ce8a14 100644
--- a/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec
+++ b/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec
@@ -10,7 +10,6 @@ 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/fstype: squashfs
-livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8
 livecd/iso: admincd-amd64-latest.iso
 livecd/type: gentoo-release-minimal
 livecd/volid: Gentoo amd64 AdminCD latest
diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec b/releases/weekly/specs/amd64/hardened/admincd-stage2.spec
index 378b590b..4baa0ce1 100644
--- a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec
+++ b/releases/weekly/specs/amd64/hardened/admincd-stage2.spec
@@ -10,7 +10,6 @@ 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/fstype: squashfs
-livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8
 livecd/iso: admincd-amd64-latest.iso
 livecd/type: gentoo-release-minimal
 livecd/volid: Gentoo amd64 AdminCD latest
diff --git a/releases/weekly/specs/amd64/installcd-stage2-minimal.spec b/releases/weekly/specs/amd64/installcd-stage2-minimal.spec
index e8da74a7..3e5f97e0 100644
--- a/releases/weekly/specs/amd64/installcd-stage2-minimal.spec
+++ b/releases/weekly/specs/amd64/installcd-stage2-minimal.spec
@@ -10,7 +10,6 @@ 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/fstype: squashfs
-livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8
 livecd/iso: install-amd64-minimal-latest.iso
 livecd/type: gentoo-release-minimal
 livecd/volid: Gentoo amd64 latest
diff --git a/releases/weekly/specs/amd64/livecd-stage2.spec b/releases/weekly/specs/amd64/livecd-stage2.spec
index 93227946..25b9c74f 100644
--- a/releases/weekly/specs/amd64/livecd-stage2.spec
+++ b/releases/weekly/specs/amd64/livecd-stage2.spec
@@ -10,7 +10,6 @@ livecd/bootargs: dokeymap
 livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
 livecd/fsscript: @REPO_DIR@/releases/latest/scripts/livecd.sh
 livecd/fstype: squashfs
-livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8
 livecd/iso: livecd-amd64-installer-latest.iso
 livecd/type: gentoo-release-livecd
 livecd/volid: Gentoo amd64 LiveCD latest
diff --git a/releases/weekly/specs/amd64/livedvd-stage2.spec b/releases/weekly/specs/amd64/livedvd-stage2.spec
index 16225529..f33d71b5 100644
--- a/releases/weekly/specs/amd64/livedvd-stage2.spec
+++ b/releases/weekly/specs/amd64/livedvd-stage2.spec
@@ -10,7 +10,6 @@ livecd/bootargs: dokeymap
 livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
 livecd/fsscript: @REPO_DIR@/releases/latest/scripts/livecd.sh
 livecd/fstype: squashfs
-livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8
 livecd/iso: livedvd-amd64-installer-latest.iso
 livecd/type: gentoo-release-livecd
 livecd/volid: Gentoo amd64 LiveDVD latest
diff --git a/releases/weekly/specs/hppa/installcd-stage2-universal.spec b/releases/weekly/specs/hppa/installcd-stage2-universal.spec
index fd88f959..f5a845b7 100644
--- a/releases/weekly/specs/hppa/installcd-stage2-universal.spec
+++ b/releases/weekly/specs/hppa/installcd-stage2-universal.spec
@@ -9,7 +9,6 @@ source_subpath: default/livecd-stage1-hppa1.1-2008.0
 livecd/bootargs: dokeymap
 livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/palo-1.5_pre20040515-cdtar.tar.bz2
 livecd/fstype: squashfs
-livecd/gk_mainargs: --lvm --dmraid --mdadm
 livecd/iso: /var/tmp/catalyst/builds/default/install-hppa-universal-2008.0.iso
 livecd/type: gentoo-release-universal
 
diff --git a/releases/weekly/specs/ia64/installcd-stage2-minimal.spec b/releases/weekly/specs/ia64/installcd-stage2-minimal.spec
index 0f505d39..3aa356fb 100644
--- a/releases/weekly/specs/ia64/installcd-stage2-minimal.spec
+++ b/releases/weekly/specs/ia64/installcd-stage2-minimal.spec
@@ -10,7 +10,6 @@ portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
 livecd/bootargs: dokeymap
 livecd/cdtar: /home/armin76/tmp/elilo-3.6-cdtar.tar.bz2
 livecd/fstype: squashfs
-livecd/gk_mainargs: --lvm --dmraid --mdadm
 livecd/iso: /home/catalyst/builds/default/install-ia64-minimal-2008.0.iso
 livecd/type: gentoo-release-minimal
 livecd/volid: Gentoo ia64 latest
diff --git a/releases/weekly/specs/ppc/ppc64/installcd-stage2-minimal.spec b/releases/weekly/specs/ppc/ppc64/installcd-stage2-minimal.spec
index cabb3bd7..34b7726c 100644
--- a/releases/weekly/specs/ppc/ppc64/installcd-stage2-minimal.spec
+++ b/releases/weekly/specs/ppc/ppc64/installcd-stage2-minimal.spec
@@ -8,7 +8,7 @@ source_subpath: default/livecd-stage1-ppc64-32ul-2008.0
 
 livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/yaboot-1.3.13-cdtar.tar.bz2
 livecd/fstype: squashfs 
-livecd/gk_mainargs: --utils-arch=ppc --arch-override=ppc --makeopts=-j8 --lvm --dmraid --mdadm
+livecd/gk_mainargs: --utils-arch=ppc --arch-override=ppc 
 livecd/iso: /var/tmp/catalyst/builds/default/install-powerpc-minimal-2008.0.iso
 livecd/overlay: /home/ranger/2008.0/ppccdoverlay/
 livecd/type: gentoo-release-minimal
diff --git a/releases/weekly/specs/sparc/sparc64/installcd-stage2-minimal.spec b/releases/weekly/specs/sparc/sparc64/installcd-stage2-minimal.spec
index 76f701e9..abb8b297 100644
--- a/releases/weekly/specs/sparc/sparc64/installcd-stage2-minimal.spec
+++ b/releases/weekly/specs/sparc/sparc64/installcd-stage2-minimal.spec
@@ -11,7 +11,7 @@ livecd/fstype: squashfs
 livecd/iso: /var/tmp/catalyst/builds/default/install-sparc64-minimal-2008.0.iso
 livecd/type: gentoo-release-minimal
 livecd/volid: Gentoo sparc64 latest
-livecd/gk_mainargs: --firmware-files=/lib/firmware/ql2200_fw.bin --makeopts=-j33
+livecd/gk_mainargs: --firmware-files=/lib/firmware/ql2200_fw.bin
 
 boot/kernel: gentoo
 
diff --git a/releases/weekly/specs/x86/hardened/admincd-stage2.spec b/releases/weekly/specs/x86/hardened/admincd-stage2.spec
index 9948e90b..7c2db377 100644
--- a/releases/weekly/specs/x86/hardened/admincd-stage2.spec
+++ b/releases/weekly/specs/x86/hardened/admincd-stage2.spec
@@ -10,7 +10,6 @@ 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/fstype: squashfs
-livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8
 livecd/iso: admincd-x86-latest.iso
 livecd/type: gentoo-release-minimal
 livecd/volid: Gentoo x86 AdminCD latest
diff --git a/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec b/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec
index 2fc7e94d..ce87e81e 100644
--- a/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec
+++ b/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec
@@ -9,7 +9,6 @@ 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/fstype: squashfs
-livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8
 livecd/iso: install-x86-minimal-latest.iso
 livecd/type: gentoo-release-minimal
 livecd/volid: Gentoo x86 latest
diff --git a/releases/weekly/specs/x86/i686/livecd-stage2.spec b/releases/weekly/specs/x86/i686/livecd-stage2.spec
index 1aee59c2..0d6ff77a 100644
--- a/releases/weekly/specs/x86/i686/livecd-stage2.spec
+++ b/releases/weekly/specs/x86/i686/livecd-stage2.spec
@@ -10,7 +10,6 @@ livecd/bootargs: dokeymap
 livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
 livecd/fsscript: @REPO_DIR@/releases/latest/scripts/livecd.sh
 livecd/fstype: squashfs
-livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8
 livecd/iso: livecd-i686-installer-latest.iso
 livecd/type: gentoo-release-livecd
 livecd/volid: Gentoo x86 LiveCD latest
diff --git a/releases/weekly/specs/x86/i686/livedvd-stage2.spec b/releases/weekly/specs/x86/i686/livedvd-stage2.spec
index 52cba741..a73c518f 100644
--- a/releases/weekly/specs/x86/i686/livedvd-stage2.spec
+++ b/releases/weekly/specs/x86/i686/livedvd-stage2.spec
@@ -10,7 +10,6 @@ livecd/bootargs: dokeymap
 livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
 livecd/fsscript: @REPO_DIR@/releases/latest/scripts/livecd.sh
 livecd/fstype: squashfs
-livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8
 livecd/iso: livedvd-i686-installer-latest.iso
 livecd/type: gentoo-release-livecd
 livecd/volid: Gentoo x86 LiveDVD latest
diff --git a/releases/weekly/specs/x86/installcd-stage2-minimal.spec b/releases/weekly/specs/x86/installcd-stage2-minimal.spec
index 81ff72a4..e3c59ed0 100644
--- a/releases/weekly/specs/x86/installcd-stage2-minimal.spec
+++ b/releases/weekly/specs/x86/installcd-stage2-minimal.spec
@@ -10,7 +10,6 @@ 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/fstype: squashfs
-livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8
 livecd/iso: install-x86-minimal-latest.iso
 livecd/type: gentoo-release-minimal
 livecd/volid: Gentoo x86 latest