aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Thibodeau <kyron@neuralbs.com>2008-07-19 22:26:04 -0400
committerEric Thibodeau <kyron@neuralbs.com>2008-07-19 22:26:04 -0400
commita0ba027bbc131855fd04ff95f00ff80a1444a96f (patch)
tree53ca3649777038f7a13ba1b66b5589ecd180fa19 /catalyst
parentFollow stateless.sh change to single rw dir mount (diff)
downloadclustering-livecd-a0ba027bbc131855fd04ff95f00ff80a1444a96f.tar.gz
clustering-livecd-a0ba027bbc131855fd04ff95f00ff80a1444a96f.tar.bz2
clustering-livecd-a0ba027bbc131855fd04ff95f00ff80a1444a96f.zip
Switch to local fsscript for livecd
- some easthetics cleanup
Diffstat (limited to 'catalyst')
-rw-r--r--catalyst/livecd/2008.0/specs/amd64/livecd-stage2.spec18
-rw-r--r--catalyst/nfsroot/2008.0/specs/amd64/nfsroot_stage4.spec9
2 files changed, 8 insertions, 19 deletions
diff --git a/catalyst/livecd/2008.0/specs/amd64/livecd-stage2.spec b/catalyst/livecd/2008.0/specs/amd64/livecd-stage2.spec
index 15eecf7..ce60834 100644
--- a/catalyst/livecd/2008.0/specs/amd64/livecd-stage2.spec
+++ b/catalyst/livecd/2008.0/specs/amd64/livecd-stage2.spec
@@ -17,11 +17,12 @@ livecd/volid: x86_64 Gentoo Clustering LiveCD
#livecd/motd: /var/git/clustering-livecd/catalyst/livecd/2008.0/misc/clusterlivecd.motd.txt
#livecd/type: generic-livecd
livecd/type: gentoo-release-livecd
-livecd/bootargs: dokeymap nox
+#livecd/bootargs: dokeymap nox
+livecd/bootargs: nox
### end
livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
-livecd/fsscript: /var/svnroot/releng/trunk/releases/2008.0/scripts/livecd.sh
+livecd/fsscript: /var/git/clustering-livecd/catalyst/livecd/2008.0/scripts/livecd.sh
livecd/fstype: squashfs
livecd/gk_mainargs: --lvm --dmraid --evms --mdadm --makeopts=-j5
livecd/xsession: xfce
@@ -48,22 +49,9 @@ boot/kernel/gentoo/use:
boot/kernel/gentoo/packages:
media-libs/alsa-oss
media-sound/alsa-utils
-### Masked (~amd64)
-# net-dialup/fcdsl
-### Masked (~amd64)
-# net-dialup/fritzcapi
net-dialup/globespan-adsl
-### Masked (~amd64)
-# net-dialup/slmodem
net-misc/br2684ctl
-### Masked (~amd64)
-# net-wireless/acx
net-wireless/hostap-utils
-# net-wireless/ipw3945
-# net-wireless/madwifi-ng-tools
-# net-wireless/rt2500
-### Masked (~amd64)
-# net-wireless/rtl8187
sys-apps/pcmciautils
sys-fs/ntfs3g
## kyron: let the fun begin, we need a unionfs-ish FS to be able to configure the clustering stuff on the liveCD
diff --git a/catalyst/nfsroot/2008.0/specs/amd64/nfsroot_stage4.spec b/catalyst/nfsroot/2008.0/specs/amd64/nfsroot_stage4.spec
index 3b88891..815bbc4 100644
--- a/catalyst/nfsroot/2008.0/specs/amd64/nfsroot_stage4.spec
+++ b/catalyst/nfsroot/2008.0/specs/amd64/nfsroot_stage4.spec
@@ -97,7 +97,7 @@ stage4/use:
stage4/packages:
net-nds/ldap-auth
net-fs/nfs-utils
- sys-cluster/c3
+ app-admin/syslog-ng
# The init script does not agree with openrc...
# net-fs/autofs
# I, kyron, hate nano:
@@ -107,6 +107,8 @@ stage4/packages:
net-misc/dhcpcd
app-shells/dash
sys-process/vixie-cron
+# Clustering stuff:
+ sys-cluster/c3
sys-cluster/openmpi
app-admin/eselect-cblas
app-admin/eselect-blas
@@ -132,9 +134,8 @@ stage4/splash_theme:
# This is a set of arguments that will be passed to genkernel for all kernels
# defined in this target. It is useful for passing arguments to genkernel that
# are not otherwise available via the stage4-stage2 spec file.
-# example:
-# stage4/gk_mainargs: --lvm --dmraid
-stage4/gk_mainargs: --makeopts=-j5 --symlink
+# (ET): The nfsroot kernel does not use initrd for the moment so let's not waste time building
+stage4/gk_mainargs: --makeopts=-j5 --symlink --no-busybox --no-initrdmodules
# This option allows you to specify your own linuxrc script for genkernel to use# when building your CD. This is not checked for functionality, so it is up to
# you to debug your own script. We do not use one for the official release