summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDirk von Suchodoletz2008-09-01 18:31:21 +0200
committerDirk von Suchodoletz2008-09-01 18:31:21 +0200
commit2b76fb6eebf743f8a18622a909f87247c5790129 (patch)
treeb3a0dedac811f87ff5965016a0081ba5ea205de6
parentFixes for Ubuntu (nscd, hald) ... (diff)
downloadcore-2b76fb6eebf743f8a18622a909f87247c5790129.tar.gz
core-2b76fb6eebf743f8a18622a909f87247c5790129.tar.xz
core-2b76fb6eebf743f8a18622a909f87247c5790129.zip
Hal/dbus stuff for ubuntu, rtc device file ...
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2176 95ad53e4-c205-0410-b2fa-d234c58c8868
-rw-r--r--initramfs/distro-specs/ubuntu/functions-default4
-rwxr-xr-xinitramfs/stage3-stuff/init2
2 files changed, 5 insertions, 1 deletions
diff --git a/initramfs/distro-specs/ubuntu/functions-default b/initramfs/distro-specs/ubuntu/functions-default
index 7f2d5621..7d08b32c 100644
--- a/initramfs/distro-specs/ubuntu/functions-default
+++ b/initramfs/distro-specs/ubuntu/functions-default
@@ -188,7 +188,11 @@ if [ "x$start_dreshal" = "xyes" ]; then
testmkd /mnt/var/cache/hald
touch /mnt/var/lib/misc/PolicyKit.reload
chown root:polkituser /mnt/var/lib/misc/PolicyKit.reload
+ rm -rf /mnt/etc/dbus-1/system.d/*etwork*anager.conf \
+ /mnt/etc/dbus-1/system.d/nm-* \
+ /etc/dbus-1/event.d/*NetworkManager
rllinker "dbus" 17 20
+ rllinker "hal" 18 15
if [ ! -e /mnt/etc/init.d/policykit ] ; then
testmkd /mnt/var/lib/PolicyKit root:polkituser 1770
testmkd /mnt/var/lib/PolicyKit-public root:polkituser
diff --git a/initramfs/stage3-stuff/init b/initramfs/stage3-stuff/init
index d6e33107..56814694 100755
--- a/initramfs/stage3-stuff/init
+++ b/initramfs/stage3-stuff/init
@@ -36,7 +36,7 @@ for i in "/dev/mem c 1 1" "/dev/null c 1 3" "/dev/zero c 1 5" \
"/dev/tty7 c 4 7" "/dev/tty8 c 4 8" "/dev/tty9 c 4 9" \
"/dev/tty10 c 4 10" "/dev/tty c 5 0" "/dev/console c 5 1" \
"/dev/ptmx c 5 2" "/dev/psaux c 10 1" "/dev/agpgart c 10 175" \
- "/dev/fb0 c 29 0" "/dev/xconsole p"; do
+ "/dev/fb0 c 29 0" "/dev/rtc c 10 135" "/dev/xconsole p"; do
mknod $i
done
mkdir -p ${devdir}/pts ${devdir}/shm ${devdir}/.udevdb ${devdir}/.udev \