Removed remnants of fedora branding. (#605)

Removed mentions of fedora in example live and atomic kickstarts.

Resolves: rhbz#1672583
This commit is contained in:
Jakub Vávra 2019-02-21 20:17:10 +01:00 committed by Brian C. Lane
parent 05aeb8fc24
commit 5b4a2a47b8
2 changed files with 7 additions and 7 deletions

View File

@ -1,4 +1,4 @@
# Fedora Atomic PXE Live creation kickstart # RHEL Atomic PXE Live creation kickstart
# Suitable for use with livemedia-creator --no-virt # Suitable for use with livemedia-creator --no-virt
# Settings for unattended installation: # Settings for unattended installation:
@ -14,7 +14,7 @@ shutdown
# Replace OSTREE-REPO with the url to an ostree repo # Replace OSTREE-REPO with the url to an ostree repo
# Replace OSTREE-REFERENCE with an ostree reference to pull # Replace OSTREE-REFERENCE with an ostree reference to pull
ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=OSTREE-REPO --ref=OSTREE-REFERENCE ostreesetup --nogpg --osname=rhel-atomic-host --remote=rhel-atomic-host --url=OSTREE-REPO --ref=OSTREE-REFERENCE
services --disabled=cloud-init,cloud-init-local,cloud-final,cloud-config,docker-storage-setup services --disabled=cloud-init,cloud-init-local,cloud-final,cloud-config,docker-storage-setup
@ -25,8 +25,8 @@ cat /dev/null > /etc/fstab
%end %end
%post --erroronfail %post --erroronfail
rm -f /etc/ostree/remotes.d/fedora-atomic.conf rm -f /etc/ostree/remotes.d/rhel-atomic-host.conf
# Replace OSTREE-REPO with the url to an ostree repo # Replace OSTREE-REPO with the url to an ostree repo
ostree remote add --set=gpg-verify=false fedora-atomic 'OSTREE-REPO' ostree remote add --set=gpg-verify=false rhel-atomic-host 'OSTREE-REPO'
%end %end

View File

@ -343,10 +343,10 @@ favorite-apps=['firefox.desktop', 'evolution.desktop', 'rhythmbox.desktop', 'sho
FOE FOE
# Make the welcome screen show up # Make the welcome screen show up
if [ -f /usr/share/anaconda/gnome/fedora-welcome.desktop ]; then if [ -f /usr/share/anaconda/gnome/rhel-welcome.desktop ]; then
mkdir -p ~liveuser/.config/autostart mkdir -p ~liveuser/.config/autostart
cp /usr/share/anaconda/gnome/fedora-welcome.desktop /usr/share/applications/ cp /usr/share/anaconda/gnome/rhel-welcome.desktop /usr/share/applications/
cp /usr/share/anaconda/gnome/fedora-welcome.desktop ~liveuser/.config/autostart/ cp /usr/share/anaconda/gnome/rhel-welcome.desktop ~liveuser/.config/autostart/
fi fi
# Copy Anaconda branding in place # Copy Anaconda branding in place