diff options
author | Dirk von Suchodoletz | 2006-12-14 02:08:26 +0100 |
---|---|---|
committer | Dirk von Suchodoletz | 2006-12-14 02:08:26 +0100 |
commit | c58ffaa2fd468b69d93a607e0db5e6ec74d7b2ba (patch) | |
tree | d76053b5d47c200c67318dd38d0cb013d01d8d58 /initramfs/initrd-stuff | |
parent | dxs2tgz is replaced by Makefile (diff) | |
download | core-c58ffaa2fd468b69d93a607e0db5e6ec74d7b2ba.tar.gz core-c58ffaa2fd468b69d93a607e0db5e6ec74d7b2ba.tar.xz core-c58ffaa2fd468b69d93a607e0db5e6ec74d7b2ba.zip |
First steps to include (open)SuSE10.2 into SLX environment (see #98). Tried to fix
the /dev/nvidia* permissions (failed, see #92 too)...
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@534 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs/initrd-stuff')
-rwxr-xr-x | initramfs/initrd-stuff/bin/hwautocfg | 7 | ||||
-rwxr-xr-x | initramfs/initrd-stuff/bin/servconfig | 4 | ||||
-rw-r--r-- | initramfs/initrd-stuff/etc/functions | 4 |
3 files changed, 9 insertions, 6 deletions
diff --git a/initramfs/initrd-stuff/bin/hwautocfg b/initramfs/initrd-stuff/bin/hwautocfg index 75ce2381..9bdb4bc6 100755 --- a/initramfs/initrd-stuff/bin/hwautocfg +++ b/initramfs/initrd-stuff/bin/hwautocfg @@ -3,7 +3,7 @@ # universal (distro independent) hardware autoconfiguration script for # OpenSLX linux diskless clients, using hwconfig from knoppix as base tool # -# Dirk von Suchodoletz <dvs@OpenSLX.com>, 20-11-2006 +# Dirk von Suchodoletz <dvs@OpenSLX.com>, 14-12-2006 # # (c) 2003 - 2006 - RZ Universitaet Freiburg # (c) 2006 - OpenSLX.org Project @@ -18,6 +18,7 @@ local VSYNCRANGE="60-90" local DEFAULTMODES='"1024x768" "800x600" "640x480"' local DEFAULTCOLORDPT=24 # set variables representing the xorg.conf sections (version 6.9.x) +# variables might be overwritten via displayvars function local Module='\tLoad\t\t"dbe"\n \tLoad\t\t"extmod"\n \tLoad\t\t"type1"\n @@ -29,6 +30,7 @@ local ServerFlags='\tOption\t\t"AllowMouseOpenFail"\n \tOption\t\t"standby time"\t\t"10"\n \tOption\t\t"suspend time"\t\t"15"\n \tOption\t\t"off time"\t\t"20"' +# fixme: Do we really need FontPath, RgbPath!?! local Files='\tRgbPath\t\t"/usr/X11R6/lib/X11/rgb"\n \tModulePath\t"/etc/X11/modules"\n \tModulePath\t"/usr/X11R6/lib/modules"\n @@ -236,7 +238,8 @@ else error "$hcfg_xcfg" nonfatal fi -# USB core is needed for presence of /proc/bus/usb +# USB core is needed for presence of /proc/bus/usb (path seems to be deprecated +# in recent kernels!?) modprobe ${MODPRV} usbcore & # "drivers" (pseudo, placeholder strings, ...) to exclude from loading diff --git a/initramfs/initrd-stuff/bin/servconfig b/initramfs/initrd-stuff/bin/servconfig index 744c9df9..207adc5b 100755 --- a/initramfs/initrd-stuff/bin/servconfig +++ b/initramfs/initrd-stuff/bin/servconfig @@ -4,7 +4,7 @@ # diskless clients (executed in stage3 within initial ramfs). The file- # system is setup when servconfig starts # -# Dirk von Suchodoletz <dvs@OpenSLX.com>, 29-10-2006 +# Dirk von Suchodoletz <dvs@OpenSLX.com>, 14-12-2006 # Michael Janczyk <mj0@uni-freiburg.de>, 10-11-2006 # Lars Mueller <lm@OpenSLX.com>, 23-06-2006 # Oliver Tappe <ot@OpenSLX.com>, 23-06-2006 @@ -412,7 +412,7 @@ chmod 1777 /mnt/tmp if [ "x$start_x" != "xno" ] ; then # creating directories commonly needed for X11 in all distros # rest should be done via config_x11 function (distro specific) - for i in /var/lib/xkb/ \ + for i in /var/lib/xkb/compiled \ /etc/X11/xdm \ /etc/X11/sessions \ /var/X11R6/bin \ diff --git a/initramfs/initrd-stuff/etc/functions b/initramfs/initrd-stuff/etc/functions index e78bf88c..4ede90c6 100644 --- a/initramfs/initrd-stuff/etc/functions +++ b/initramfs/initrd-stuff/etc/functions @@ -487,8 +487,8 @@ syslogngcfg=$1 # fixme!? only first logserver from dhcp variable is used [ -n "$log_servers" ] && start_syslog="syslog://${log_servers% *}:514/udp" echo -e "# File written by $0 within InitRamFS\n\ -source src {\n\tfile(\"/proc/kmsg\") log_prefix(\"kernel: \");\n\ -\tunix-stream(\"/dev/log\");\n\tinternal();\n};\ndestination console_all {\ +source src {\n\tfile(\"/proc/kmsg\");\n\ +\tunix-dgram(\"/dev/log\");\n\tinternal();\n};\ndestination console_all {\ \n\tfile(\"/dev/tty10\");\n};" >$syslogngcfg case "$start_syslog" in yes|Yes|YES) |