diff options
| -rw-r--r-- | VERSIONS | 2 | ||||
| -rw-r--r-- | initramfs/distro-specs/suse/functions-default | 16 | ||||
| -rwxr-xr-x | initramfs/stage3-stuff/init | 2 | ||||
| -rw-r--r-- | installer/OpenSLX/OSSetup/Engine.pm | 6 |
4 files changed, 12 insertions, 14 deletions
@@ -1,4 +1,4 @@ OPENSLX_VERSION_MAJOR="4" OPENSLX_VERSION_MINOR="9" -OPENSLX_VERSION_RELEASE="6" +OPENSLX_VERSION_RELEASE="7" OPENSLX_VERSION_STRING="${OPENSLX_VERSION_MAJOR}.${OPENSLX_VERSION_MINOR}.${OPENSLX_VERSION_RELEASE}${OPENSLX_SVN_SNAPSHOT:+rev$OPENSLX_VERSION_SVNREV}" diff --git a/initramfs/distro-specs/suse/functions-default b/initramfs/distro-specs/suse/functions-default index 4ab1cbe4..2cfb5747 100644 --- a/initramfs/distro-specs/suse/functions-default +++ b/initramfs/distro-specs/suse/functions-default @@ -490,8 +490,7 @@ config_dreshal () { local start=0 local stop=18 if [ "x$start_dreshal" = "xyes" ]; then - for dir in /var/run/dbus /var/run/resmgr/classes /var/run/hal \ - /var/cache/hald /var/lib/PolicyKit; do + for dir in /var/run/resmgr/classes /var/lib/PolicyKit; do testmkd /mnt/$dir done if [ -f /mnt/etc/init.d/dbus ] ; then @@ -500,9 +499,8 @@ if [ "x$start_dreshal" = "xyes" ]; then >> /mnt/etc/passwd strinfile "messagebus:" /mnt/etc/group || \ echo "messagebus:!:101:" >> /mnt/etc/group - # set permissions with userid - echo -e "\tchown messagebus:messagebus /var/run/dbus 2>/dev/null" \ - >>/mnt/etc/init.d/boot.slx + # create directories and set permissions with user and group id + testmkd /mnt/var/run/dbus messagebus:messagebus rllinker "dbus" $start $stop fi if [ -f /mnt/etc/init.d/consolekit ] ; then @@ -527,9 +525,9 @@ if [ "x$start_dreshal" = "xyes" ]; then strinfile "haldaemon:" /mnt/etc/group || \ echo "haldaemon:!:103:" >> /mnt/etc/group echo -n "" > /mnt/var/lib/PolicyKit/reload - # set permissions with userid - echo -e "\tchown haldaemon:haldaemon /var/run/hal /var/cache/hald \ - 2>/dev/null" >>/mnt/etc/init.d/boot.slx + # create directories and set permissions with user and group id + testmkd /mnt/var/run/hal haldaemon:haldaemon + testmkd /mnt/var/cache/hald haldaemon:haldaemon start=$(($start + 1)) stop=$(($stop - 1)) rllinker "haldaemon" $start $stop @@ -539,7 +537,7 @@ fi # configure automounter (fixme: to be moved into plugin) config_automount () { if [ -e /mnt/etc/sysconfig/autofs ] ; then - testmkd /var/lock/subsys + testmkd /mnt/var/lock/subsys sed -e "1i# /etc/sysconfig/autofs - file modified by\n#\t$0:\n#" \ -e "s,AUTOFS_OPTIONS.*,AUTOFS_OPTIONS=\"--timeout 3\"," \ -i /mnt/etc/sysconfig/autofs diff --git a/initramfs/stage3-stuff/init b/initramfs/stage3-stuff/init index d2eeb529..d3034a00 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..2008 - OpenSLX GmbH +# Copyright (c) 2006..2009 - OpenSLX GmbH # # This program is free software distributed under the GPL version 2. # See http://openslx.org/COPYING diff --git a/installer/OpenSLX/OSSetup/Engine.pm b/installer/OpenSLX/OSSetup/Engine.pm index 60be922f..ea17666b 100644 --- a/installer/OpenSLX/OSSetup/Engine.pm +++ b/installer/OpenSLX/OSSetup/Engine.pm @@ -1,4 +1,4 @@ -# Copyright (c) 2006..2008 - OpenSLX GmbH +# Copyright (c) 2006..2009 - OpenSLX GmbH # # This program is free software distributed under the GPL version 2. # See http://openslx.org/COPYING @@ -55,8 +55,8 @@ use vars qw(%supportedDistros); 'suse-11.0_x86_64' => 'clone,update,shell', 'suse-11.1' => 'clone,update,shell', 'suse-11.1_x86_64' => 'clone,update,shell', - 'ubuntu-7.04' => 'clone,install,update,shell', - 'ubuntu-7.04_amd64' => 'clone,install,update,shell', + 'scilin-4.7' => 'clone,update,shell', + 'scilin-5.X' => 'clone,update,shell', 'ubuntu-7.10' => 'clone,update,shell', 'ubuntu-7.10_amd64' => 'clone,update,shell', 'ubuntu-8.04' => 'clone,update,shell', |