* Switched indent used in Perl-code and settings files from tabs to 4 spaces.

  May need some manual corrections here and there, but should basically be ok.

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

3 files changed, 364 insertions, 364 deletions

diff --git a/installer/OpenSLX/OSExport/FileSystem/Base.pm b/installer/OpenSLX/OSExport/FileSystem/Base.pm
index a59cc944..1014d596 100644
--- a/installer/OpenSLX/OSExport/FileSystem/Base.pm
+++ b/installer/OpenSLX/OSExport/FileSystem/Base.pm
@@ -9,14 +9,14 @@
 # General information about OpenSLX can be found at http://openslx.org/
 # -----------------------------------------------------------------------------
 # Base.pm
-#	- provides empty base of the OpenSLX OSExport::FileSystem API.
+#    - provides empty base of the OpenSLX OSExport::FileSystem API.
 # -----------------------------------------------------------------------------
 package OpenSLX::OSExport::FileSystem::Base;
 
 use strict;
 use warnings;
 
-our $VERSION = 1.01;		# API-version . implementation-version
+our $VERSION = 1.01;        # API-version . implementation-version
 
 use File::Basename;
 
@@ -28,7 +28,7 @@ use OpenSLX::Utils;
 ################################################################################
 sub new
 {
-	confess "Creating OpenSLX::OSExport::FileSystem::Base-objects directly makes no sense!";
+    confess "Creating OpenSLX::OSExport::FileSystem::Base-objects directly makes no sense!";
 }
 
 sub initialize
@@ -45,16 +45,16 @@ sub purgeExport
 
 sub checkRequirements
 {
-	return 1;
+    return 1;
 }
 
 sub addExportToConfigDB
 {
-	my $self = shift;
-	my $export = shift;
-	my $openslxDB = shift;
+    my $self = shift;
+    my $export = shift;
+    my $openslxDB = shift;
 
-	return $openslxDB->addExport($export);
+    return $openslxDB->addExport($export);
 }
 
 sub generateExportURI
@@ -78,54 +78,54 @@ sub showExportConfigInfo
 ################################################################################
 sub _pickKernelVersion
 {
-	my $self         = shift;
-	my $vendorOSPath = shift;
-	
-	my $kernel = followLink("$vendorOSPath/boot/vmlinuz");
-	if (!-e $kernel) {
-		# 'vmlinuz'-link doesn't exist, so we have to pick the kernel manually
-		my $osSetupEngine = instantiateClass("OpenSLX::OSSetup::Engine");
-		$osSetupEngine->initialize($self->{engine}->{'vendor-os-name'}, 'none');
-		$kernel = $osSetupEngine->pickKernelFile("$vendorOSPath/boot");
-	}
-	my $kernelName = basename($kernel);
-	if ($kernelName !~ m[-(.+)$]) {
-		die _tr("unable to determine version of kernel '%s'!", $kernelName);
-	}
-	return $1;
+    my $self         = shift;
+    my $vendorOSPath = shift;
+    
+    my $kernel = followLink("$vendorOSPath/boot/vmlinuz");
+    if (!-e $kernel) {
+        # 'vmlinuz'-link doesn't exist, so we have to pick the kernel manually
+        my $osSetupEngine = instantiateClass("OpenSLX::OSSetup::Engine");
+        $osSetupEngine->initialize($self->{engine}->{'vendor-os-name'}, 'none');
+        $kernel = $osSetupEngine->pickKernelFile("$vendorOSPath/boot");
+    }
+    my $kernelName = basename($kernel);
+    if ($kernelName !~ m[-(.+)$]) {
+        die _tr("unable to determine version of kernel '%s'!", $kernelName);
+    }
+    return $1;
 }
 
 sub _locateKernelModule
 {
-	my $self         = shift;
-	my $vendorOSPath = shift;
-	my $moduleName   = shift;
-	my $defaultPaths = shift;
-
-	vlog(1, _tr("locating kernel-module '%s'", $moduleName));
-	# check default paths first:
-	foreach my $defPath (@$defaultPaths) {
-		vlog(2, "trying $defPath/$moduleName");
-		my $target = followLink("$defPath/$moduleName", $vendorOSPath);
-		return $target unless !-e $target;
-	}
-	# use brute force to search for the newest incarnation of the module:
-	use File::Find;
-	my $location;
-	my $locationAge = 9999999;
-	vlog(2, "searching in $vendorOSPath/lib/modules");
-	find sub {
-		return unless $_ eq $moduleName;
-		if (-M _ < $locationAge) {
-			$locationAge = -M _;
-			$location    = $File::Find::name;
-			vlog(2, "located at $location (age=$locationAge days)");
-		}
-	}, "$vendorOSPath/lib/modules";
-	if (defined $location) {
-		return followLink($location, $vendorOSPath);
-	}
-	return;
+    my $self         = shift;
+    my $vendorOSPath = shift;
+    my $moduleName   = shift;
+    my $defaultPaths = shift;
+
+    vlog(1, _tr("locating kernel-module '%s'", $moduleName));
+    # check default paths first:
+    foreach my $defPath (@$defaultPaths) {
+        vlog(2, "trying $defPath/$moduleName");
+        my $target = followLink("$defPath/$moduleName", $vendorOSPath);
+        return $target unless !-e $target;
+    }
+    # use brute force to search for the newest incarnation of the module:
+    use File::Find;
+    my $location;
+    my $locationAge = 9999999;
+    vlog(2, "searching in $vendorOSPath/lib/modules");
+    find sub {
+        return unless $_ eq $moduleName;
+        if (-M _ < $locationAge) {
+            $locationAge = -M _;
+            $location    = $File::Find::name;
+            vlog(2, "located at $location (age=$locationAge days)");
+        }
+    }, "$vendorOSPath/lib/modules";
+    if (defined $location) {
+        return followLink($location, $vendorOSPath);
+    }
+    return;
 }
 
 1;
diff --git a/installer/OpenSLX/OSExport/FileSystem/NFS.pm b/installer/OpenSLX/OSExport/FileSystem/NFS.pm
index 9ab1ddfe..f14bc497 100644
--- a/installer/OpenSLX/OSExport/FileSystem/NFS.pm
+++ b/installer/OpenSLX/OSExport/FileSystem/NFS.pm
@@ -9,7 +9,7 @@
 # General information about OpenSLX can be found at http://openslx.org/
 # -----------------------------------------------------------------------------
 # NFS.pm
-#	- provides NFS-specific overrides of the OpenSLX::OSExport::FileSystem API.
+#    - provides NFS-specific overrides of the OpenSLX::OSExport::FileSystem API.
 # -----------------------------------------------------------------------------
 package OpenSLX::OSExport::FileSystem::NFS;
 
@@ -28,107 +28,107 @@ use OpenSLX::Utils;
 ################################################################################
 sub new
 {
-	my $class = shift;
-	my $self = {
-		'name' => 'nfs',
-	};
-	return bless $self, $class;
+    my $class = shift;
+    my $self = {
+        'name' => 'nfs',
+    };
+    return bless $self, $class;
 }
 
 sub initialize
 {
-	my $self = shift;
-	my $engine = shift;
+    my $self = shift;
+    my $engine = shift;
 
-	$self->{'engine'} = $engine;
-	my $exportBasePath = "$openslxConfig{'public-path'}/export";
-	$self->{'export-path'} = "$exportBasePath/nfs/$engine->{'vendor-os-name'}";
-	return;
+    $self->{'engine'} = $engine;
+    my $exportBasePath = "$openslxConfig{'public-path'}/export";
+    $self->{'export-path'} = "$exportBasePath/nfs/$engine->{'vendor-os-name'}";
+    return;
 }
 
 sub exportVendorOS
 {
-	my $self = shift;
-	my $source = shift;
+    my $self = shift;
+    my $source = shift;
 
-	my $target = $self->{'export-path'};
-	$self->_copyViaRsync($source, $target);
-	return;
+    my $target = $self->{'export-path'};
+    $self->_copyViaRsync($source, $target);
+    return;
 }
 
 sub purgeExport
 {
-	my $self = shift;
-
-	my $target = $self->{'export-path'};
-	if (system("rm -r $target")) {
-		vlog(0, _tr("unable to remove export '%s'!", $target));
-		return 0;
-	}
-	return 1;
+    my $self = shift;
+
+    my $target = $self->{'export-path'};
+    if (system("rm -r $target")) {
+        vlog(0, _tr("unable to remove export '%s'!", $target));
+        return 0;
+    }
+    return 1;
 }
 
 sub checkRequirements
 {
-	my $self         = shift;
-	my $vendorOSPath = shift;
-
-	# determine most appropriate kernel version ...
-	my $kernelVer = $self->_pickKernelVersion($vendorOSPath);
-
-	# ... and check if that kernel-version provides all the required modules
-	my $nfsMod = $self->_locateKernelModule(
-		$vendorOSPath,
-		'nfs.ko',
-		[
-			"$vendorOSPath/lib/modules/$kernelVer/kernel/fs/nfs",
-			"$vendorOSPath/lib/modules/$kernelVer/kernel/fs"
-		]
-	);
-	if (!defined $nfsMod) {
-		warn _tr("unable to find nfs-module for kernel version '%s'.",
-			$kernelVer);
-		return;
-	}
-	return 1;
+    my $self         = shift;
+    my $vendorOSPath = shift;
+
+    # determine most appropriate kernel version ...
+    my $kernelVer = $self->_pickKernelVersion($vendorOSPath);
+
+    # ... and check if that kernel-version provides all the required modules
+    my $nfsMod = $self->_locateKernelModule(
+        $vendorOSPath,
+        'nfs.ko',
+        [
+            "$vendorOSPath/lib/modules/$kernelVer/kernel/fs/nfs",
+            "$vendorOSPath/lib/modules/$kernelVer/kernel/fs"
+        ]
+    );
+    if (!defined $nfsMod) {
+        warn _tr("unable to find nfs-module for kernel version '%s'.",
+            $kernelVer);
+        return;
+    }
+    return 1;
 }
 
 sub generateExportURI
 {
-	my $self = shift;
-	my $export = shift;
-	my $vendorOS = shift;
-
-	my $serverIP = $export->{server_ip} || '';
-	my $server 
-		= length($serverIP) ? $serverIP : generatePlaceholderFor('serverip');
-	my $port = $export->{port} || '';
-	$server .= ":$port" if length($port);
-
-	my $exportPath = "$openslxConfig{'public-path'}/export";
-	return "nfs://$server$exportPath/nfs/$vendorOS->{name}";
+    my $self = shift;
+    my $export = shift;
+    my $vendorOS = shift;
+
+    my $serverIP = $export->{server_ip} || '';
+    my $server 
+        = length($serverIP) ? $serverIP : generatePlaceholderFor('serverip');
+    my $port = $export->{port} || '';
+    $server .= ":$port" if length($port);
+
+    my $exportPath = "$openslxConfig{'public-path'}/export";
+    return "nfs://$server$exportPath/nfs/$vendorOS->{name}";
 }
 
 sub requiredFSMods
 {
-	my $self = shift;
+    my $self = shift;
 
-	return qw( nfs );
+    return qw( nfs );
 }
 
 sub showExportConfigInfo
 {
-	my $self = shift;
-	my $export = shift;
+    my $self = shift;
+    my $export = shift;
 
-	print (('#' x 80)."\n");
-	print _tr("Please make sure the following line is contained in /etc/exports\nin order to activate the NFS-export of this vendor-OS:\n\t%s\n",
-			  "$self->{'export-path'}\t*(ro,no_root_squash,async,no_subtree_check)");
-	print (('#' x 80)."\n");
+    print (('#' x 80)."\n");
+    print _tr("Please make sure the following line is contained in /etc/exports\nin order to activate the NFS-export of this vendor-OS:\n\t%s\n",
+              "$self->{'export-path'}\t*(ro,no_root_squash,async,no_subtree_check)");
+    print (('#' x 80)."\n");
 
 # TODO : add something a bit more clever here...
-#	my $exports = slurpFile("/etc/exports");
-	return;
+#    my $exports = slurpFile("/etc/exports");
+    return;
 }
 
 ################################################################################
@@ -136,48 +136,48 @@ sub showExportConfigInfo
 ################################################################################
 sub _copyViaRsync
 {
-	my $self = shift;
-	my $source = shift;
-	my $target = shift;
-
-	if (system("mkdir -p $target")) {
-		die _tr("unable to create directory '%s', giving up! (%s)\n",
-				$target, $!);
-	}
-	my $includeExcludeList = $self->_determineIncludeExcludeList();
-	vlog(1, _tr("using include-exclude-filter:\n%s\n", $includeExcludeList));
-	my $rsyncFH;
-	my $additionalRsyncOptions = $ENV{SLX_RSYNC_OPTIONS} || '';
-	my $rsyncCmd
-		= "rsync -av --delete-excluded --exclude-from=- $additionalRsyncOptions"
-			. " $source/ $target";
-	vlog(2, "executing: $rsyncCmd\n");
-	open($rsyncFH, '|-', $rsyncCmd)
-		or die _tr("unable to start rsync for source '%s', giving up! (%s)",
-				   $source, $!);
-	print $rsyncFH $includeExcludeList;
-	close($rsyncFH)
-		or die _tr("unable to export to target '%s', giving up! (%s)",
-				   $target, $!);
-	return;
+    my $self = shift;
+    my $source = shift;
+    my $target = shift;
+
+    if (system("mkdir -p $target")) {
+        die _tr("unable to create directory '%s', giving up! (%s)\n",
+                $target, $!);
+    }
+    my $includeExcludeList = $self->_determineIncludeExcludeList();
+    vlog(1, _tr("using include-exclude-filter:\n%s\n", $includeExcludeList));
+    my $rsyncFH;
+    my $additionalRsyncOptions = $ENV{SLX_RSYNC_OPTIONS} || '';
+    my $rsyncCmd
+        = "rsync -av --delete-excluded --exclude-from=- $additionalRsyncOptions"
+            . " $source/ $target";
+    vlog(2, "executing: $rsyncCmd\n");
+    open($rsyncFH, '|-', $rsyncCmd)
+        or die _tr("unable to start rsync for source '%s', giving up! (%s)",
+                   $source, $!);
+    print $rsyncFH $includeExcludeList;
+    close($rsyncFH)
+        or die _tr("unable to export to target '%s', giving up! (%s)",
+                   $target, $!);
+    return;
 }
 
 sub _determineIncludeExcludeList
 {
-	my $self = shift;
-
-	# Rsync uses a first match strategy, so we mix the local specifications
-	# in front of the filterset given by the package (as the local filters
-	# should always overrule the vendor filters):
-	my $distroName = $self->{engine}->{'distro-name'};
-	my $localFilterFile 
-		= "$openslxConfig{'config-path'}/distro-info/$distroName/export-filter";
-	my $includeExcludeList 
-		= slurpFile($localFilterFile, { failIfMissing => 0 });
-	$includeExcludeList .= $self->{engine}->{distro}->{'export-filter'};
-	$includeExcludeList =~ s[^\s+][]igms;
-		# remove any leading whitespace, as rsync doesn't like it
-	return $includeExcludeList;
+    my $self = shift;
+
+    # Rsync uses a first match strategy, so we mix the local specifications
+    # in front of the filterset given by the package (as the local filters
+    # should always overrule the vendor filters):
+    my $distroName = $self->{engine}->{'distro-name'};
+    my $localFilterFile 
+        = "$openslxConfig{'config-path'}/distro-info/$distroName/export-filter";
+    my $includeExcludeList 
+        = slurpFile($localFilterFile, { failIfMissing => 0 });
+    $includeExcludeList .= $self->{engine}->{distro}->{'export-filter'};
+    $includeExcludeList =~ s[^\s+][]igms;
+        # remove any leading whitespace, as rsync doesn't like it
+    return $includeExcludeList;
 }
 
 1;
diff --git a/installer/OpenSLX/OSExport/FileSystem/SquashFS.pm b/installer/OpenSLX/OSExport/FileSystem/SquashFS.pm
index 87407ca3..d9760642 100644
--- a/installer/OpenSLX/OSExport/FileSystem/SquashFS.pm
+++ b/installer/OpenSLX/OSExport/FileSystem/SquashFS.pm
@@ -9,8 +9,8 @@
 # General information about OpenSLX can be found at http://openslx.org/
 # -----------------------------------------------------------------------------
 # SquashFS.pm
-#	- provides SquashFS-specific overrides of the OpenSLX::OSExport::ExportType
-#	  API.
+#    - provides SquashFS-specific overrides of the OpenSLX::OSExport::ExportType
+#      API.
 # -----------------------------------------------------------------------------
 package OpenSLX::OSExport::FileSystem::SquashFS;
 
@@ -30,153 +30,153 @@ use OpenSLX::Utils;
 ################################################################################
 sub new
 {
-	my $class = shift;
-	my $self = {'name' => 'sqfs',};
-	return bless $self, $class;
+    my $class = shift;
+    my $self = {'name' => 'sqfs',};
+    return bless $self, $class;
 }
 
 sub initialize
 {
-	my $self        = shift;
-	my $engine      = shift;
-	my $blockDevice = shift || confess('need to pass in block-device!');
-
-	$self->{'engine'}       = $engine;
-	$self->{'block-device'} = $blockDevice;
-	my $exportBasePath = "$openslxConfig{'public-path'}/export";
-	$self->{'export-path'} = "$exportBasePath/sqfs/$engine->{'vendor-os-name'}";
-	return;
+    my $self        = shift;
+    my $engine      = shift;
+    my $blockDevice = shift || confess('need to pass in block-device!');
+
+    $self->{'engine'}       = $engine;
+    $self->{'block-device'} = $blockDevice;
+    my $exportBasePath = "$openslxConfig{'public-path'}/export";
+    $self->{'export-path'} = "$exportBasePath/sqfs/$engine->{'vendor-os-name'}";
+    return;
 }
 
 sub exportVendorOS
 {
-	my $self   = shift;
-	my $source = shift;
-
-	my $includeExcludeList = $self->_determineIncludeExcludeList();
-	# in order to do the filtering as part of mksquashfs, we need to map
-	# our internal (rsync-)filter format to regexes:
-	$includeExcludeList =
-	  $self->_mapRsyncFilter2Regex($source, $includeExcludeList);
-	vlog(1, _tr("using include-exclude-filter:\n%s\n", $includeExcludeList));
-	my $target = $self->{'export-path'};
-
-	my $sourceTime = (stat($source))[9] || 0;
-	my $targetTime = (stat($target))[9] || 0;
-	vlog(2, "source-time=$sourceTime target-time=$targetTime");
-
-	if ($targetTime && $sourceTime < $targetTime) {
-		vlog(
-			0,
-			"!!! creation of squashfs skipped, as vendor-OS hasn't changed since last export!\n" 
-			  . "!!! Use 'touch $source' to force an export."
-		);
-	} else {
-		$self->_createSquashFS($source, $target, $includeExcludeList);
-	}
-	$self->_addBlockDeviceTagToExport($target);
-	return;
+    my $self   = shift;
+    my $source = shift;
+
+    my $includeExcludeList = $self->_determineIncludeExcludeList();
+    # in order to do the filtering as part of mksquashfs, we need to map
+    # our internal (rsync-)filter format to regexes:
+    $includeExcludeList =
+      $self->_mapRsyncFilter2Regex($source, $includeExcludeList);
+    vlog(1, _tr("using include-exclude-filter:\n%s\n", $includeExcludeList));
+    my $target = $self->{'export-path'};
+
+    my $sourceTime = (stat($source))[9] || 0;
+    my $targetTime = (stat($target))[9] || 0;
+    vlog(2, "source-time=$sourceTime target-time=$targetTime");
+
+    if ($targetTime && $sourceTime < $targetTime) {
+        vlog(
+            0,
+            "!!! creation of squashfs skipped, as vendor-OS hasn't changed since last export!\n" 
+              . "!!! Use 'touch $source' to force an export."
+        );
+    } else {
+        $self->_createSquashFS($source, $target, $includeExcludeList);
+    }
+    $self->_addBlockDeviceTagToExport($target);
+    return;
 }
 
 sub purgeExport
 {
-	my $self = shift;
-
-	my $target = $self->{'export-path'};
-	if ($self->_removeBlockDeviceTagFromExport($target)) {
-		# no more tags, we can remove the image:
-		if (slxsystem("rm $target")) {
-			vlog(0, _tr("unable to remove export '%s'!", $target));
-			return 0;
-		}
-	}
-	return 1;
+    my $self = shift;
+
+    my $target = $self->{'export-path'};
+    if ($self->_removeBlockDeviceTagFromExport($target)) {
+        # no more tags, we can remove the image:
+        if (slxsystem("rm $target")) {
+            vlog(0, _tr("unable to remove export '%s'!", $target));
+            return 0;
+        }
+    }
+    return 1;
 }
 
 sub checkRequirements
 {
-	my $self         = shift;
-	my $vendorOSPath = shift;
-
-	# determine most appropriate kernel version ...
-	my $kernelVer = $self->_pickKernelVersion($vendorOSPath);
-
-	# ... and check if that kernel-version provides all the required modules
-	my @blockModNames = $self->{'block-device'}->requiredBlockDeviceModules();
-	foreach my $blockModName (@blockModNames) {
-		my $blockMod =
-		  $self->_locateKernelModule($vendorOSPath, "$blockModName.ko",
-			["$vendorOSPath/lib/modules/$kernelVer/kernel/drivers/block"]);
-		if (!defined $blockMod) {
-			warn _tr(
-				"unable to find blockdevice-module '%s' for kernel version '%s'.",
-				$blockModName, $kernelVer
-			);
-			return;
-		}
-	}
-	my $squashfsMod = $self->_locateKernelModule(
-		$vendorOSPath,
-		'squashfs.ko',
-		[
-			"$vendorOSPath/lib/modules/$kernelVer/kernel/fs/squashfs",
-			"$vendorOSPath/lib/modules/$kernelVer/kernel/fs"
-		]
-	);
-	if (!defined $squashfsMod) {
-		warn _tr("unable to find squashfs-module for kernel version '%s'.",
-			$kernelVer);
-		return;
-	}
-	return 1;
+    my $self         = shift;
+    my $vendorOSPath = shift;
+
+    # determine most appropriate kernel version ...
+    my $kernelVer = $self->_pickKernelVersion($vendorOSPath);
+
+    # ... and check if that kernel-version provides all the required modules
+    my @blockModNames = $self->{'block-device'}->requiredBlockDeviceModules();
+    foreach my $blockModName (@blockModNames) {
+        my $blockMod =
+          $self->_locateKernelModule($vendorOSPath, "$blockModName.ko",
+            ["$vendorOSPath/lib/modules/$kernelVer/kernel/drivers/block"]);
+        if (!defined $blockMod) {
+            warn _tr(
+                "unable to find blockdevice-module '%s' for kernel version '%s'.",
+                $blockModName, $kernelVer
+            );
+            return;
+        }
+    }
+    my $squashfsMod = $self->_locateKernelModule(
+        $vendorOSPath,
+        'squashfs.ko',
+        [
+            "$vendorOSPath/lib/modules/$kernelVer/kernel/fs/squashfs",
+            "$vendorOSPath/lib/modules/$kernelVer/kernel/fs"
+        ]
+    );
+    if (!defined $squashfsMod) {
+        warn _tr("unable to find squashfs-module for kernel version '%s'.",
+            $kernelVer);
+        return;
+    }
+    return 1;
 }
 
 sub addExportToConfigDB
 {
-	my $self      = shift;
-	my $export    = shift;
-	my $openslxDB = shift;
+    my $self      = shift;
+    my $export    = shift;
+    my $openslxDB = shift;
 
-	$export->{port} = $self->{'block-device'}->getExportPort($openslxDB);
+    $export->{port} = $self->{'block-device'}->getExportPort($openslxDB);
 
-	my $res = $openslxDB->addExport($export);
-	return $res;
+    my $res = $openslxDB->addExport($export);
+    return $res;
 }
 
 sub generateExportURI
 {
-	my $self     = shift;
-	my $export   = shift;
-	my $vendorOS = shift;
+    my $self     = shift;
+    my $export   = shift;
+    my $vendorOS = shift;
 
-	my $URI = $self->{'block-device'}->generateExportURI($export);
-	$URI .= '/squashfs';
-	return $URI;
+    my $URI = $self->{'block-device'}->generateExportURI($export);
+    $URI .= '/squashfs';
+    return $URI;
 }
 
 sub requiredFSMods
 {
-	my $self = shift;
+    my $self = shift;
 
-	my @mods = $self->{'block-device'}->requiredBlockDeviceModules();
-	push @mods, 'squashfs ';
-	return @mods;
+    my @mods = $self->{'block-device'}->requiredBlockDeviceModules();
+    push @mods, 'squashfs ';
+    return @mods;
 }
 
 sub requiredFSTools
 {
-	my $self = shift;
+    my $self = shift;
 
-	return $self->{'block-device'}->requiredBlockDeviceTools();
+    return $self->{'block-device'}->requiredBlockDeviceTools();
 }
 
 sub showExportConfigInfo
 {
-	my $self   = shift;
-	my $export = shift;
+    my $self   = shift;
+    my $export = shift;
 
-	$self->{'block-device'}->showExportConfigInfo($export);
-	return;
+    $self->{'block-device'}->showExportConfigInfo($export);
+    return;
 }
 
 ################################################################################
@@ -185,122 +185,122 @@ sub showExportConfigInfo
 
 sub _createSquashFS
 {
-	my $self               = shift;
-	my $source             = shift;
-	my $target             = shift;
-	my $includeExcludeList = shift;
-
-	system("rm -f $target");
-	# mksquasfs isn't significantly faster if fs already exists, but it
-	# causes the filesystem to grow somewhat, so we remove it in order to
-	# get the smallest FS-file possible.
-
-	my $baseDir = dirname($target);
-	if (!-e $baseDir) {
-		if (system("mkdir -p $baseDir")) {
-			die _tr("unable to create directory '%s', giving up! (%s)\n",
-				$baseDir, $!);
-		}
-	}
-
-	# dump filter to a file ...
-	my $filterFile = "/tmp/slx-nbdsquash-filter-$$";
-	spitFile($filterFile, $includeExcludeList);
-
-	# ... invoke mksquashfs ...
-	vlog(0, _tr("invoking mksquashfs..."));
-	my $mksquashfsBinary =
-	  "$openslxConfig{'base-path'}/share/squashfs/mksquashfs";
-	my $res = system("$mksquashfsBinary $source $target -ff $filterFile");
-	unlink($filterFile);
-	# ... remove filter file if done
-	if ($res) {
-		die _tr(
-			"unable to create squashfs for source '%s' as target '%s', giving up! (%s)",
-			$source, $target, $!);
-	}
+    my $self               = shift;
+    my $source             = shift;
+    my $target             = shift;
+    my $includeExcludeList = shift;
+
+    system("rm -f $target");
+    # mksquasfs isn't significantly faster if fs already exists, but it
+    # causes the filesystem to grow somewhat, so we remove it in order to
+    # get the smallest FS-file possible.
+
+    my $baseDir = dirname($target);
+    if (!-e $baseDir) {
+        if (system("mkdir -p $baseDir")) {
+            die _tr("unable to create directory '%s', giving up! (%s)\n",
+                $baseDir, $!);
+        }
+    }
+
+    # dump filter to a file ...
+    my $filterFile = "/tmp/slx-nbdsquash-filter-$$";
+    spitFile($filterFile, $includeExcludeList);
+
+    # ... invoke mksquashfs ...
+    vlog(0, _tr("invoking mksquashfs..."));
+    my $mksquashfsBinary =
+      "$openslxConfig{'base-path'}/share/squashfs/mksquashfs";
+    my $res = system("$mksquashfsBinary $source $target -ff $filterFile");
+    unlink($filterFile);
+    # ... remove filter file if done
+    if ($res) {
+        die _tr(
+            "unable to create squashfs for source '%s' as target '%s', giving up! (%s)",
+            $source, $target, $!);
+    }
 }
 
 sub _determineIncludeExcludeList
 {
-	my $self = shift;
-
-	# Rsync uses a first match strategy, so we mix the local specifications
-	# in front of the filterset given by the package (as the local filters
-	# should always overrule the vendor filters):
-	my $distroName      = $self->{engine}->{'distro-name'};
-	my $localFilterFile =
-	  "$openslxConfig{'config-path'}/distro-info/$distroName/export-filter";
-	my $includeExcludeList 
-		= slurpFile($localFilterFile, { failIfMissing => 0 });
-	$includeExcludeList .= $self->{engine}->{distro}->{'export-filter'};
-	$includeExcludeList =~ s[^\s+][]igms;
-	# remove any leading whitespace, as rsync doesn't like it
-	return $includeExcludeList;
+    my $self = shift;
+
+    # Rsync uses a first match strategy, so we mix the local specifications
+    # in front of the filterset given by the package (as the local filters
+    # should always overrule the vendor filters):
+    my $distroName      = $self->{engine}->{'distro-name'};
+    my $localFilterFile =
+      "$openslxConfig{'config-path'}/distro-info/$distroName/export-filter";
+    my $includeExcludeList 
+        = slurpFile($localFilterFile, { failIfMissing => 0 });
+    $includeExcludeList .= $self->{engine}->{distro}->{'export-filter'};
+    $includeExcludeList =~ s[^\s+][]igms;
+    # remove any leading whitespace, as rsync doesn't like it
+    return $includeExcludeList;
 }
 
 sub _mapRsyncFilter2Regex
 {
-	my $self        = shift;
-	my $sourcePath  = shift;
-	my $rsyncFilter = shift;
-
-	return join(
-		"\n",
-		map {
-			if ($_ =~ m[^([-+]\s*)(.+?)\s*$])
-			{
-				my $action = $1;
-				my $regex  = $2;
-				$regex =~ s[\*\*][.+]g;
-				# '**' matches everything
-				$regex =~ s[\*][[^/]+]g;
-				# '*' matches anything except slashes
-				$regex =~ s[\?][[^/]?]g;
-				# '*' matches any single char except slash
-				$regex =~ s[\?][[^/]?]g;
-				# '*' matches any single char except slash
-				$regex =~ s[\.][\\.]g;
-				# escape any dots
-				if (substr($regex, 0, 1) eq '/') {
-					# absolute path given, need to extend by source-path:
-					"$action^$sourcePath$regex\$";
-				} else {
-					# filename pattern given, need to anchor to the end only:
-					"$action$regex\$";
-				}
-			} else {
-				$_;
-			}
-		  }
-		  split "\n",
-		$rsyncFilter
-	);
+    my $self        = shift;
+    my $sourcePath  = shift;
+    my $rsyncFilter = shift;
+
+    return join(
+        "\n",
+        map {
+            if ($_ =~ m[^([-+]\s*)(.+?)\s*$])
+            {
+                my $action = $1;
+                my $regex  = $2;
+                $regex =~ s[\*\*][.+]g;
+                # '**' matches everything
+                $regex =~ s[\*][[^/]+]g;
+                # '*' matches anything except slashes
+                $regex =~ s[\?][[^/]?]g;
+                # '*' matches any single char except slash
+                $regex =~ s[\?][[^/]?]g;
+                # '*' matches any single char except slash
+                $regex =~ s[\.][\\.]g;
+                # escape any dots
+                if (substr($regex, 0, 1) eq '/') {
+                    # absolute path given, need to extend by source-path:
+                    "$action^$sourcePath$regex\$";
+                } else {
+                    # filename pattern given, need to anchor to the end only:
+                    "$action$regex\$";
+                }
+            } else {
+                $_;
+            }
+          }
+          split "\n",
+        $rsyncFilter
+    );
 }
 
 sub _addBlockDeviceTagToExport
 {
-	my $self   = shift;
-	my $target = shift;
+    my $self   = shift;
+    my $target = shift;
 
-	my $tagName = "$target" . '@' . lc($self->{'block-device'}->{name});
-	linkFile(basename($target), $tagName);
-	return;
+    my $tagName = "$target" . '@' . lc($self->{'block-device'}->{name});
+    linkFile(basename($target), $tagName);
+    return;
 }
 
 sub _removeBlockDeviceTagFromExport
 {
-	my $self   = shift;
-	my $target = shift;
-
-	my $tagName = "$target" . '@' . lc($self->{'block-device'}->{name});
-	slxsystem("rm $tagName");
-	# now find out whether or not there are any other tags left:
-	my $vendorOSName = basename($target);
-	opendir(DIR, dirname($target));
-	my @tags = grep { /^$vendorOSName\@/ } readdir(DIR);
-	return @tags ? 0 : 1;
-	# return 1 if no more tags (i.e. it is safe to remove the image)
+    my $self   = shift;
+    my $target = shift;
+
+    my $tagName = "$target" . '@' . lc($self->{'block-device'}->{name});
+    slxsystem("rm $tagName");
+    # now find out whether or not there are any other tags left:
+    my $vendorOSName = basename($target);
+    opendir(DIR, dirname($target));
+    my @tags = grep { /^$vendorOSName\@/ } readdir(DIR);
+    return @tags ? 0 : 1;
+    # return 1 if no more tags (i.e. it is safe to remove the image)
 }
 
 1;