Simple install mechanism for directory structure setup (make install)

for the opendiskless package. First moves for new type of file get
system configuration. Do not use this version.



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

3 files changed, 20 insertions, 18 deletions

diff --git a/initrd/initrd-stuff/bin/servconfig b/initrd/initrd-stuff/bin/servconfig
index 0239e401..5d266f97 100755
--- a/initrd/initrd-stuff/bin/servconfig
+++ b/initrd/initrd-stuff/bin/servconfig
@@ -4,15 +4,15 @@
 #               for linux diskless clients (executed within initial
 #               ramdisk) 
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 23-07-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 15-08-2006
 #               Michael Janczyk, 31-05-2006
-#               Lars Mueller, 23-06-2006
-#               Oliver Tappe, 23-06-2006
+#               Lars Mueller <lm@opendiskless.org>, 23-06-2006
+#               Oliver Tappe <ot@opendiskless.org>, 23-06-2006
 #
 # Copyright:    (c) 2006 - RZ Universitaet Freiburg
-#               (c) 2006 - odlx.org project
+#               (c) 2006 - opendiskless.org project
 # 
-# Version:      0.1.1e
+# Version:      0.1.2a
 
 # check for configuration files to source
 
@@ -49,13 +49,13 @@ while [ $len -le 11 ] ; do
 done
 echo "
          WELCOME TO                               \n (\l)
-                   _____    ______     __       __   __ 
-                  /  _     |   _      |  |     |  |_|  |
-                 |  | |  | |  | |  |  |  |            /
-                 |  |_|  | |  |_|  |  |  |___   /  _    
-                   _____/  |______/   |______| |__| |__|
+                  _____    ______     __       _____
+                 /  _     |   _      |  |     |   _  |
+                |  | |  | |  | |  |  |  |     |  |_| |
+                |  |_|  | |  |_|  |  |  |___  |   ___/
+                  _____/  |______/   |______| |__|
 
-         Diskless Workstation (v4.0/$dstr (c) <odlx project>
+         Diskless Workstation (v4.0/$dstr (c) <odl project>
 ">/mnt/etc/issue
 
 #######################################################################
diff --git a/initrd/initrd-stuff/init b/initrd/initrd-stuff/init
index fe562ce9..9a1dd9a7 100755
--- a/initrd/initrd-stuff/init
+++ b/initrd/initrd-stuff/init
@@ -46,8 +46,8 @@ echo 256 > /proc/sys/kernel/real-root-dev
 # redirect console (after /dev/console is available, and /dev mounted)
 exec < /dev/console > /dev/console 2>&1
 
-# set defaults and create special files so that "waitfor" does not waites
-# for a configuration option
+# set defaults for some important variables, might be overwritten via kernel
+# commandline
 TMPFSSIZE="50%"
 COWSIZE="50%"
 RWDIR=/dev/shm
diff --git a/initrd/mkdxsinitrd b/initrd/mkdxsinitrd
index 0d29d2fd..e3a679a7 100755
--- a/initrd/mkdxsinitrd
+++ b/initrd/mkdxsinitrd
@@ -4,7 +4,7 @@
 #               ramdisks for linux diskless clients (stage2 system
 #               setup)
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 11-08-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 15-08-2006
 #               Nico Dietrich
 #               Felix Endres
 #
@@ -155,7 +155,7 @@ else
     cp -a initrd-stuff/${FILENAME} ${INSTDIR}/${FILENAME%/*}
   else
     sed -e "s,@@@INSTDIR@@@,${INSTDIR},g;s,@@@KERNVER@@@,${KERNVER},g" \
-        -e "s,@@@DISTRO@@@,${DISTRO},g;s,@@@NETIF@@@,${NET_IF},g" \
+        -e "s,@@@DISTRO@@@,${DISTRO}-${DISTRO_VER},g;s,@@@NETIF@@@,${NET_IF},g" \
         -e "s,@@@NWMODULES@@@,${NWMODULES},g" \
         -e "s,@@@COMDIRINDXS@@@,${COMDIRINDXS},g" \
         -e "s,@@@COMETCEXCL@@@,${COMETCEXCL},g" \
@@ -677,10 +677,12 @@ if [ -f /usr/share/opendiskless/templates/Cards.local ] ; then
     ${INSTDIR}/usr/share/hwdata/Cards
 fi
 
-# finally copy user-supplied preinit files. postinit.local and other
-# additions are part of fileget tgz (in stage3)
+# finally copy user-supplied preinit files. postinit.local may be
+# part of fileget tgz (in stage3)
 for cfg in ${DISTRO}-${DISTRO_VER}/initramfs/preinit.local \
-           default/initramfs/preinit.local ; do
+           default/initramfs/preinit.local \
+           ${DISTRO}-${DISTRO_VER}/initramfs/postinit.local \
+           default/initramfs/postinit.local ; do
   test -f /var/lib/opendiskless/config/$cfg && {
     cp /var/lib/opendiskless/config/$cfg ${INSTDIR}; break; }
 done