From a0ce0340d0f95514008cfac751fe58748bbadd88 Mon Sep 17 00:00:00 2001
From: Oliver Tappe
Date: Thu, 20 Mar 2008 00:04:16 +0000
Subject: * 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
---
 installer/OpenSLX/OSSetup/Distro/Base.pm | 428 +++++++++++++++----------------
 1 file changed, 214 insertions(+), 214 deletions(-)

(limited to 'installer/OpenSLX/OSSetup/Distro/Base.pm')

diff --git a/installer/OpenSLX/OSSetup/Distro/Base.pm b/installer/OpenSLX/OSSetup/Distro/Base.pm
index 64d8d43b..d2931046 100644
--- a/installer/OpenSLX/OSSetup/Distro/Base.pm
+++ b/installer/OpenSLX/OSSetup/Distro/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 OSSetup API.
+#    - provides empty base of the OpenSLX OSSetup API.
 # -----------------------------------------------------------------------------
 package OpenSLX::OSSetup::Distro::Base;
 
 use strict;
 use warnings;
 
-our $VERSION = 1.01;		# API-version . implementation-version
+our $VERSION = 1.01;        # API-version . implementation-version
 
 use Fcntl qw(:DEFAULT :flock);
 use File::Basename;
@@ -28,88 +28,88 @@ use OpenSLX::Utils;
 ################################################################################
 sub new
 {
-	confess "Creating OpenSLX::OSSetup::System::Base-objects directly makes no sense!";
+    confess "Creating OpenSLX::OSSetup::System::Base-objects directly makes no sense!";
 }
 
 sub initialize
 {
-	my $self = shift;
-	my $engine = shift;
-
-	$self->{'engine'} = $engine;
-
-	if ($engine->{'distro-name'} =~ m[x86_64]) {
-		# be careful to only try installing 64-bit systems if actually
-		# running on a 64-bit host, as otherwise we are going to fail later,
-		# anyway:
-		my $arch = `uname -m`;
-		if ($?) {
-			die _tr("unable to determine architecture of host system (%s)\n", $!);
-		}
-		if ($arch !~ m[x86_64]) {
-			die _tr("you can't install a 64-bit system on a 32-bit host, sorry!\n");
-		}
-	}
-
-	$self->{'stage1a-binaries'} = {
-		"$openslxConfig{'base-path'}/share/busybox/busybox" => 'bin',
-	};
-
-	$self->{'stage1b-faked-files'} = [
-		'/etc/mtab',
-	];
-
-	$self->{'stage1c-faked-files'} = [
-	];
-
-	$self->{'clone-filter'} = "
-		- /var/tmp/*
-		- /var/opt/openslx
-		- /var/lib/vmware
-		+ /var
-		- /usr/lib/vmware/modules/*
-		+ /usr
-		- /tmp/*
-		+ /tmp
-		- /sys/*
-		+ /sys
-		+ /sbin
-		- /root/*
-		+ /root
-		- /proc/*
-		+ /proc
-		- /opt/openslx
-		+ /opt
-		- /media/*
-		+ /media
-		- /mnt/*
-		+ /mnt
-		+ /lib64
-		+ /lib
-		- /home/*
-		+ /home
-		- /etc/vmware/installer.sh
-		- /etc/shadow*
-		- /etc/samba/secrets.tdb
-		- /etc/resolv.conf.*
-		- /etc/opt/openslx
-		- /etc/exports*
-		- /etc/dxs
-		+ /etc
-		- /dev/*
-		+ /dev
-		+ /boot
-		+ /bin
-		- /*
-		- .svn
-		- .*.cmd
-		- *~
-		- *lost+found*
-		- *.old
-		- *.bak
-	";
-
-	return;
+    my $self = shift;
+    my $engine = shift;
+
+    $self->{'engine'} = $engine;
+
+    if ($engine->{'distro-name'} =~ m[x86_64]) {
+        # be careful to only try installing 64-bit systems if actually
+        # running on a 64-bit host, as otherwise we are going to fail later,
+        # anyway:
+        my $arch = `uname -m`;
+        if ($?) {
+            die _tr("unable to determine architecture of host system (%s)\n", $!);
+        }
+        if ($arch !~ m[x86_64]) {
+            die _tr("you can't install a 64-bit system on a 32-bit host, sorry!\n");
+        }
+    }
+
+    $self->{'stage1a-binaries'} = {
+        "$openslxConfig{'base-path'}/share/busybox/busybox" => 'bin',
+    };
+
+    $self->{'stage1b-faked-files'} = [
+        '/etc/mtab',
+    ];
+
+    $self->{'stage1c-faked-files'} = [
+    ];
+
+    $self->{'clone-filter'} = "
+        - /var/tmp/*
+        - /var/opt/openslx
+        - /var/lib/vmware
+        + /var
+        - /usr/lib/vmware/modules/*
+        + /usr
+        - /tmp/*
+        + /tmp
+        - /sys/*
+        + /sys
+        + /sbin
+        - /root/*
+        + /root
+        - /proc/*
+        + /proc
+        - /opt/openslx
+        + /opt
+        - /media/*
+        + /media
+        - /mnt/*
+        + /mnt
+        + /lib64
+        + /lib
+        - /home/*
+        + /home
+        - /etc/vmware/installer.sh
+        - /etc/shadow*
+        - /etc/samba/secrets.tdb
+        - /etc/resolv.conf.*
+        - /etc/opt/openslx
+        - /etc/exports*
+        - /etc/dxs
+        + /etc
+        - /dev/*
+        + /dev
+        + /boot
+        + /bin
+        - /*
+        - .svn
+        - .*.cmd
+        - *~
+        - *lost+found*
+        - *.old
+        - *.bak
+    ";
+
+    return;
 }
 
 sub fixPrerequiredFiles
@@ -118,118 +118,118 @@ sub fixPrerequiredFiles
 
 sub startSession
 {
-	my $self  = shift;
-	my $osDir = shift;
-	
-	# ensure that the session will be finished even if the script crashes:
-	addCleanupFunction(
-		"slxos-setup::distro::chroot", sub { $self->finishSession(); }
-	);
-
-	# make sure there's a /dev/zero, /dev/null and /dev/urandom
+    my $self  = shift;
+    my $osDir = shift;
+    
+    # ensure that the session will be finished even if the script crashes:
+    addCleanupFunction(
+        "slxos-setup::distro::chroot", sub { $self->finishSession(); }
+    );
+
+    # make sure there's a /dev/zero, /dev/null and /dev/urandom
     # /dev/urandom for passwd chroot
-	if (!-e "$osDir/dev" && !mkdir("$osDir/dev")) {
-		die _tr("unable to create folder '%s' (%s)\n", "$osDir/dev", $!);
-	}
-	if (!-e "$osDir/dev/zero" && slxsystem("mknod $osDir/dev/zero c 1 5")) {
-		die _tr("unable to create node '%s' (%s)\n", "$osDir/dev/zero", $!);
-	}
-	if (!-e "$osDir/dev/null" && slxsystem("mknod $osDir/dev/null c 1 3")) {
-		die _tr("unable to create node '%s' (%s)\n", "$osDir/dev/null", $!);
-	}
-	if (!-e "$osDir/dev/urandom" && slxsystem("mknod $osDir/dev/urandom c 1 9")) {
-		die _tr("unable to create node '%s' (%s)\n", "$osDir/dev/urandom", $!);
+    if (!-e "$osDir/dev" && !mkdir("$osDir/dev")) {
+        die _tr("unable to create folder '%s' (%s)\n", "$osDir/dev", $!);
+    }
+    if (!-e "$osDir/dev/zero" && slxsystem("mknod $osDir/dev/zero c 1 5")) {
+        die _tr("unable to create node '%s' (%s)\n", "$osDir/dev/zero", $!);
+    }
+    if (!-e "$osDir/dev/null" && slxsystem("mknod $osDir/dev/null c 1 3")) {
+        die _tr("unable to create node '%s' (%s)\n", "$osDir/dev/null", $!);
+    }
+    if (!-e "$osDir/dev/urandom" && slxsystem("mknod $osDir/dev/urandom c 1 9")) {
+        die _tr("unable to create node '%s' (%s)\n", "$osDir/dev/urandom", $!);
     }
 
 
-	# fake proc, depending on what is needed ...
-	if (!-e "$osDir/proc" && !mkdir("$osDir/proc")) {
-		die _tr("unable to create folder '%s' (%s)\n", "$osDir/proc", $!);
-	}
-	if (!-e "$osDir/proc/cpuinfo" && slxsystem("cp /proc/cpuinfo $osDir/proc/")) {
-		die _tr("unable to copy file '%s' (%s)\n", "/proc/cpuinfo", $!);
-	}
-	# TODO: alternatively, we could mount proc, but that causes problems
-	#       when we are not able to umount it properly (which may happen
-	#       if 'umount' is not available in the chroot!)
-	#
-	# mount /proc
-#	if (!-e "$osDir/proc") {
-#		slxsystem("mkdir -p $osDir/proc");
-#	}
-#	if (slxsystem("mount -t proc proc $osDir/proc 2>/dev/null")) {
-#		die _tr("unable to mount '%s' (%s)\n", "$osDir/proc", $!);
-#	}
-
-	# enter chroot jail
-	chrootInto($osDir);
-	$ENV{PATH} = join(':', @{$self->getDefaultPathList()});
-
-	return;
+    # fake proc, depending on what is needed ...
+    if (!-e "$osDir/proc" && !mkdir("$osDir/proc")) {
+        die _tr("unable to create folder '%s' (%s)\n", "$osDir/proc", $!);
+    }
+    if (!-e "$osDir/proc/cpuinfo" && slxsystem("cp /proc/cpuinfo $osDir/proc/")) {
+        die _tr("unable to copy file '%s' (%s)\n", "/proc/cpuinfo", $!);
+    }
+    # TODO: alternatively, we could mount proc, but that causes problems
+    #       when we are not able to umount it properly (which may happen
+    #       if 'umount' is not available in the chroot!)
+    #
+    # mount /proc
+#    if (!-e "$osDir/proc") {
+#        slxsystem("mkdir -p $osDir/proc");
+#    }
+#    if (slxsystem("mount -t proc proc $osDir/proc 2>/dev/null")) {
+#        die _tr("unable to mount '%s' (%s)\n", "$osDir/proc", $!);
+#    }
+
+    # enter chroot jail
+    chrootInto($osDir);
+    $ENV{PATH} = join(':', @{$self->getDefaultPathList()});
+
+    return;
 }
 
 sub getDefaultPathList
 {
-	my $self = shift;
-	
-	return [ qw(
-		/sbin
-		/usr/sbin
-		/usr/local/sbin
-		/usr/local/bin
-		/usr/bin
-		/bin
-		/usr/bin/X11
-		/usr/X11R6/bin
-		/opt/kde3/bin
-		/opt/gnome/bin
-	) ];
+    my $self = shift;
+    
+    return [ qw(
+        /sbin
+        /usr/sbin
+        /usr/local/sbin
+        /usr/local/bin
+        /usr/bin
+        /bin
+        /usr/bin/X11
+        /usr/X11R6/bin
+        /opt/kde3/bin
+        /opt/gnome/bin
+    ) ];
 }
 
 sub finishSession
 {
-	my $self = shift;
-	
-	removeCleanupFunction('slxos-setup::distro::chroot');
+    my $self = shift;
+    
+    removeCleanupFunction('slxos-setup::distro::chroot');
 
-	# unmount /proc
-#	if (slxsystem('ash', '-c', 'umount /proc 2>/dev/null')) {
-#		die _tr("unable to unmount '%s' (%s)\n", "/proc", $!);
-#	}
+    # unmount /proc
+#    if (slxsystem('ash', '-c', 'umount /proc 2>/dev/null')) {
+#        die _tr("unable to unmount '%s' (%s)\n", "/proc", $!);
+#    }
 
-	return;
+    return;
 }
 
 sub updateDistroConfig
 {
-	if (slxsystem("ldconfig")) {
-		die _tr("unable to run ldconfig (%s)", $!);
-	}
+    if (slxsystem("ldconfig")) {
+        die _tr("unable to run ldconfig (%s)", $!);
+    }
 }
 
 sub pickKernelFile
 {
-	my $self       = shift;
-	my $kernelPath = shift;
-
-	my $newestKernelFile;
-	my $newestKernelFileSortKey = '';
-	foreach my $kernelFile (glob("$kernelPath/vmlinuz-*")) {
-		next unless $kernelFile =~ m{
-			vmlinuz-(\d+)\.(\d+)\.(\d+)(?:\.(\d+))?-(\d+(?:\.\d+)?)
-		}x;
-		my $sortKey 
-			= sprintf("%02d.%02d.%02d.%02d-%2.1f", $1, $2, $3, $4||0, $5);
-		if ($newestKernelFileSortKey lt $sortKey) {
-			$newestKernelFile        = $kernelFile;
-			$newestKernelFileSortKey = $sortKey;
-		}
-	}
-
-	if (!defined $newestKernelFile) {
-		die _tr("unable to pick a kernel-file from path '%s'!", $kernelPath);
-	}
-	return $newestKernelFile;
+    my $self       = shift;
+    my $kernelPath = shift;
+
+    my $newestKernelFile;
+    my $newestKernelFileSortKey = '';
+    foreach my $kernelFile (glob("$kernelPath/vmlinuz-*")) {
+        next unless $kernelFile =~ m{
+            vmlinuz-(\d+)\.(\d+)\.(\d+)(?:\.(\d+))?-(\d+(?:\.\d+)?)
+        }x;
+        my $sortKey 
+            = sprintf("%02d.%02d.%02d.%02d-%2.1f", $1, $2, $3, $4||0, $5);
+        if ($newestKernelFileSortKey lt $sortKey) {
+            $newestKernelFile        = $kernelFile;
+            $newestKernelFileSortKey = $sortKey;
+        }
+    }
+
+    if (!defined $newestKernelFile) {
+        die _tr("unable to pick a kernel-file from path '%s'!", $kernelPath);
+    }
+    return $newestKernelFile;
 }
 
 sub preSystemInstallationHook
@@ -242,54 +242,54 @@ sub postSystemInstallationHook
 
 sub setPasswordForUser
 {
-	my $self = shift;
-	my $username = shift;
-	my $password = shift;
-	
-	my $hashedPassword = $self->hashPassword($password);
-
-	my $writePasswordFunction = sub {
-		# now read, change and write shadow-file in atomic manner:
-		my $shadowFile = '/etc/shadow';
-		if (!-e $shadowFile) {
-			spitFile( $shadowFile, '');
-		}
-		slxsystem("cp -r $shadowFile $shadowFile~");
-		my $shadowFH;
-		open($shadowFH, '+<', $shadowFile)
-			or croak _tr("could not open file '%s'! (%s)", $shadowFile, $!);
-		flock($shadowFH, LOCK_EX)
-			or croak _tr("could not lock file '%s'! (%s)", $shadowFile, $!);
-		my $lastChanged = int(time()/24/60/60);
-		my $newEntry 
-			= "$username:$hashedPassword:$lastChanged:0:99999:7:::";
-		my $content = do { local $/; <$shadowFH> };
-		if ($content =~ m{^$username:}ims) {
-			$content =~ s{^$username:.+?$}{$newEntry}ms;
-		} else {
-			$content .= "$newEntry\n";
-		}
-		seek($shadowFH, 0, 0)
-			or croak _tr("could not seek file '%s'! (%s)", $shadowFile, $!);
-		print $shadowFH $content
-			or croak _tr("could not write to file '%s'! (%s)", $shadowFile, $!);
-		close($shadowFH)
-			or croak _tr("could not close file '%s'! (%s)", $shadowFile, $!);
-		unlink "$shadowFile~";
-	};
-	$self->{engine}->callChrootedFunctionForVendorOS($writePasswordFunction);
+    my $self = shift;
+    my $username = shift;
+    my $password = shift;
+    
+    my $hashedPassword = $self->hashPassword($password);
+
+    my $writePasswordFunction = sub {
+        # now read, change and write shadow-file in atomic manner:
+        my $shadowFile = '/etc/shadow';
+        if (!-e $shadowFile) {
+            spitFile( $shadowFile, '');
+        }
+        slxsystem("cp -r $shadowFile $shadowFile~");
+        my $shadowFH;
+        open($shadowFH, '+<', $shadowFile)
+            or croak _tr("could not open file '%s'! (%s)", $shadowFile, $!);
+        flock($shadowFH, LOCK_EX)
+            or croak _tr("could not lock file '%s'! (%s)", $shadowFile, $!);
+        my $lastChanged = int(time()/24/60/60);
+        my $newEntry 
+            = "$username:$hashedPassword:$lastChanged:0:99999:7:::";
+        my $content = do { local $/; <$shadowFH> };
+        if ($content =~ m{^$username:}ims) {
+            $content =~ s{^$username:.+?$}{$newEntry}ms;
+        } else {
+            $content .= "$newEntry\n";
+        }
+        seek($shadowFH, 0, 0)
+            or croak _tr("could not seek file '%s'! (%s)", $shadowFile, $!);
+        print $shadowFH $content
+            or croak _tr("could not write to file '%s'! (%s)", $shadowFile, $!);
+        close($shadowFH)
+            or croak _tr("could not close file '%s'! (%s)", $shadowFile, $!);
+        unlink "$shadowFile~";
+    };
+    $self->{engine}->callChrootedFunctionForVendorOS($writePasswordFunction);
 }
 
 sub hashPassword
 {
-	my $self = shift;
-	my $password = shift;
-	
-	my $busyboxBin = $self->{engine}->{'busybox-binary'};
-	my $hashedPassword = qx{$busyboxBin cryptpw -a md5 $password};
-	chomp $hashedPassword;
-
-	return $hashedPassword;
+    my $self = shift;
+    my $password = shift;
+    
+    my $busyboxBin = $self->{engine}->{'busybox-binary'};
+    my $hashedPassword = qx{$busyboxBin cryptpw -a md5 $password};
+    chomp $hashedPassword;
+
+    return $hashedPassword;
 }
 
 1;
-- 
cgit v1.2.3-55-g7522