From f1eab8b9f3a777150bbef0fc9c61e8c10a39d811 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Thu, 28 Aug 2008 15:39:41 +0000
Subject: Some cleanup in stage3 scripts (small bugs, wrong variables ...)

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2118 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initramfs/distro-specs/debian/functions-default | 2 +-
 initramfs/distro-specs/ubuntu/functions-default | 4 ++--
 initramfs/stage3-stuff/bin/servconfig           | 6 ------
 3 files changed, 3 insertions(+), 9 deletions(-)

(limited to 'initramfs')

diff --git a/initramfs/distro-specs/debian/functions-default b/initramfs/distro-specs/debian/functions-default
index 56c7cb36..879d5c0b 100644
--- a/initramfs/distro-specs/debian/functions-default
+++ b/initramfs/distro-specs/debian/functions-default
@@ -58,7 +58,7 @@ config_distro () {
   #rm /mnt/etc/udev/rules.d/*persistent-net.rules >/dev/null 2>&1
  
   # set default runlevel
-  sed -e "s/.*initdefault/id:${D_INITDEFAULT}:initdefault/" -i /mnt/etc/inittab
+  sed -e "s/.*initdefault/id:3:initdefault/" -i /mnt/etc/inittab
 
   # create needed auxiliary directories in (/mnt)/var,/etc,...
   testmkd /mnt/var/run/screens root:utmp 0755
diff --git a/initramfs/distro-specs/ubuntu/functions-default b/initramfs/distro-specs/ubuntu/functions-default
index caddbfd4..884a40ad 100644
--- a/initramfs/distro-specs/ubuntu/functions-default
+++ b/initramfs/distro-specs/ubuntu/functions-default
@@ -252,7 +252,7 @@ esac
 config_automount () {
 if [ -f /mnt/etc/init.d/autofs ] ; then
   testmkd /mnt/var/lock/subsys
-  sed -e "1i# /etc/${default}/autofs - file modified by\n#\t$0:\n#" \
+  sed -e "1i# /etc/default/autofs - file modified by\n#\t$0:\n#" \
       -e "s,TIMEOUT.*,TIMEOUT=60," -i /mnt/etc/default/autofs
   config_portmap
   rllinker "autofs" 12 4
@@ -265,7 +265,7 @@ if [ "x$start_nfsv4" = "xyes" ]; then
   testmkd /mnt/var/lib/nfs/sm
   sed -e "s,NEED_IDMAPD=.*,NEED_IDMAPD=\"yes\"," \
       -e "s,NEED_GSSD=.*,NEED_GSSD=\"yes\"," \
-      -i /mnt/etc/${default}/nfs-common
+      -i /mnt/etc/default/nfs-common
   echo -e "rpc_pipefs\t/var/lib/nfs/rpc_pipefs rpc_pipefs defaults\t 0 0\n\
 nfsd\t\t/proc/fs/nfsd\tnfsd\t\tdefaults\t 0 0" >>/tmp/fstab
 echo -e "\t# stuff needed for nfsv4\n\tmount -t rpc_pipefs rpc_pipefs \
diff --git a/initramfs/stage3-stuff/bin/servconfig b/initramfs/stage3-stuff/bin/servconfig
index 707f91b9..4e701465 100755
--- a/initramfs/stage3-stuff/bin/servconfig
+++ b/initramfs/stage3-stuff/bin/servconfig
@@ -226,12 +226,6 @@ config_sshd
 # simple network management protocol agent
 config_snmp
 
-# setup afs client stuff
-config_afs
-
-# setup nfsv4/krb stuff
-config_nfsv4
-
 # configure samba service
 config_samba
 
-- 
cgit v1.2.3-55-g7522