diff options
author | Dirk von Suchodoletz | 2007-02-26 23:18:13 +0100 |
---|---|---|
committer | Dirk von Suchodoletz | 2007-02-26 23:18:13 +0100 |
commit | e1e3b37bba3cabae30e99c87c6912fa803b81294 (patch) | |
tree | a0028074b3b4d4e8cd29cbf96cd1b5fa1cf2b21d /initramfs | |
parent | Problems with certain hardware modules (ata_piix in SuSE10.2) (diff) | |
download | core-e1e3b37bba3cabae30e99c87c6912fa803b81294.tar.gz core-e1e3b37bba3cabae30e99c87c6912fa803b81294.tar.xz core-e1e3b37bba3cabae30e99c87c6912fa803b81294.zip |
Code and header cleanups, minor add to suse/functions-10.2 ...
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@727 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs')
-rw-r--r-- | initramfs/distro-specs/suse/config-10.1 | 22 | ||||
-rw-r--r-- | initramfs/distro-specs/suse/config-10.2 | 22 | ||||
-rw-r--r-- | initramfs/distro-specs/suse/config-default | 4 | ||||
-rw-r--r-- | initramfs/distro-specs/suse/functions-10.2 | 25 |
4 files changed, 45 insertions, 28 deletions
diff --git a/initramfs/distro-specs/suse/config-10.1 b/initramfs/distro-specs/suse/config-10.1 index 7229f9c7..46efb1f1 100644 --- a/initramfs/distro-specs/suse/config-10.1 +++ b/initramfs/distro-specs/suse/config-10.1 @@ -1,10 +1,16 @@ -# distro specific settings for SuSE 10.1. This configuration might change -# settings from SuSE default configuration file +# Copyright (c) 2003 - 2006 - RZ Uni Freiburg +# Copyright (c) 2006, 2007 - OpenSLX GmbH +# +# This program/file is free software distributed under the GPL version 2. +# See http://openslx.org/COPYING # -# Dirk von Suchodoletz <dirk@goe.net>, 15-07-2006 +# If you have any feedback please consult http://openslx.org/feedback and +# send your feedback to feedback@openslx.org # -# (c) 2003, 2006 - RZ Universitaet Freiburg -# (c) 2006 OpenSLX.org Project +# General information about OpenSLX can be found under http://openslx.org +# +# Distro specific settings for SuSE 10.1. This configuration might change +# settings from SuSE default configuration file # D_SYSCONFDIR - system wide configuration settings - /etc/sysconfig in SuSE # D_ETCEXCL - list of files, wildcards to be excluded from /etc when using @@ -24,5 +30,7 @@ # D_BOOTLOCAL - script for user specified stuff which should be started # during client bootup, path and file relative to /etc -D_INITSCRIPTS="kbd boot.udev boot.proc boot.klog boot.loadmodules boot.clock boot.sysctl boot.ipconfig boot.swap" -D_RODIRSINRW="/etc/opt/gnome/gconf /etc/X11/xkb /var/adm /var/lib/texmf /var/lib/rpm /var/cache/fontconfig" +D_INITSCRIPTS="kbd boot.udev boot.proc boot.klog boot.loadmodules boot.clock \ +boot.sysctl boot.ipconfig boot.swap" +D_RODIRSINRW="/etc/opt/gnome/gconf /etc/X11/xkb /var/adm /var/lib/texmf \ +/var/lib/rpm /var/cache/fontconfig" diff --git a/initramfs/distro-specs/suse/config-10.2 b/initramfs/distro-specs/suse/config-10.2 index f85815f1..ae296900 100644 --- a/initramfs/distro-specs/suse/config-10.2 +++ b/initramfs/distro-specs/suse/config-10.2 @@ -1,10 +1,16 @@ -# distro specific settings for SuSE 10.1. This configuration might change -# settings from SuSE default configuration file +# Copyright (c) 2003 - 2006 - RZ Uni Freiburg +# Copyright (c) 2006, 2007 - OpenSLX GmbH +# +# This program/file is free software distributed under the GPL version 2. +# See http://openslx.org/COPYING # -# Dirk von Suchodoletz <dirk@goe.net>, 15-07-2006 +# If you have any feedback please consult http://openslx.org/feedback and +# send your feedback to feedback@openslx.org # -# (c) 2003, 2006 - RZ Universitaet Freiburg -# (c) 2006 OpenSLX.org Project +# General information about OpenSLX can be found under http://openslx.org +# +# Distro specific settings for OpenSuSE 10.2. This configuration might change +# settings from SuSE default configuration file # D_SYSCONFDIR - system wide configuration settings - /etc/sysconfig in SuSE # D_ETCEXCL - list of files, wildcards to be excluded from /etc when using @@ -24,6 +30,8 @@ # D_BOOTLOCAL - script for user specified stuff which should be started # during client bootup, path and file relative to /etc -D_INITSCRIPTS="boot.udev boot.proc boot.klog boot.loadmodules boot.clock boot.sysctl boot.ipconfig boot.swap" -D_RODIRSINRW="/etc/opt/gnome/gconf /etc/X11/xkb /var/adm /var/lib/texmf /var/lib/rpm /var/cache/fontconfig" +D_INITSCRIPTS="boot.udev boot.proc boot.klog boot.loadmodules boot.clock \ +boot.sysctl boot.ipconfig boot.swap" +D_RODIRSINRW="/etc/opt/gnome/gconf /var/adm /var/lib/texmf /var/lib/rpm \ +/var/cache/fontconfig" D_HWMODTOIGNORE="i8xx-tco ichxrom snd-atiixp-modem intel-rng pata_atiixp" diff --git a/initramfs/distro-specs/suse/config-default b/initramfs/distro-specs/suse/config-default index aa4db0bb..66f1cc2c 100644 --- a/initramfs/distro-specs/suse/config-default +++ b/initramfs/distro-specs/suse/config-default @@ -9,8 +9,8 @@ # # General information about OpenSLX can be found under http://openslx.org # -# distro specific settings for general SuSE. This configuration is the base -# for following SuSE versions: 9.3 - 10.2 +# Distro specific settings for general SuSE. This configuration is the base +# for following (Open)SuSE versions: 9.3 - 10.2 # D_SYSCONFDIR - system wide configuration settings - /etc/sysconfig in SuSE # and RedHat, /etc/default in Debian and Ubuntu diff --git a/initramfs/distro-specs/suse/functions-10.2 b/initramfs/distro-specs/suse/functions-10.2 index c8947df4..630c2b4a 100644 --- a/initramfs/distro-specs/suse/functions-10.2 +++ b/initramfs/distro-specs/suse/functions-10.2 @@ -15,19 +15,21 @@ # some specific stuff to initialize preinit () { -# fake the existence of some helper binaries (which are not of any use +# fake the existence of some helper binaries/scripts (which are not of any use # within initialramfs) -shell="/bin/sh" +local shell="/bin/sh" +local item if [ -x /bin/busybox ] ; then shell="/bin/ash" else - for i in hwup ifup ; do + for item in hwup ifup ; do echo -e "#!$shell\n:" >/sbin/$i done mkdir /lib/udev /usr/sbin - for i in usb_id scsi_id vol_id edd_id ata_id path_id cdrom_id idedma.sh \ - mount.sh rename_netiface firmware.sh create_floppy_devices ; do - echo -e "#!$shell\n:" >/lib/udev/$i + for item in usb_id scsi_id vol_id edd_id ata_id path_id cdrom_id idedma.sh \ + mount.sh rename_netiface firmware.sh create_floppy_devices \ + trigger_firmware_loading.sh ; do + echo -e "#!$shell\n# do nothing here\n:" >/lib/udev/$i done echo -e "#!$shell\n:" >/usr/sbin/alsactl rm /etc/udev/rules.d/60-persistent-storage.rules 2>/dev/null @@ -63,10 +65,9 @@ rllinker powersaved "11" "11" } # configure dbus (inter application communication for kde and gnome), hal -# (hardware abstraction layer - used e.g. by powersaved) and resmgr -# (resource manager - the user gets permissions to devices when loggin on) -# runlevel script for haldaemon is now haldaemon instead of hal. For KDE -# and GNOME a new concept was introduced: +# (hardware abstraction layer - used e.g. by powersaved), resmgr and +# policykitd (resource manager/policykitd - the user gets permissions to +# devices when loggin on) config_dreshal () { local start="05" local stop="18" @@ -123,7 +124,7 @@ nfsd\t\t/proc/fs/nfsd\tnfsd\t\tdefaults\t 0 0" >>/tmp/fstab echo -e "\t# stuff needed for nfsv4\n\tmount -t rpc_pipefs rpc_pipefs \ /var/lib/nfs/rpc_pipefs\n\tmount -t nfsd nfsd /proc/fs/nfsd" \ >>/mnt/etc/${D_INITDIR}/boot.ld -# portmap is required +# portmap is required for any NFS config_portmap rllinker "idmapd" "14" "08" rllinker "gssd" "15" "07" @@ -161,7 +162,7 @@ fi # set up keytable (function run in hwautocfg) # kbd runlevel link is in the list of initial runlevel scripts (see -# config-10.1 file) +# suse/config-10.2 file) keytable () { # remove unneeded components from the startscript sed -e "/wanted keytable/,/^fi$/d;/load usb drivers/,/^esac$/d" \ |