From 84c720f4562bde3d06b245bca0b7ad41655d35f5 Mon Sep 17 00:00:00 2001 From: Don Penney Date: Mon, 27 Apr 2020 22:50:10 -0400 Subject: [PATCH] Drop copy of .cfg files from controller kickstarts In a boot from an ISO modified by update-iso.sh with a ks-addon, the ks-addon.cfg was being unnecessarily copied in a kickstart postinstall scriptlet. This behaviour, copying the .cfg files, was originally required for copying the net-boot kickstarts for installation of other nodes, however the kickstarts are now packaged and installed, and no other .cfg files are required from the installation. As such, this update drops the copying of these files. Change-Id: Id088ff00711b0703299f822ab1f25901e94a6d4d Closes-Bug: 1875464 Signed-off-by: Don Penney --- bsp-files/kickstarts/post_pxeboot_controller.cfg | 2 -- bsp-files/kickstarts/post_usb_addon.cfg | 3 --- bsp-files/kickstarts/post_usb_controller.cfg | 1 - bsp-files/kickstarts/post_yow_controller.cfg | 2 -- 4 files changed, 8 deletions(-) diff --git a/bsp-files/kickstarts/post_pxeboot_controller.cfg b/bsp-files/kickstarts/post_pxeboot_controller.cfg index cf76f145..6a3f3a4e 100644 --- a/bsp-files/kickstarts/post_pxeboot_controller.cfg +++ b/bsp-files/kickstarts/post_pxeboot_controller.cfg @@ -95,8 +95,6 @@ wget ${NOVERIFYSSL_WGET_OPT} --mirror --no-parent --no-host-directories --reject wget ${NOVERIFYSSL_WGET_OPT} --mirror --no-parent --no-host-directories --reject 'index.html*' \ --cut-dirs=$cut_dirs $feed_url/repodata/ -o $anaconda_logdir/rpmget_repo.log \ || report_post_failure_with_logfile $anaconda_logdir/rpmget_repo.log -wget ${NOVERIFYSSL_WGET_OPT} $feed_url/isolinux.cfg --append $anaconda_logdir/wget_kickstarts.log \ - || report_post_failure_with_logfile $anaconda_logdir/wget_kickstarts.log echo "Done" >/dev/console patches_url=xxxHTTP_URLxxx/patches diff --git a/bsp-files/kickstarts/post_usb_addon.cfg b/bsp-files/kickstarts/post_usb_addon.cfg index edf0244a..71a8f0ba 100644 --- a/bsp-files/kickstarts/post_usb_addon.cfg +++ b/bsp-files/kickstarts/post_usb_addon.cfg @@ -21,9 +21,6 @@ else srcdir=/run/install/repo fi -# Store the ks-addon.cfg for debugging -mkdir -p /mnt/sysimage/var/log/anaconda -cp /tmp/ks-addon.cfg /mnt/sysimage/var/log/anaconda/ %end %post --erroronfail diff --git a/bsp-files/kickstarts/post_usb_controller.cfg b/bsp-files/kickstarts/post_usb_controller.cfg index 788aee52..357c5426 100644 --- a/bsp-files/kickstarts/post_usb_controller.cfg +++ b/bsp-files/kickstarts/post_usb_controller.cfg @@ -63,7 +63,6 @@ if [ -d $srcdir/Packages ] ; then mkdir -p /mnt/sysimage/www/pages/feed/rel-xxxPLATFORM_RELEASExxx cp -r $srcdir/Packages /mnt/sysimage/www/pages/feed/rel-xxxPLATFORM_RELEASExxx/Packages cp -r $srcdir/repodata /mnt/sysimage/www/pages/feed/rel-xxxPLATFORM_RELEASExxx/repodata - cp $srcdir/*.cfg /mnt/sysimage/www/pages/feed/rel-xxxPLATFORM_RELEASExxx fi if [ -d $srcdir/patches ]; then diff --git a/bsp-files/kickstarts/post_yow_controller.cfg b/bsp-files/kickstarts/post_yow_controller.cfg index 2dfb2b1f..d2f0ac77 100644 --- a/bsp-files/kickstarts/post_yow_controller.cfg +++ b/bsp-files/kickstarts/post_yow_controller.cfg @@ -86,8 +86,6 @@ wget --mirror --no-parent --no-host-directories --reject 'index.html*' --cut-dir || report_post_failure_with_logfile $anaconda_logdir/rpmget.log wget --mirror --no-parent --no-host-directories --reject 'index.html*' --cut-dirs=$cut_dirs $feed_url/repodata/ -o $anaconda_logdir/rpmget_repo.log \ || report_post_failure_with_logfile $anaconda_logdir/rpmget_repo.log -wget $feed_url/isolinux.cfg --append $anaconda_logdir/wget_kickstarts.log \ - || report_post_failure_with_logfile $anaconda_logdir/wget_kickstarts.log # Check for patches patches_url=http://xxxBOOT_SERVERxxx/umalab/`hostname`_feed/patches