Merge branch 'master' of openslx.org:openslx/core

2 files changed, 6 insertions, 7 deletions

diff --git a/initramfs/distro-specs/ubuntu/functions-default b/initramfs/distro-specs/ubuntu/functions-default
index 0836f4c0..1fdbf6bb 100644
--- a/initramfs/distro-specs/ubuntu/functions-default
+++ b/initramfs/distro-specs/ubuntu/functions-default
@@ -54,12 +54,11 @@ required." >/mnt/etc/init.inactive/README
   # remove plymouth component from *dm.conf (not needed with splashy)
   sed "/# Check kernel c/,/done/d" -i /mnt/etc/init.inactive/*dm.conf
   # copy initial upstart scripts back
-  for file in alsa-mixer-save.conf control-alt-delete.conf dbus.conf \
-              dmesg.conf hwclock.conf hwclock-save.conf irqbalance.conf \
-              module-init-tools.conf mountall.conf mounted*conf \
-              networking.conf procps.conf rc*.conf tty*conf udev*conf \
-              upstart-udev-bridge.conf ; do
-    mv /mnt/etc/init.inactive/${file} /mnt/etc/init >/dev/null 2>&1
+  for file in alsa-mixer-save control-alt-delete console-setup dbus \
+              dmesg hwclock hwclock-save irqbalance module-init-tools \
+              mountall mounted* networking procps rc* tty* udev* \
+              upstart-udev-bridge ; do
+    mv /mnt/etc/init.inactive/${file}.conf /mnt/etc/init >/dev/null 2>&1
   done
 
   # remove annoying udev rule set for changing eth interface and cd/dvds
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 a6db9682..5a0ac320 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
@@ -19,6 +19,6 @@ case $(grep tmpfs /proc/mounts) in
     mount -o remount,size=150% /mnt/tmp
     ;;
   */uniontmp*)
-    mount -o remount,size=150% /mnt/tmp
+    mount -o remount,size=150% /mnt/uniontmp
     ;;
 esac