From eff0d663776587a6ccca6c30a0433baf8663aa09 Mon Sep 17 00:00:00 2001 From: Angie Wang Date: Mon, 20 Jan 2020 15:09:10 -0500 Subject: [PATCH] Remove unused post_clone_iso_ks.cfg Change-Id: I3be9384b94473cc6e0f6efbc1e404c5878856ffc Partial-Bug: 1834218 Depends-On: https://review.opendev.org/#/c/703516/ Signed-off-by: Angie Wang --- bsp-files/kickstarts/post_clone_iso_ks.cfg | 41 ------------------- .../centos/build_srpm.data | 1 - .../centos/pxe-network-installer.spec | 4 -- 3 files changed, 46 deletions(-) delete mode 100644 bsp-files/kickstarts/post_clone_iso_ks.cfg diff --git a/bsp-files/kickstarts/post_clone_iso_ks.cfg b/bsp-files/kickstarts/post_clone_iso_ks.cfg deleted file mode 100644 index 6553b181..00000000 --- a/bsp-files/kickstarts/post_clone_iso_ks.cfg +++ /dev/null @@ -1,41 +0,0 @@ - -# clone post installation script -%post --nochroot -if [ -d /mnt/install/source ]; then - srcdir=/mnt/install/source -else - srcdir=/run/install/repo -fi - -if [ -d $srcdir/clone-archive ]; then - cp -r $srcdir/clone-archive /mnt/sysimage/ - cp $srcdir/install_clone /mnt/sysimage/usr/bin/install_clone - chmod 500 /mnt/sysimage/usr/bin/install_clone -fi -%end - - -# clone post installation script to start install-clone service -%post --erroronfail - -# Build install-clone service file here, so that it is patchable. -cat << EOF > /usr/lib/systemd/system/install-clone.service -[Unit] -Description=Titanium install-clone service -After=hostw.service -Before=serial-getty@ttyS0.service getty@tty1.service -[Service] -User=root -Type=oneshot -RemainAfterExit=yes -Environment=PYTHONUNBUFFERED=1 -ExecStart=/usr/bin/install_clone -StandardOutput=syslog+console -[Install] -WantedBy=multi-user.target -EOF - -systemctl enable install-clone - -%end - diff --git a/installer/pxe-network-installer/centos/build_srpm.data b/installer/pxe-network-installer/centos/build_srpm.data index 6f255a04..18088d3d 100644 --- a/installer/pxe-network-installer/centos/build_srpm.data +++ b/installer/pxe-network-installer/centos/build_srpm.data @@ -1,6 +1,5 @@ COPY_LIST="pxe-network-installer/* \ $GIT_BASE/bsp-files/grub.cfg \ - $GIT_BASE/bsp-files/kickstarts/post_clone_iso_ks.cfg \ $SRC_BASE/cgcs-centos-repo/Binary/images/efiboot.img \ /import/mirrors/CentOS/stx-installer/initrd.img \ /import/mirrors/CentOS/stx-installer/squashfs.img \ diff --git a/installer/pxe-network-installer/centos/pxe-network-installer.spec b/installer/pxe-network-installer/centos/pxe-network-installer.spec index 59974393..96af6594 100644 --- a/installer/pxe-network-installer/centos/pxe-network-installer.spec +++ b/installer/pxe-network-installer/centos/pxe-network-installer.spec @@ -16,7 +16,6 @@ Source003: squashfs.img Source010: pxeboot-update.sh Source011: grub.cfg Source012: efiboot.img -Source013: post_clone_iso_ks.cfg Source030: default Source031: default.static @@ -71,9 +70,6 @@ install -v -d -m 755 %{buildroot}%{_sbindir} install -v -m 755 %{_sourcedir}/pxeboot-update.sh %{buildroot}%{_sbindir}/pxeboot-update-%{platform_release}.sh -install -v -m 644 %{_sourcedir}/post_clone_iso_ks.cfg \ - %{buildroot}/pxeboot/post_clone_iso_ks.cfg - install -v -m 644 %{_sourcedir}/default \ %{buildroot}/pxeboot/pxelinux.cfg.files/default install -v -m 644 %{_sourcedir}/default.static \