diff options
| author | Dirk von Suchodoletz | 2010-02-28 12:32:55 +0100 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2010-02-28 12:32:55 +0100 |
| commit | 1a00fd0c6b80fa89c2ef6896c1242a55c981da0e (patch) | |
| tree | eb22f237dcfa62a0777047cf6102597e3a9f3f05 /initramfs | |
| parent | Updating vmchooser, heavy cleanup in vmware plugin ... (diff) | |
| download | core-1a00fd0c6b80fa89c2ef6896c1242a55c981da0e.tar.gz core-1a00fd0c6b80fa89c2ef6896c1242a55c981da0e.tar.xz core-1a00fd0c6b80fa89c2ef6896c1242a55c981da0e.zip | |
Creating the slx default directories in a more general manner (so the
plugins could depend on their existance) ...
Diffstat (limited to 'initramfs')
| -rw-r--r-- | initramfs/distro-specs/suse/functions-default | 4 | ||||
| -rwxr-xr-x | initramfs/stage3-stuff/init | 13 |
2 files changed, 10 insertions, 7 deletions
diff --git a/initramfs/distro-specs/suse/functions-default b/initramfs/distro-specs/suse/functions-default index b53227fc..5b02909b 100644 --- a/initramfs/distro-specs/suse/functions-default +++ b/initramfs/distro-specs/suse/functions-default @@ -48,9 +48,9 @@ grep -q -E "otebook" /etc/hwinfo.bios && \ sed -e "1i# /etc/sysconfig/sysctl - modified by $0 version $version" \ -e "s,ENABLE_SYSRQ=.*,ENABLE_SYSRQ=\"yes\"," \ -i /mnt/etc/sysconfig/sysctl -# add specific path /var/X11R6/bin ... +# add slx specific path /var/opt/openslx/bin ... echo -e "# stuff generated by $0 (out of InitRamFS written $date)\n\ -PATH=\"\$PATH:/var/X11R6/bin\"\n\ +PATH=\"\$PATH:/var/opt/openslx/bin\"\n\ test \"\$UID\" -ge 100 && PATH=\"\$PATH:.\"\n\ QTDIR=/usr/lib/qt3\nexport QTDIR\nno_proxy='localhost'\n\ export no_proxy" >/mnt/etc/SuSEconfig/profile diff --git a/initramfs/stage3-stuff/init b/initramfs/stage3-stuff/init index b28f1138..5dc646ca 100755 --- a/initramfs/stage3-stuff/init +++ b/initramfs/stage3-stuff/init @@ -1,6 +1,6 @@ #!/bin/ash # Copyright (c) 2003..2006 - RZ Uni Freiburg -# Copyright (c) 2006..2009 - OpenSLX GmbH +# Copyright (c) 2006..2010 - OpenSLX GmbH # # This program is free software distributed under the GPL version 2. # See http://openslx.org/COPYING @@ -804,10 +804,13 @@ fi runinithook '50-have-layered-fs' -# logdir -. /mnt/etc/opt/openslx/openslx.conf -testmkd /mnt/${OPENSLX_DEFAULT_LOGDIR} -chmod -R 1777 /mnt/${OPENSLX_DEFAULT_LOGDIR} # testmkd 1777 seems not to work +# generate a set of default directories +. /etc/openslx.conf +for dir in $OPENSLX_DEFAULT_LOGDIR $OPENSLX_DEFAULT_BINDIR \ + $OPENSLX_DEFAULT_LIBDIR $OPENSLX_DEFAULT_VIRTDIR; do + testmkd /mnt/$dir +done +chmod -R 1777 /mnt/${OPENSLX_DEFAULT_LOGDIR} # script for stuff to execute during early bootup d_mkrlscript init boot.slx "Running configuration postponed from InitRamFS" |