diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2017-01-06 18:24:54 +0000 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2017-01-06 18:24:54 +0000 |
| commit | 7b454726b985eec8679f59526edcb7ac1f77fd0f (patch) | |
| tree | f3fe11ce9b8f8ab15bb2a3a9a871b20a1e61c73b | |
| parent | 160340248c7aa8462129b24792d9baae11346511 (diff) | |
| download | draklive-config-7b454726b985eec8679f59526edcb7ac1f77fd0f.tar draklive-config-7b454726b985eec8679f59526edcb7ac1f77fd0f.tar.gz draklive-config-7b454726b985eec8679f59526edcb7ac1f77fd0f.tar.bz2 draklive-config-7b454726b985eec8679f59526edcb7ac1f77fd0f.tar.xz draklive-config-7b454726b985eec8679f59526edcb7ac1f77fd0f.zip | |
auto_conf.cfg.pl: fix copying of release notes on non-native arch.
drakx-in-chroot mounts the repo differently when the build system
arch does not match the arch we are building.
| -rw-r--r-- | config/auto_inst.cfg.pl | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl index 8299ec1..a1cbf2b 100644 --- a/config/auto_inst.cfg.pl +++ b/config/auto_inst.cfg.pl @@ -230,7 +230,12 @@ $o = { 'match_all_hardware' => 1, 'excludedocs' => 0, 'postInstallNonRooted' => join(";", - "cp /tmp/media/$ENV{DRAKLIVE_ARCH}/release-notes.* /mnt", + # drakx-in-chroot roots the mount point one level higher when + # the build system arch matches DRAKLIVE_ARCH. + "if [ -d /tmp/media/$ENV{DRAKLIVE_ARCH} ]", + "then cp /tmp/media/$ENV{DRAKLIVE_ARCH}/release-notes.* /mnt", + "else cp /tmp/media/release-notes.* /mnt", + "fi", "chmod 0644 /mnt/release-notes.*", ), 'postInstall' => join(";", |