Testing for AFS ... hwautocfg - special action for scanner configuration

might be needed (device permissions via udev ...)



git-svn-id: http://svn.openslx.org/svn/openslx/trunk@355 95ad53e4-c205-0410-b2fa-d234c58c8868

5 files changed, 37 insertions, 5 deletions

diff --git a/initrd/distro-specs/suse/functions-10.1 b/initrd/distro-specs/suse/functions-10.1
index 7fb8a44a..0a39e86d 100644
--- a/initrd/distro-specs/suse/functions-10.1
+++ b/initrd/distro-specs/suse/functions-10.1
@@ -2,7 +2,7 @@
 # in general SuSE base definitions ...  General changes should be done there,
 # version specific changes for the 10.1 go here.
 #
-# Dirk von Suchodoletz <dvs@OpenSLX.com>, 31-08-2006
+# Dirk von Suchodoletz <dvs@OpenSLX.com>, 05-09-2006
 #
 # (c) 2006 - RZ Universitaet Freiburg
 
@@ -48,6 +48,29 @@ rllinker acpid "10" "12"
 rllinker powersaved "11" "11"
 }
 
+# afs client
+# configure afs client
+config_afs () {
+if [ "x$start_afs" = "xyes" ] ; then
+  if [ -f /mnt/etc/init.d/openafs-client ] ; then
+    test -d /mnt/afs || error "${df_errafsd}"
+    testmkd /mnt/var/cache/openafs
+    rllinker "openafs-client" "15" "06"
+    #      echo -e "# /etc/sysconfig/afs-client - file generated by \
+    #$0:\n#\t$date\n" >/etc/sysconfig/afs-client.new;
+    #      sed -e "s,THIS_CELL_SERVER.*,THIS_CELL_SERVER=\"$cell_serv\"," \
+    #        -e "s,PREFERREDSERVERS.*,PREFERREDSERVERS=\"$cell_serv\"," \
+    #        -e "s,THIS_CELL.*,THIS_CELL=\"$this_cell\"," \
+    #        -e "s,MEMCACHE.*,MEMCACHE=\"yes\"," \
+    #        /etc/sysconfig/afs-client >> \
+    #            /etc/sysconfig/afs-client.new
+    #      mv /etc/sysconfig/afs-client.new /etc/sysconfig/afs-client
+  else
+    error "${df_errafsn}" nonfatal
+  fi
+fi
+}
+
 # prepare virtual machine environment (vmware, vmplayer)
 config_vmware () {
 rllinker "vmware-prep" "18" "02"
diff --git a/initrd/initrd-stuff/bin/hwautocfg b/initrd/initrd-stuff/bin/hwautocfg
index 03d078db..9d9a3315 100755
--- a/initrd/initrd-stuff/bin/hwautocfg
+++ b/initrd/initrd-stuff/bin/hwautocfg
@@ -368,6 +368,7 @@ if strinfile "SCSI" /tmp/hwsetup.info ; then
   strinfile "CDROM" /tmp/hwsetup.info && { modprobe ${MODPRV} sr_mod;
     modprobe ${MODPRV} sg; }
   strinfile "HD" /tmp/hwsetup.info && modprobe ${MODPRV} sd_mod
+  strinfile "SCANNER" /tmp/hwsetup.info && : 
 fi
 # fixme - psmouse entladen, falls nicht vorhanden
 
diff --git a/initrd/initrd-stuff/bin/servconfig b/initrd/initrd-stuff/bin/servconfig
index 17ab8511..67971c82 100755
--- a/initrd/initrd-stuff/bin/servconfig
+++ b/initrd/initrd-stuff/bin/servconfig
@@ -261,6 +261,9 @@ config_sshd
 # simple network management protocol agent
 config_snmp
 
+# setup afs client stuff
+config_afs
+
 #######################################################################
 # NIS
 # setup nis configuration if needed
diff --git a/initrd/initrd-stuff/etc/functions b/initrd/initrd-stuff/etc/functions
index 2bc0c28b..278a502c 100644
--- a/initrd/initrd-stuff/etc/functions
+++ b/initrd/initrd-stuff/etc/functions
@@ -859,7 +859,12 @@ displayvars (){
 
 # function for ntp configuration
 config_ntp () {
- : 
+: 
+}
+
+# function for afs
+config_afs () {
+:
 }
 
 # function for atd
diff --git a/initrd/initrd-stuff/etc/messages b/initrd/initrd-stuff/etc/messages
index da6c25ba..b1338776 100644
--- a/initrd/initrd-stuff/etc/messages
+++ b/initrd/initrd-stuff/etc/messages
@@ -2,12 +2,10 @@
 # bootup (within initialramfs) for OpenSLX linux diskless clients version 4
 # this file could be used for localization of error messages 
 #
-# Dirk von Suchodoletz <dvs@openslx.com>, 30-08-2006
+# Dirk von Suchodoletz <dvs@openslx.com>, 05-09-2006
 #
 # (c) 2006 - RZ Universitaet Freiburg
 # (c) 2006 - OpenSLX.org
-#
-# Version:      0.0.3g
 
 # messages from (slx) init
 init_errmsg="functions file contains a lot of script \
@@ -134,6 +132,8 @@ df_errvmw="  VMware X86 emulation $df_errserv"
 df_erramnt="  Automounter $df_errserv"
 df_errnsc="  Name Service caching deamon $df_errserv\n This service might \
 be useful to take load from a ldap user directory."
+df_errafsd="  No afs directory present"
+df_errafsn="  AFS client service is not available"
 
 # messages from servconfig
 scfg_nfs="  Mount of some NFS source failed ..."