summaryrefslogtreecommitdiffstats
path: root/src/installer
diff options
context:
space:
mode:
authorDirk von Suchodoletz2011-06-02 19:59:33 +0200
committerDirk von Suchodoletz2011-06-02 19:59:33 +0200
commitf82922be2125c6fe4871a9fda0fb3a2920d4344a (patch)
treeb3fc9d8860014a2257ccd85651e90add8f79d40e /src/installer
parentadd linuxmint desktop distro pm (diff)
downloadcore-f82922be2125c6fe4871a9fda0fb3a2920d4344a.tar.gz
core-f82922be2125c6fe4871a9fda0fb3a2920d4344a.tar.xz
core-f82922be2125c6fe4871a9fda0fb3a2920d4344a.zip
Fixing rsync issue and numberic id's (otherwise rsync maps by names which causes problems if the ids are different for server and slx clients)
Diffstat (limited to 'src/installer')
-rw-r--r--src/installer/OpenSLX/OSExport/FileSystem/NFS.pm4
-rw-r--r--src/installer/OpenSLX/OSSetup/Engine.pm4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/installer/OpenSLX/OSExport/FileSystem/NFS.pm b/src/installer/OpenSLX/OSExport/FileSystem/NFS.pm
index 9bd2ca87..96e40d24 100644
--- a/src/installer/OpenSLX/OSExport/FileSystem/NFS.pm
+++ b/src/installer/OpenSLX/OSExport/FileSystem/NFS.pm
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2007 - OpenSLX GmbH
+# Copyright (c) 2006..2011 - OpenSLX GmbH
#
# This program is free software distributed under the GPL version 2.
# See http://openslx.org/COPYING
@@ -168,7 +168,7 @@ sub _copyViaRsync
my $rsyncFH;
my $additionalRsyncOptions = $ENV{SLX_RSYNC_OPTIONS} || '';
my $rsyncCmd
- = "rsync -av --delete-excluded --exclude-from=- $additionalRsyncOptions"
+ = "rsync -av --numeric-ids --delete-excluded --exclude-from=- $additionalRsyncOptions"
. " $source/ $target";
vlog(2, "executing: $rsyncCmd\n");
open($rsyncFH, '|-', $rsyncCmd)
diff --git a/src/installer/OpenSLX/OSSetup/Engine.pm b/src/installer/OpenSLX/OSSetup/Engine.pm
index a32898e9..a3e4c1be 100644
--- a/src/installer/OpenSLX/OSSetup/Engine.pm
+++ b/src/installer/OpenSLX/OSSetup/Engine.pm
@@ -1164,7 +1164,7 @@ sub _copyRootfs
vlog(3, _tr("using exclude-filter:\n%s\n", $exclOpts));
my $rsyncFH;
my $rsyncCmd
- = "rsync -aq --delete-excluded --exclude-from=- $rootfs/ $target";
+ = "rsync -aq --numeric-ids --delete-excluded --exclude-from=- $rootfs/ $target";
vlog(2, "executing: $rsyncCmd\n");
# if we're doing a fresh install we need to create /lib, /bin first
mkdir "$targetRoot/lib";
@@ -1796,7 +1796,7 @@ sub _clone_fetchSource
vlog(1, "using exclude-include-filter:\n$excludeIncludeList\n");
my $additionalRsyncOptions = $ENV{SLX_RSYNC_OPTIONS} || '';
my $rsyncCmd
- = "rsync -av --delete --exclude-from=- $additionalRsyncOptions"
+ = "rsync -av --numeric-ids --delete --exclude-from=- $additionalRsyncOptions"
. " $source $self->{'vendor-os-path'}";
vlog(2, "executing: $rsyncCmd\n");
my $rsyncFH;