From 3a8337f4421e2dbce0ed3d4c087bb5573ecf24d7 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Sun, 22 Aug 2010 19:42:31 +0200
Subject: Removing unneeded stuff from Ubuntu configuration, changing tempfs
 overbooking for VMware to a more safe setting.

---
 initramfs/distro-specs/ubuntu/functions-default                    | 7 -------
 .../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
-- 
cgit v1.2.3-55-g7522