diff options
-rw-r--r-- | initramfs/distro-specs/debian/config-3.1 | 40 | ||||
-rw-r--r-- | initramfs/distro-specs/debian/config-4.1 | 31 | ||||
-rw-r--r-- | initramfs/distro-specs/debian/config-default | 2 | ||||
-rw-r--r-- | initramfs/distro-specs/debian/functions-3.1 | 19 | ||||
-rw-r--r-- | initramfs/distro-specs/debian/functions-4.1 | 14 | ||||
-rw-r--r-- | initramfs/distro-specs/debian/functions-default | 7 | ||||
-rw-r--r-- | installer/OpenSLX/OSExport/Distro/SUSE.pm | 11 |
7 files changed, 81 insertions, 43 deletions
diff --git a/initramfs/distro-specs/debian/config-3.1 b/initramfs/distro-specs/debian/config-3.1 index d97d52ca..99e34fd1 100644 --- a/initramfs/distro-specs/debian/config-3.1 +++ b/initramfs/distro-specs/debian/config-3.1 @@ -1,9 +1,15 @@ -# Description: distro specific settings for Debian/Sarge +# Copyright (c) 2003 - 2006 - RZ Uni Freiburg +# Copyright (c) 2006, 2007 - OpenSLX GmbH # -# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 23-06-2006 -# Felix Endres +# This program/file is free software distributed under the GPL version 2. +# See http://openslx.org/COPYING # -# Copyright: (c) 2003, 2006 - RZ Universitaet Freiburg +# If you have any feedback please consult http://openslx.org/feedback and +# send your feedback to feedback@openslx.org +# +# General information about OpenSLX can be found under http://openslx.org +# +# Version specific general settings for Debian Sarge (3.1) # D_SYSCONFDIR - system wide configuration settings - /etc/sysconfig in SuSE # and RedHat, /etc/default in Debian and Ubuntu @@ -23,28 +29,4 @@ # D_HWMODTOIGNORE - hardware modules which should not tried to load (because # already in kernel, nonexistent, ...) -D_SYSCONFDIR=/default -D_ETCEXCL="etc/gconf/*\n*.old\n*-\n\ -etc/autoinstall\nlogrotate*\nbootloader\n*~\n\ -pptp.d\nisdn\nyouservers\nhardware/hwcfg*\n\ -X11/xdm/pixmaps\ndhclient.script\n\ -rc2.d/*\nrc5.d/*" -D_BINDMPTS="tmp root home" -D_DIRINBINDMNT="/var/run /var/log /var/tmp /var/lib/gdm" -D_RODIRSINRW="etc/gconf etc/X11/xkb /var/adm /var/lib/texmf" -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/misc /var/lib/acpi /var/spool/cron \ -/var/lock/subsys/sysconfig" -D_INITDIR="/init.d" -D_INITBOOTD="/rcS.d" -D_RCDIRS="/rc0.d /rc1.d /rc2.d /rc3.d /rc4.d /rc5.d /rc6.d" -D_INITDEFAULT="3" -# fixme: is keymap.sh really needed? Should be handled in a simpler fashion -# via boot.slx (see hwautocfg) -D_INITSCRIPTS="mountvirtfs udev procps.sh bootlogd keymap.sh hwclock.sh sudo dbus-1" -D_XF86CONFFILE="/etc/X11/xorg.conf" -D_XFONTPATH="/usr/X11R6/lib/X11/fonts/*" -D_DEFAULTCOUNTRY="de" +# nothing changed (yet) compared to the config-default file diff --git a/initramfs/distro-specs/debian/config-4.1 b/initramfs/distro-specs/debian/config-4.1 new file mode 100644 index 00000000..01730eb0 --- /dev/null +++ b/initramfs/distro-specs/debian/config-4.1 @@ -0,0 +1,31 @@ +# Copyright (c) 2007 - OpenSLX GmbH +# +# This program/file is free software distributed under the GPL version 2. +# See http://openslx.org/COPYING +# +# If you have any feedback please consult http://openslx.org/feedback and +# send your feedback to feedback@openslx.org +# +# General information about OpenSLX can be found under http://openslx.org +# +# Version specific general settings for Debian Edge (4.1) + +# D_SYSCONFDIR - system wide configuration settings - /etc/sysconfig in SuSE +# and RedHat, /etc/default in Debian and Ubuntu +# D_ETCEXCL - list of files, wildcards to be excluded from /etc when using +# bind mounts +# D_DIRINBINDMNT - lists of directories to be created in bind mounted rw +# part of the client filesystem +# D_RODIRSINRW - ReadOnly Directories in RW part of filesystem to save on +# TempFS usage +# D_DIRINDXS - directories in client filesystem which should be present +# anyhow +# D_RCDIRS - runlevel directories relative to /etc +# D_XF86CONFFILE - name and location of XFree/Xorg config file, e.g. +# /etc/X11/xorg.conf or /etc/X11/XF86config, ... +# D_XFONTPATH - path(es) where X11 fonts are installed (with trailing /*) +# D_DEFAULTCOUNTRY - localization (see common functions) +# D_HWMODTOIGNORE - hardware modules which should not tried to load (because +# already in kernel, nonexistent, ...) + +# nothing changed (yet) compared to the config-default file diff --git a/initramfs/distro-specs/debian/config-default b/initramfs/distro-specs/debian/config-default index 64e58f80..dac2b5aa 100644 --- a/initramfs/distro-specs/debian/config-default +++ b/initramfs/distro-specs/debian/config-default @@ -9,7 +9,7 @@ # # General information about OpenSLX can be found under http://openslx.org # -# Distro specific general settings for Debian/Sarge +# Distro specific general settings for general Debian # D_SYSCONFDIR - system wide configuration settings - /etc/sysconfig in SuSE # and RedHat, /etc/default in Debian and Ubuntu diff --git a/initramfs/distro-specs/debian/functions-3.1 b/initramfs/distro-specs/debian/functions-3.1 index 3b884631..c3be9a30 100644 --- a/initramfs/distro-specs/debian/functions-3.1 +++ b/initramfs/distro-specs/debian/functions-3.1 @@ -1,12 +1,15 @@ -# Description: configuration script for Debian Sarge (3.1) to configure -# linux diskless clients (executed within initial ramdisk -# after genconfig) +# Copyright (c) 2003 - 2006 - RZ Uni Freiburg +# Copyright (c) 2006, 2007 - OpenSLX GmbH # -# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 23-06-2006 -# Felix Endres, 30-04-2006 +# This program is free software distributed under the GPL version 2. +# See http://openslx.org/COPYING # -# Copyright: (c) 2006 - RZ Universitaet Freiburg -# -# Version: 0.3.0a +# If you have any feedback please consult http://openslx.org/feedback and +# send your feedback to feedback@openslx.org +# +# General information about OpenSLX can be found at http://openslx.org +# +# Configuration script for Debian Sarge (3.1) to setup linux stateless clients +# (executed within initial ramfs) # nothing changed yet from default diff --git a/initramfs/distro-specs/debian/functions-4.1 b/initramfs/distro-specs/debian/functions-4.1 new file mode 100644 index 00000000..97be5342 --- /dev/null +++ b/initramfs/distro-specs/debian/functions-4.1 @@ -0,0 +1,14 @@ +# Copyright (c) 2007 - OpenSLX GmbH +# +# This program is free software distributed under the GPL version 2. +# See http://openslx.org/COPYING +# +# If you have any feedback please consult http://openslx.org/feedback and +# send your feedback to feedback@openslx.org +# +# General information about OpenSLX can be found at http://openslx.org +# +# Configuration script for Debian Edge (4.1) to setup linux stateless clients +# (executed within initial ramfs) + +# nothing changed yet from default diff --git a/initramfs/distro-specs/debian/functions-default b/initramfs/distro-specs/debian/functions-default index 9dac0e9c..af8a4bc5 100644 --- a/initramfs/distro-specs/debian/functions-default +++ b/initramfs/distro-specs/debian/functions-default @@ -1,4 +1,6 @@ -#!/bin/bash +# Copyright (c) 2003 - 2006 - RZ Uni Freiburg +# Copyright (c) 2006, 2007 - OpenSLX GmbH +# # This program is free software distributed under the GPL version 2. # See http://openslx.org/COPYING # @@ -10,7 +12,8 @@ # Configuration script for general Debian to configure linux diskless clients # (executed within initialramfs after genconfig) -# empty functions are defined at the beginning of /etc/functions +# empty (placeholder) functions to avoid errors in stage3 are defined at the +# beginning of /etc/functions # distro specific stuff to initialize preinit () { diff --git a/installer/OpenSLX/OSExport/Distro/SUSE.pm b/installer/OpenSLX/OSExport/Distro/SUSE.pm index 23388d7e..fedcdbe1 100644 --- a/installer/OpenSLX/OSExport/Distro/SUSE.pm +++ b/installer/OpenSLX/OSExport/Distro/SUSE.pm @@ -42,14 +42,14 @@ sub initDistroInfo - /var/tmp/* - /var/spool/* - /var/run/* + - /var/opt/openslx - /var/mail - /var/log/* - /var/lock/* - - /var/lib/zypp/cache/* - /var/lib/zypp/* - /var/lib/zmd - /var/lib/xdm - - /var/lib/vm/* + - /var/lib/vm* - /var/lib/suspend* - /var/lib/smart - /var/lib/sax @@ -72,14 +72,19 @@ sub initDistroInfo - /usr/bin/zen-* - /usr/bin/nw-manager - /usr/X11R6/bin/BackGround + - /usr/bin/BackGround - /opt/kde3/share/autostart/suseplugger.desktop + - /opt/kde3/share/autostart/susewatcher.desktop - /opt/kde3/share/autostart/runupdater.desktop - /opt/kde3/share/autostart/profile_chooser-autostart.desktop - /opt/kde3/share/autostart/opensuseupdater.desktop - /opt/kde3/share/autostart/knetworkmanager-autostart.desktop - /opt/kde3/share/autostart/kerry.autostart.desktop + - /opt/kde3/share/autostart/kinternet.desktop - /opt/kde3/share/autostart/beagled.desktop - /opt/kde3/share/autostart/SUSEgreeter.desktop + - /opt/kde3/share/autostart/zen-updater-auto.desktop + - /opt/gnome/share/autostart/beagle*.desktop - /media/* + /media + /lib/modules/*/misc/vmblock.o @@ -97,4 +102,4 @@ sub initDistroInfo "; } -1;
\ No newline at end of file +1; |