summaryrefslogtreecommitdiffstats
path: root/installer
diff options
context:
space:
mode:
authorDirk von Suchodoletz2010-08-22 22:15:35 +0200
committerDirk von Suchodoletz2010-08-22 22:15:35 +0200
commitd312795878786cbd57f2840a5afc5df707da3183 (patch)
treea7c049529fc5271bb4d563b54355cc352d304ca2 /installer
parentMerge branch 'master' of openslx.org:openslx/core (diff)
parentadd testing themes (diff)
downloadcore-d312795878786cbd57f2840a5afc5df707da3183.tar.gz
core-d312795878786cbd57f2840a5afc5df707da3183.tar.xz
core-d312795878786cbd57f2840a5afc5df707da3183.zip
Merge branch 'master' of openslx.org:openslx/core
Diffstat (limited to 'installer')
-rw-r--r--installer/OpenSLX/OSSetup/Distro/Base.pm2
-rw-r--r--installer/OpenSLX/OSSetup/Engine.pm13
2 files changed, 8 insertions, 7 deletions
diff --git a/installer/OpenSLX/OSSetup/Distro/Base.pm b/installer/OpenSLX/OSSetup/Distro/Base.pm
index ea6890d9..f23bba0c 100644
--- a/installer/OpenSLX/OSSetup/Distro/Base.pm
+++ b/installer/OpenSLX/OSSetup/Distro/Base.pm
@@ -69,6 +69,8 @@ sub initialize
$self->{'clone-filter'} = "
+ /var
+ - /var/tmp/*
+ - /var/spool/*
- /var/cache/apt/archives/*.deb
- /var/cache/apt/archives/lock
- /var/cache/apt/archives/partial/*
diff --git a/installer/OpenSLX/OSSetup/Engine.pm b/installer/OpenSLX/OSSetup/Engine.pm
index 65a68bd4..6faf12c7 100644
--- a/installer/OpenSLX/OSSetup/Engine.pm
+++ b/installer/OpenSLX/OSSetup/Engine.pm
@@ -1113,13 +1113,12 @@ sub _generateDefaultDirs
my $OPENSLX_DEFAULT_BINDIR = "$OPENSLX_DEFAULT_VARDIR/bin";
my $OPENSLX_DEFAULT_LIBDIR = "$OPENSLX_DEFAULT_VARDIR/lib";
my $OPENSLX_DEFAULT_VIRTDIR = "/var/lib/virt";
- mkpath("$targetRoot/$OPENSLX_DEFAULT_DIR",
- "$targetRoot/$OPENSLX_DEFAULT_CONFDIR",
- "$targetRoot/$OPENSLX_DEFAULT_LOGDIR",
- "$targetRoot/$OPENSLX_DEFAULT_BINDIR",
- "$targetRoot/$OPENSLX_DEFAULT_LIBDIR",
- "$targetRoot/$OPENSLX_DEFAULT_VIRTDIR");
- slxsystem("chmod 1777 $targetRoot/$OPENSLX_DEFAULT_LOGDIR");
+ mkpath("$targetRoot/$OPENSLX_DEFAULT_DIR", 0, 0755);
+ mkpath("$targetRoot/$OPENSLX_DEFAULT_CONFDIR", 0, 0755);
+ mkpath("$targetRoot/$OPENSLX_DEFAULT_LOGDIR", 0, 0755);
+ mkpath("$targetRoot/$OPENSLX_DEFAULT_BINDIR", 0, 0755);
+ mkpath("$targetRoot/$OPENSLX_DEFAULT_LIBDIR", 0, 0755);
+ mkpath("$targetRoot/$OPENSLX_DEFAULT_VIRTDIR", 0, 0755);
my $openslxConfig = "# Default OpenSLX directories defined by satge 1\n";
$openslxConfig .= "# Version 0.2\n\n";