diff options
| author | Sebastian | 2010-08-22 19:56:51 +0200 |
|---|---|---|
| committer | Sebastian | 2010-08-22 19:56:51 +0200 |
| commit | 82163647179665ce4a06cf772fd994f9d412ea90 (patch) | |
| tree | 2c06d2ccb46e50b9182704abfbcab9a182b55b41 | |
| parent | fix bug, kdm didn't start if spashy wasn't running (diff) | |
| parent | Merge branch 'master' of openslx.org:openslx/core (diff) | |
| download | core-82163647179665ce4a06cf772fd994f9d412ea90.tar.gz core-82163647179665ce4a06cf772fd994f9d412ea90.tar.xz core-82163647179665ce4a06cf772fd994f9d412ea90.zip | |
Merge branch 'master' of openslx.org:openslx/core
| -rw-r--r-- | initramfs/distro-specs/ubuntu/functions-default | 7 | ||||
| -rw-r--r-- | os-plugins/plugins/vmware/init-hooks/80-after-plugins/adapt-tmpfs.sh | 4 |
2 files changed, 2 insertions, 9 deletions
diff --git a/initramfs/distro-specs/ubuntu/functions-default b/initramfs/distro-specs/ubuntu/functions-default index 1a863966..0836f4c0 100644 --- a/initramfs/distro-specs/ubuntu/functions-default +++ b/initramfs/distro-specs/ubuntu/functions-default @@ -200,16 +200,9 @@ if [ "x$start_dreshal" = "xyes" ]; then testmkd /mnt/var/lib/dbus testmkd /mnt/var/lib/misc 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-* \ /mnt/etc/dbus-1/event.d/*NetworkManager* - sed -i /mnt/etc/PolicyKit/PolicyKit.conf \ - -e "s/\(<\/config>\)/ @@new@@\n\1/" \ - -e "s/@@new@@/<match action=\"@@action@@\">\n@@return@@\n <\/match>/" \ - -e "s/@@action@@/org.freedesktop.hal.storage.mount-removable/" \ - -e "s/@@return@@/ <return result=\"yes\"\/>/" sed -i /mnt/etc/dbus-1/system.d/hal.conf \ -e "s/^\([^d]*\)deny\(.*Volume.*\)/\1allow\2/" for dir in 10-vendor.d 20-org.d 30-site.d 50-local.d 90-mandatory.d ; do diff --git a/os-plugins/plugins/vmware/init-hooks/80-after-plugins/adapt-tmpfs.sh b/os-plugins/plugins/vmware/init-hooks/80-after-plugins/adapt-tmpfs.sh index 9a168829..a6db9682 100644 --- a/os-plugins/plugins/vmware/init-hooks/80-after-plugins/adapt-tmpfs.sh +++ b/os-plugins/plugins/vmware/init-hooks/80-after-plugins/adapt-tmpfs.sh @@ -16,9 +16,9 @@ # adapt tmpfs size (overbook) case $(grep tmpfs /proc/mounts) in */tmp*) - mount -o remount,size=200% /mnt/tmp + mount -o remount,size=150% /mnt/tmp ;; */uniontmp*) - mount -o remount,size=200% /mnt/tmp + mount -o remount,size=150% /mnt/tmp ;; esac |