diff options
author | Michael Janczyk | 2006-08-15 22:56:50 +0200 |
---|---|---|
committer | Michael Janczyk | 2006-08-15 22:56:50 +0200 |
commit | 85af178858b3429ccd0322f40a5318a41c1f36b9 (patch) | |
tree | 094505a3dd43cdf521e6ff48e7658a405d4a64b5 | |
parent | * completed group-related interface and implementation (diff) | |
download | core-85af178858b3429ccd0322f40a5318a41c1f36b9.tar.gz core-85af178858b3429ccd0322f40a5318a41c1f36b9.tar.xz core-85af178858b3429ccd0322f40a5318a41c1f36b9.zip |
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
-rw-r--r-- | Makefile | 37 | ||||
-rwxr-xr-x | initrd/initrd-stuff/bin/servconfig | 22 | ||||
-rwxr-xr-x | initrd/initrd-stuff/init | 4 | ||||
-rwxr-xr-x | initrd/mkdxsinitrd | 12 |
4 files changed, 57 insertions, 18 deletions
@@ -1,5 +1,42 @@ +# Description: Makefile for creating project tarball and installing the project +# to the various destination directories +# +# Author(s): Lars Mueller <lm@opendiskless.org>, 11-08-2006 +# Dirk von Suchodoletz <dirk@goe.net>, 15-08-2006 +# +# Copyright: (c) 2006 - opendiskless.org project +# +# Version: 0.0.1b + tarball: @echo "Creating tar ball " @tar cfhj opendiskless.tar.bz2 \ --exclude-from=tools/tar_exclude_from \ . +install: + @echo "Installing opendiskless.org project files" + @mkdir -p /var/lib/opendiskless/config/default/initramfs \ + -p /var/lib/opendiskless/config/default/rootfs \ + -p /var/lib/opendiskless/db \ + -p /var/lib/opendiskless/stage1 \ + -p /usr/share/opendiskless/distro-specs \ + -p /usr/share/opendiskless/templates \ + -p /usr/share/opendiskless/initramfs + @cp initrd/mkdxsinitrd /usr/local/sbin + @cp -a initrd/initrd-stuff/* /usr/share/opendiskless/initramfs + @cp -a initrd/distro-specs/* /usr/share/opendiskless/distro-specs + @cp installer/default_files/machine-setup.default \ + /usr/share/opendiskless/templates + @echo -e "#!/bin/sh\n#\n# this script allows the local admin to \ +extend the\n# capabilities at the beginning of the initramfs" \ + > /var/lib/opendiskless/config/default/initramfs/preinit.local + @echo -e "#!/bin/sh\n#\n# this script allows the local admin to \ +extend the\n# capabilities at the end of the initramfs" \ + > /var/lib/opendiskless/config/default/initramfs/postinit.local + @chmod u+x /var/lib/opendiskless/config/default/initramfs/*init.local + +#uninstall: +# @echo -e "Uninstalling opendiskless.org project files but keeping configs \ +#and stage1\nfiles (please remove manually)" +# @rm -rf /usr/share/opendiskless +# @rm /usr/local/sbin/mkdxsinitrd 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 |