From 7b454726b985eec8679f59526edcb7ac1f77fd0f Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Fri, 6 Jan 2017 18:24:54 +0000 Subject: 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. --- config/auto_inst.cfg.pl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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(";", -- cgit v1.2.1