Skip to content

Commit 9c73988

Browse files
committed
cmdlib.sh: cleanup tmp_overridesdir between runs
In 230139d we started copying in `src/config/live` into an overlay to be stored under `/usr/share/coreos-assembler/live` in our resulting images. The way this is currently implemented yields a nested `live/live` folder and duplicate contents getting created becuase we don't clean up between runs: ``` /srv/tmp/override/usr-share-cosa/usr/share/coreos-assembler/live/README-devel.md /srv/tmp/override/usr-share-cosa/usr/share/coreos-assembler/live/zipl.prm /srv/tmp/override/usr-share-cosa/usr/share/coreos-assembler/live/isolinux /srv/tmp/override/usr-share-cosa/usr/share/coreos-assembler/live/isolinux/isolinux.cfg /srv/tmp/override/usr-share-cosa/usr/share/coreos-assembler/live/isolinux/boot.msg /srv/tmp/override/usr-share-cosa/usr/share/coreos-assembler/live/EFI /srv/tmp/override/usr-share-cosa/usr/share/coreos-assembler/live/EFI/fedora /srv/tmp/override/usr-share-cosa/usr/share/coreos-assembler/live/EFI/fedora/grub.cfg /srv/tmp/override/usr-share-cosa/usr/share/coreos-assembler/live/live /srv/tmp/override/usr-share-cosa/usr/share/coreos-assembler/live/live/README-devel.md /srv/tmp/override/usr-share-cosa/usr/share/coreos-assembler/live/live/zipl.prm /srv/tmp/override/usr-share-cosa/usr/share/coreos-assembler/live/live/isolinux /srv/tmp/override/usr-share-cosa/usr/share/coreos-assembler/live/live/isolinux/isolinux.cfg /srv/tmp/override/usr-share-cosa/usr/share/coreos-assembler/live/live/isolinux/boot.msg /srv/tmp/override/usr-share-cosa/usr/share/coreos-assembler/live/live/EFI /srv/tmp/override/usr-share-cosa/usr/share/coreos-assembler/live/live/EFI/fedora /srv/tmp/override/usr-share-cosa/usr/share/coreos-assembler/live/live/EFI/fedora/grub.cfg ``` This results in the same being duplicated in our images. Let's clean up between runs so we can not have the duplicate folder/files.
1 parent 153ebd7 commit 9c73988

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/cmdlib.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,8 @@ prepare_compose_overlays() {
400400
fi
401401

402402
if [ -d "${overridesdir}" ] || [ -d "${ovld}" ] || [ -d "${workdir}/src/yumrepos" ]; then
403-
mkdir -p "${tmp_overridesdir}"
403+
rm -rf "${tmp_overridesdir}"
404+
mkdir "${tmp_overridesdir}"
404405
cat > "${override_manifest}" <<EOF
405406
include: ${manifest}
406407
EOF

0 commit comments

Comments
 (0)