Removed unused functions

- kernel_links: now performed by genkernel
- setup_services: renamed to setup_ssh

Corrected:
- openrc_diskless_setup: removed np= from userclass, problematic and not realy useful to send np= as all we really need is the core count.

Cleaned up comments in
- unionfs_prep

1 files changed, 4 insertions, 22 deletions

diff --git a/catalyst/nfsroot/2008.0/scripts/nfsroot_setup.sh b/catalyst/nfsroot/2008.0/scripts/nfsroot_setup.sh
index 506a848..f2b7bed 100644
--- a/catalyst/nfsroot/2008.0/scripts/nfsroot_setup.sh
+++ b/catalyst/nfsroot/2008.0/scripts/nfsroot_setup.sh
@@ -7,22 +7,10 @@ eecho(){
 	echo "====================================="
 }
 
-kernel_links()
-{
-	eecho "Correcting kernel and initramfs links"
-	cd /boot
-	ln -s kernel-* vmlinuz
-	ln -s initramfs-* initramfs
-	
-}
-
 unionfs_prep()
 {
 	eecho "=adding unionfs required dirs========"
-#	for I in etc var tmp
-#	do
-		mkdir -p /mnt/rw_mounts/
-#	done
+	mkdir -p /mnt/rw_mounts/
 }
 
 set_runlevel()
@@ -30,10 +18,6 @@ set_runlevel()
 	ln -s /etc/runlevels/default /etc/runlevels/unionfs
 }
 
-run_depmod() {
-	depmod -a -b /usr/src/linux
-}
-
 # We do this often in scripts to config files, change OPTION=something to OPTION=other
 # in: 
 #	$1: OPTION=other
@@ -71,7 +55,7 @@ openrc_diskless_setup() {
 			c=$((${c} + 1))
 		done
 	
-		dhcpcd_eth0="--persistent --userclass=\"np=${c}\""
+		dhcpcd_eth0="--persistent --userclass=\"${c}\""
 	}
 	EOF
 # The above is an alternative which doesn't use wc, thus no superficial process spawning.
@@ -95,7 +79,7 @@ openrc_diskless_setup() {
 	
 }
 
-setup_services() {
+setup_ssh() {
 	# Pre-generating sshd keys can be the source of philosophical debates:
     eecho "=Pre-generating sshd keys============"
 	. /etc/init.d/sshd
@@ -120,13 +104,11 @@ setup_ntp-client(){
 	sed -ie 's:NTPCLIENT_OPTS=.*:NTPCLIENT_OPTS="-s -b -u master.gentoo.local":' /etc/conf.d/ntp-client
 }
 
-#kernel_links
 dash_is_sh
 unionfs_prep
-#run_depmod
 openrc_diskless_setup
 # this one is a hack since catalyst doesn't do it for the moment for some reason
-setup_services
+setup_ssh
 
 # TEMPORARY for testing:
 eecho "=Changing root password=============="