* added the contents of the following dirs to the exclude filter, since

  they do not make sense in the export:
      /media
      /mnt
      /proc
      /sys
      /tmp
* added --delete-excluded to the rsync options in order to clean up
  anything that had been copied before

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1518 95ad53e4-c205-0410-b2fa-d234c58c8868

7 files changed, 36 insertions, 4 deletions

diff --git a/installer/OpenSLX/OSExport/Distro/Any.pm b/installer/OpenSLX/OSExport/Distro/Any.pm
index f56673d8..bf780bb9 100644
--- a/installer/OpenSLX/OSExport/Distro/Any.pm
+++ b/installer/OpenSLX/OSExport/Distro/Any.pm
@@ -47,12 +47,17 @@ sub initDistroInfo
 		- /var/cache/yum
 		- /var/cache/man/*
 		- /usr/share/vmware/*
+		- /tmp/*
+		- /sys/*
+		- /proc/*
+		- /mnt/*
+		- /media/*
+        + /lib/modules/*/misc/vmblock.o
+        + /lib/modules/*/misc/vmnet.o
+        + /lib/modules/*/misc/vmmon.o
 		- /lib/klibc/events/*
 		- /boot/initrd*
 		- /boot/grub
-                + /lib/modules/*/misc/vmblock.o
-                + /lib/modules/*/misc/vmnet.o
-                + /lib/modules/*/misc/vmmon.o
 	";
 	return;
 }
diff --git a/installer/OpenSLX/OSExport/Distro/Debian.pm b/installer/OpenSLX/OSExport/Distro/Debian.pm
index 5ff7216a..4da68ffb 100644
--- a/installer/OpenSLX/OSExport/Distro/Debian.pm
+++ b/installer/OpenSLX/OSExport/Distro/Debian.pm
@@ -44,6 +44,11 @@ sub initDistroInfo
 		- /var/lib/xdm
 		- /var/cache/man/*
 		- /usr/share/vmware/*
+		- /tmp/*
+		- /sys/*
+		- /proc/*
+		- /mnt/*
+		- /media/*
 		- /lib/klibc/events/*
 		- /boot/initrd*
 		- /boot/grub
diff --git a/installer/OpenSLX/OSExport/Distro/Fedora.pm b/installer/OpenSLX/OSExport/Distro/Fedora.pm
index 3e5d1f31..a643c91a 100644
--- a/installer/OpenSLX/OSExport/Distro/Fedora.pm
+++ b/installer/OpenSLX/OSExport/Distro/Fedora.pm
@@ -48,6 +48,11 @@ sub initDistroInfo
 		- /var/cache/yum
 		- /var/cache/man/*
 		- /usr/share/vmware/*
+		- /tmp/*
+		- /sys/*
+		- /proc/*
+		- /mnt/*
+		- /media/*
 		- /lib/klibc/events/*
 		- /boot/initrd*
 		- /boot/grub
diff --git a/installer/OpenSLX/OSExport/Distro/Gentoo.pm b/installer/OpenSLX/OSExport/Distro/Gentoo.pm
index e4bcd6db..d46b6037 100644
--- a/installer/OpenSLX/OSExport/Distro/Gentoo.pm
+++ b/installer/OpenSLX/OSExport/Distro/Gentoo.pm
@@ -45,6 +45,11 @@ sub initDistroInfo
 		- /var/lib/init.d/*
 		- /var/cache/man/*
 		- /usr/share/vmware/*
+		- /tmp/*
+		- /sys/*
+		- /proc/*
+		- /mnt/*
+		- /media/*
 		- /boot/initrd*
 		- /boot/grub
 	";
diff --git a/installer/OpenSLX/OSExport/Distro/SUSE.pm b/installer/OpenSLX/OSExport/Distro/SUSE.pm
index 4d16c2cf..5d7ed615 100644
--- a/installer/OpenSLX/OSExport/Distro/SUSE.pm
+++ b/installer/OpenSLX/OSExport/Distro/SUSE.pm
@@ -76,6 +76,9 @@ sub initDistroInfo
 		- /usr/bin/nw-manager
 		- /usr/X11R6/bin/BackGround
 		- /usr/bin/BackGround
+		- /tmp/*
+		- /sys/*
+		- /proc/*
 		- /opt/kde3/share/autostart/suseplugger.desktop
 		- /opt/kde3/share/autostart/susewatcher.desktop
 		- /opt/kde3/share/autostart/runupdater.desktop
@@ -88,6 +91,7 @@ sub initDistroInfo
 		- /opt/kde3/share/autostart/SUSEgreeter.desktop
 		- /opt/kde3/share/autostart/zen-updater-auto.desktop
 		- /opt/gnome/share/autostart/beagle*.desktop
+		- /mnt/*
 		- /media/*
 		+ /media
 		+ /lib/modules/*/misc/vmblock.o
diff --git a/installer/OpenSLX/OSExport/Distro/Ubuntu.pm b/installer/OpenSLX/OSExport/Distro/Ubuntu.pm
index f436c533..c26aa706 100644
--- a/installer/OpenSLX/OSExport/Distro/Ubuntu.pm
+++ b/installer/OpenSLX/OSExport/Distro/Ubuntu.pm
@@ -44,6 +44,11 @@ sub initDistroInfo
 		- /var/lib/xdm
 		- /var/cache/man/*
 		- /usr/share/vmware/*
+		- /tmp/*
+		- /sys/*
+		- /proc/*
+		- /mnt/*
+		- /media/*
 		- /lib/klibc/events/*
 		- /initrd*
 		- /etc/cron.*/*
diff --git a/installer/OpenSLX/OSExport/FileSystem/NFS.pm b/installer/OpenSLX/OSExport/FileSystem/NFS.pm
index e858f513..1c4f5fbf 100644
--- a/installer/OpenSLX/OSExport/FileSystem/NFS.pm
+++ b/installer/OpenSLX/OSExport/FileSystem/NFS.pm
@@ -147,7 +147,10 @@ sub _copyViaRsync
 	my $includeExcludeList = $self->_determineIncludeExcludeList();
 	vlog(1, _tr("using include-exclude-filter:\n%s\n", $includeExcludeList));
 	my $rsyncFH;
-	open($rsyncFH, '|-', "rsync -av --delete --exclude-from=- $source/ $target")
+	open(
+		$rsyncFH, '|-', 
+		"rsync -av --delete-excluded --exclude-from=- $source/ $target"
+	)
 		or die _tr("unable to start rsync for source '%s', giving up! (%s)",
 				   $source, $!);
 	print $rsyncFH $includeExcludeList;