diff options
| author | Dirk von Suchodoletz | 2011-06-02 19:59:33 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2011-06-02 19:59:33 +0200 |
| commit | f82922be2125c6fe4871a9fda0fb3a2920d4344a (patch) | |
| tree | b3fc9d8860014a2257ccd85651e90add8f79d40e /src/boot-env | |
| parent | add linuxmint desktop distro pm (diff) | |
| download | core-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/boot-env')
| -rw-r--r-- | src/boot-env/OpenSLX/BootEnvironment/Base.pm | 4 | ||||
| -rw-r--r-- | src/boot-env/OpenSLX/MakeInitRamFS/Engine/Preboot.pm | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/boot-env/OpenSLX/BootEnvironment/Base.pm b/src/boot-env/OpenSLX/BootEnvironment/Base.pm index aa4cbe5b..3ad7c602 100644 --- a/src/boot-env/OpenSLX/BootEnvironment/Base.pm +++ b/src/boot-env/OpenSLX/BootEnvironment/Base.pm @@ -1,4 +1,4 @@ -# Copyright (c) 2008 - OpenSLX GmbH +# Copyright (c) 2008..2011 - OpenSLX GmbH # # This program is free software distributed under the GPL version 2. # See http://openslx.org/COPYING @@ -57,7 +57,7 @@ sub finalize my $rsyncDeleteClause = $delete ? '--delete' : ''; my $rsyncCmd - = "rsync -a $rsyncDeleteClause --delay-updates $self->{'target-path'}/ $self->{'original-path'}/"; + = "rsync -a $rsyncDeleteClause --numeric-ids --delay-updates $self->{'target-path'}/ $self->{'original-path'}/"; slxsystem($rsyncCmd) == 0 or die _tr( "unable to rsync files from '%s' to '%s'! (%s)", diff --git a/src/boot-env/OpenSLX/MakeInitRamFS/Engine/Preboot.pm b/src/boot-env/OpenSLX/MakeInitRamFS/Engine/Preboot.pm index 1a68bfd0..319ff65e 100644 --- a/src/boot-env/OpenSLX/MakeInitRamFS/Engine/Preboot.pm +++ b/src/boot-env/OpenSLX/MakeInitRamFS/Engine/Preboot.pm @@ -1,4 +1,4 @@ -# Copyright (c) 2006-2008 - OpenSLX GmbH +# Copyright (c) 2006..2011 - OpenSLX GmbH # # This program is free software distributed under the GPL version 2. # See http://openslx.org/COPYING @@ -123,7 +123,7 @@ sub _copyRootfs my $exclOpts = join ' ', map { "--exclude $_" } @excludes; - $self->addCMD("rsync $exclOpts -rlpt $rootfs/ $self->{'build-path'}"); + $self->addCMD("rsync $exclOpts -rlpt --numeric-ids $rootfs/ $self->{'build-path'}"); return 1; } @@ -135,7 +135,7 @@ sub _copyPrebootSpecificFiles # write secondary rootfs-layer (including init) on top of base layer my $prebootRootfs = "$openslxConfig{'base-path'}/share/boot-env/preboot/rootfs"; - $self->addCMD("rsync -rlpt $prebootRootfs/ $self->{'build-path'}"); + $self->addCMD("rsync -rlpt --numeric-ids $prebootRootfs/ $self->{'build-path'}"); return 1; } |