From 8ae21107e965d2feba52dad34c4475e72e6dedd5 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Mon, 22 Dec 2008 23:04:01 +0000
Subject: Some smaller cleanups within the stage3 stuff ...

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2453 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initramfs/distro-specs/suse/functions-default |  4 ++--
 initramfs/stage3-stuff/etc/functions          |  5 +++--
 initramfs/stage3-stuff/etc/messages           | 10 +++++++---
 initramfs/stage3-stuff/etc/messages.de        |  4 +++-
 4 files changed, 15 insertions(+), 8 deletions(-)

(limited to 'initramfs')

diff --git a/initramfs/distro-specs/suse/functions-default b/initramfs/distro-specs/suse/functions-default
index af1e6a7c..4ab1cbe4 100644
--- a/initramfs/distro-specs/suse/functions-default
+++ b/initramfs/distro-specs/suse/functions-default
@@ -24,8 +24,8 @@
 # anyhow
 D_BINDMPTS="tmp root media home"
 D_DIRINBINDMNT="/var/run /var/log /var/tmp"
-D_RODIRSINRW="/etc/gconf /etc/X11/xkb /var/adm /var/lib/texmf /var/lib/rpm \
-/var/cache/fontconfig"
+D_RODIRSINRW="/etc/bootsplash /etc/gconf /etc/X11/xkb /var/adm /var/lib/texmf \
+/var/lib/rpm /var/cache/fontconfig"
 D_DIRINDXS="/var/X11R6/compose-cache /var/run/sysconfig/tmp /var/adm \
 /var/lib/rpm /var/lib/nobody /var/lib/pam_devperm /var/lib/bluetooth \
 /var/lib/texmf /var/lib/nfs/sm /var/lib/nfs/sm.bak /var/lib/misc \
diff --git a/initramfs/stage3-stuff/etc/functions b/initramfs/stage3-stuff/etc/functions
index 69209699..bafd53b4 100644
--- a/initramfs/stage3-stuff/etc/functions
+++ b/initramfs/stage3-stuff/etc/functions
@@ -322,7 +322,7 @@ tftp_get () {
     fi
     tftp -g -r $file -l /tmp/$(basename $file) $file_server
     [ -s /tmp/$(basename $file) ] && download_successful=1
-    countdown=`expr $countdown - 1`
+    countdown=$(expr $countdown - 1)
     usleep 200000
   done
   [ $DEBUGLEVEL -ge 1 ] && \
@@ -390,7 +390,8 @@ $filepath, fileserv:$fileserv" >>$LOGFILE
 ${cfgfile}\n# Hierarchy is distro client and as last distro/default" \
     >>/tmp/confviafile
 fi
-cat /initramfs/machine-setup >>/tmp/confviafile
+cat /initramfs/machine-setup >>/tmp/confviafile 2>/dev/null || \
+  error "$nomachsetup"
 echo "fileget via $fileprot from $fileserv/$cfgfile finished" >/tmp/file-done
 [ $DEBUGLEVEL -ge 1 ] && echo "fileget from $cfgfile finished" >>$LOGFILE
 }
diff --git a/initramfs/stage3-stuff/etc/messages b/initramfs/stage3-stuff/etc/messages
index 39d603ce..c244c9c0 100644
--- a/initramfs/stage3-stuff/etc/messages
+++ b/initramfs/stage3-stuff/etc/messages
@@ -114,15 +114,15 @@ init_errxorg="  For some reason no xorg.conf appeared, check xconfig!"
 init_errsw="  For some reason the software configuration  $init_errcfg"
 init_wait="  Waited $ticks ticks to unmount kernel module directory ..."
 init_errumnt="  Unmount of the kernel modules directory \
-failed for some reason. Some\n  modprobe still active!?"
+failed for some reason. Some\n  modprobe process still active!?"
 init_erritab="  The file /etc/inittab does not exist or is no regular one. It \
 is needed\n  for the bootup procedure to follow. If upstart is used instead no \
 inittab\n  is needed any more, but a proper configured events.d."
 init_errsys="  Unmount of the kernel sys directory \
 failed for some\nreason.  You will get some error messages that some files \
 could not be\n  removed."
-init_runinit="  Could not execute \
-run-init due to missing command or wrong\n  parameters given."
+init_runinit="  Could not execute run-init due to missing command or wrong\n  \
+parameters given."
 init_picfg="  The plugin configuration directory is missing. This could be due \
 to failed\n  config get process at the beginning of stage3 setup. Either \
 requested\n  configuration file is missing in ~/client-config/<system> or a \
@@ -149,6 +149,8 @@ error_errfcfg="  Did not get any configuration data via tftp until now ..."
 error_errlcfg="  Did not get any configuration data via ldap until now ..."
 unpack_ConfTGZ="  Error during unpacking of the ConfTGZ archive.\nAre you sure \
 it is in proper format?"
+nomachsetup="  No machine-setup file found. You might not have gotten any \
+configuration\n  from your server. Your slx client will not work properly."
 
 
 # messages from distro functions
@@ -171,6 +173,8 @@ Please add\n  them to your stage1 to have them enabled."
 
 # messages from servconfig
 scfg_nfs="  Mount of some NFS source failed ..."
+scfg_rdate="  Your configured ntpserver does not offer time configuration \
+on port 37."
 scfg_ntptz="  No such timezone data file (needed for ntp time service \
 configuration)."
 scfg_evmlm="  Mounting of local device source for vmware directory failed \
diff --git a/initramfs/stage3-stuff/etc/messages.de b/initramfs/stage3-stuff/etc/messages.de
index 59a7568e..20291fc9 100644
--- a/initramfs/stage3-stuff/etc/messages.de
+++ b/initramfs/stage3-stuff/etc/messages.de
@@ -156,7 +156,9 @@ error_errfcfg="  Bis jetzt noch keine Konfigurationsdaten bekommen via tftp ..."
 error_errlcfg="  Bis jetzt noch keine Konfigurationsdaten bekommen via ldap ..."
 unpack_ConfTGZ="  Fehler beim entpacken des ConfTGZ.\nSind Sie sicher, dass es im \
 richtigen Format ist?"
-
+nomachsetup="  Die Datei machine-setup nicht gefunden. Es koennte sein, dass das \
+Konfigurations-\n  paket nicht erfolgreich vom Server beschafft wurde. Ihr \
+OpenSLX Client\n  wird deshalb nicht wie erwartet funktionieren."
 
 # messages from distro functions
 df_errumod="    Das Laden des \"unix\" Moduls schlug fehl. \nWahrscheinlich \
-- 
cgit v1.2.3-55-g7522