summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDirk von Suchodoletz2009-04-01 23:02:27 +0200
committerDirk von Suchodoletz2009-04-01 23:02:27 +0200
commit26aa2b97c707bcdeaa2781bb7dc220d93c339119 (patch)
tree6c7a0f12a8da25c985b44db4b34b52c2f904f10b
parentUdev trigger for Ubuntu ... (diff)
downloadcore-26aa2b97c707bcdeaa2781bb7dc220d93c339119.tar.gz
core-26aa2b97c707bcdeaa2781bb7dc220d93c339119.tar.xz
core-26aa2b97c707bcdeaa2781bb7dc220d93c339119.zip
Bit of optimization for Ubuntu ...
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2784 95ad53e4-c205-0410-b2fa-d234c58c8868
-rw-r--r--initramfs/distro-specs/ubuntu/functions-default8
-rw-r--r--os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm2
2 files changed, 4 insertions, 6 deletions
diff --git a/initramfs/distro-specs/ubuntu/functions-default b/initramfs/distro-specs/ubuntu/functions-default
index d4048fd0..6aa08e39 100644
--- a/initramfs/distro-specs/ubuntu/functions-default
+++ b/initramfs/distro-specs/ubuntu/functions-default
@@ -89,7 +89,7 @@ local count=10
# should be executed before the normal runlevel scripts. Proper shutdown is
# not needed!?
for i in mountkernfs.sh mountdevsubfs.sh keyboard-setup procps bootlogd \
-hwclock.sh sudo console-setup boot.slx $D_SPLASHY; do
+hwclock.sh sudo console-setup udev boot.slx $D_SPLASHY; do
count=$(($count + 1))
[ $DEBUGLEVEL -ge 2 ] && echo "boot-runlevelscript $i"
ln -sf /etc/init.d/$i /mnt/etc/rcS.d/S${count}$i
@@ -133,9 +133,7 @@ sed "s/LANG.*/LANG=\"${LANG}\"/" -i /mnt/etc/default/locale
# configure udev
config_udev () {
- if [ -f /mnt/etc/init.d/udev ] ; then
- rllinker "udev" 7 14
- fi
+ [ -c /dev/pktcdvd ] && { rm -rf /dev/pktcdvd; mkdir /dev/pktcdvd; }
if [ -f /mnt/etc/init.d/udev-finish ] ; then
rllinker "udev-finish" 24 2
fi
@@ -199,7 +197,7 @@ if [ "x$start_snmp" = "xyes" ] ; then
}
# acpi and powersave
config_acpi () {
- rllinker "acpid" 10 19
+ rllinker "acpid" 8 16
#Commented out since battery checking is only useful for Notebooks
#rllinker "acpi-support" 99 2
}
diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm
index b65284ed..8263d2a1 100644
--- a/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm
@@ -58,7 +58,7 @@ sub setupGDMScript
. /etc/gdm/PostSession/Default.system' >/mnt/etc/gdm/PostSession/Default
chmod a+x /mnt/etc/gdm/PostSession/Default*
# gdm should be started after dbus/hal
- rllinker gdm 4 10
+ rllinker gdm 5 10
echo '/usr/sbin/gdm' >/mnt/etc/X11/default-display-manager
chroot /mnt update-alternatives --set x-window-manager /usr/bin/metacity
chroot /mnt update-alternatives --set x-session-manager \