Blame SOURCES/add-missing-kickstart-files.patch

575137
From 6dcc73bc19c63a090c0aa76a8958e40190194a05 Mon Sep 17 00:00:00 2001
575137
From: Gabriel Becker <ggasparb@redhat.com>
575137
Date: Tue, 11 Dec 2018 14:56:26 +0100
575137
Subject: [PATCH 1/6] Add RHEL8 kickstart files for OSPP and PCI-DSS profiles.
575137
575137
---
575137
 rhel8/kickstart/ssg-rhel8-ospp-ks.cfg        | 179 +++++++++++++++++++
575137
 rhel8/kickstart/ssg-rhel8-pci-dss-oaa-ks.cfg | 163 +++++++++++++++++
575137
 2 files changed, 342 insertions(+)
575137
 create mode 100644 rhel8/kickstart/ssg-rhel8-ospp-ks.cfg
575137
 create mode 100644 rhel8/kickstart/ssg-rhel8-pci-dss-oaa-ks.cfg
575137
575137
diff --git a/rhel8/kickstart/ssg-rhel8-ospp-ks.cfg b/rhel8/kickstart/ssg-rhel8-ospp-ks.cfg
575137
new file mode 100644
575137
index 0000000000..9077e09c9f
575137
--- /dev/null
575137
+++ b/rhel8/kickstart/ssg-rhel8-ospp-ks.cfg
575137
@@ -0,0 +1,179 @@
575137
+# SCAP Security Guide OSPP/USGCB profile kickstart for Red Hat Enterprise Linux 7 Server
575137
+# Version: 0.0.2
575137
+# Date: 2015-11-19
575137
+#
575137
+# Based on:
575137
+# http://fedoraproject.org/wiki/Anaconda/Kickstart
575137
+# https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/7/html/Installation_Guide/sect-kickstart-syntax.html
575137
+# http://usgcb.nist.gov/usgcb/content/configuration/workstation-ks.cfg
575137
+
575137
+# Install a fresh new system (optional)
575137
+install
575137
+
575137
+# Specify installation method to use for installation
575137
+# To use a different one comment out the 'url' one below, update
575137
+# the selected choice with proper options & un-comment it
575137
+#
575137
+# Install from an installation tree on a remote server via FTP or HTTP:
575137
+# --url		the URL to install from
575137
+#
575137
+# Example:
575137
+#
575137
+# url --url=http://192.168.122.1/image
575137
+#
575137
+# Modify concrete URL in the above example appropriately to reflect the actual
575137
+# environment machine is to be installed in
575137
+#
575137
+# Other possible / supported installation methods:
575137
+# * install from the first CD-ROM/DVD drive on the system:
575137
+#
575137
+# cdrom
575137
+#
575137
+# * install from a directory of ISO images on a local drive:
575137
+#
575137
+# harddrive --partition=hdb2 --dir=/tmp/install-tree
575137
+#
575137
+# * install from provided NFS server:
575137
+#
575137
+# nfs --server=<hostname> --dir=<directory> [--opts=<nfs options>]
575137
+#
575137
+# Set language to use during installation and the default language to use on the installed system (required)
575137
+lang en_US.UTF-8
575137
+
575137
+# Set system keyboard type / layout (required)
575137
+keyboard us
575137
+
575137
+# Configure network information for target system and activate network devices in the installer environment (optional)
575137
+# --onboot	enable device at a boot time
575137
+# --device	device to be activated and / or configured with the network command
575137
+# --bootproto	method to obtain networking configuration for device (default dhcp)
575137
+# --noipv6	disable IPv6 on this device
575137
+#
575137
+# NOTE: Usage of DHCP will fail CCE-27021-5 (DISA FSO RHEL-06-000292). To use static IP configuration,
575137
+#       "--bootproto=static" must be used. For example:
575137
+# network --bootproto=static --ip=10.0.2.15 --netmask=255.255.255.0 --gateway=10.0.2.254 --nameserver 192.168.2.1,192.168.3.1
575137
+#
575137
+network --onboot yes --device eth0 --bootproto dhcp
575137
+
575137
+# Set the system's root password (required)
575137
+# Plaintext password is: server
575137
+# Refer to e.g.
575137
+#   https://pykickstart.readthedocs.io/en/latest/commands.html#rootpw
575137
+# to see how to create encrypted password form for different plaintext password
575137
+rootpw --iscrypted $6$0WWGZ1e6icT$1KiHZK.Nzp3HQerfiy8Ic3pOeCWeIzA.zkQ7mkvYT3bNC5UeGK2ceE5b6TkSg4D/kiSudkT04QlSKknsrNE220
575137
+
575137
+# The selected profile will restrict root login
575137
+# Add a user that can login and escalate privileges
575137
+# Plaintext password is: admin123
575137
+user --name=admin --groups=wheel --password=$6$Ga6ZnIlytrWpuCzO$q0LqT1USHpahzUafQM9jyHCY9BiE5/ahXLNWUMiVQnFGblu0WWGZ1e6icTaCGO4GNgZNtspp1Let/qpM7FMVB0 --iscrypted
575137
+
575137
+# Configure firewall settings for the system (optional)
575137
+# --enabled	reject incoming connections that are not in response to outbound requests
575137
+# --ssh		allow sshd service through the firewall
575137
+firewall --enabled --ssh
575137
+
575137
+# Set up the authentication options for the system (required)
575137
+# --enableshadow	enable shadowed passwords by default
575137
+# --passalgo		hash / crypt algorithm for new passwords
575137
+# See the manual page for authconfig for a complete list of possible options.
575137
+authconfig --enableshadow --passalgo=sha512
575137
+
575137
+# State of SELinux on the installed system (optional)
575137
+# Defaults to enforcing
575137
+selinux --enforcing
575137
+
575137
+# Set the system time zone (required)
575137
+timezone --utc America/New_York
575137
+
575137
+# Specify how the bootloader should be installed (required)
575137
+# Plaintext password is: password
575137
+# Refer to e.g.
575137
+#   https://pykickstart.readthedocs.io/en/latest/commands.html#rootpw
575137
+# to see how to create encrypted password form for different plaintext password
575137
+#
575137
+# PASSWORD TEMPORARILY DISABLED - see bz1651624
575137
+bootloader --location=mbr --append="audit=1 audit_backlog_limit=8192 slub_debug=P page_poison=1 vsyscall=none"
575137
+#bootloader --location=mbr --append="audit=1 audit_backlog_limit=8192 slub_debug=P page_poison=1 vsyscall=none" --password=$6$rhel6usgcb$kOzIfC4zLbuo3ECp1er99NRYikN419wxYMmons8Vm/37Qtg0T8aB9dKxHwqapz8wWAFuVkuI/UJqQBU92bA5C0
575137
+
575137
+# Initialize (format) all disks (optional)
575137
+zerombr
575137
+
575137
+# The following partition layout scheme assumes disk of size 20GB or larger
575137
+# Modify size of partitions appropriately to reflect actual machine's hardware
575137
+# 
575137
+# Remove Linux partitions from the system prior to creating new ones (optional)
575137
+# --linux	erase all Linux partitions
575137
+# --initlabel	initialize the disk label to the default based on the underlying architecture
575137
+clearpart --linux --initlabel
575137
+
575137
+# Create primary system partitions (required for installs)
575137
+part /boot --fstype=xfs --size=512
575137
+part pv.01 --grow --size=1
575137
+
575137
+# Create a Logical Volume Management (LVM) group (optional)
575137
+volgroup VolGroup --pesize=4096 pv.01
575137
+
575137
+# Create particular logical volumes (optional)
575137
+logvol / --fstype=xfs --name=root --vgname=VolGroup --size=12288 --grow
575137
+# CCE-26557-9: Ensure /home Located On Separate Partition
575137
+logvol /home --fstype=xfs --name=home --vgname=VolGroup --size=1024 --fsoptions="nodev"
575137
+# CCE-26435-8: Ensure /tmp Located On Separate Partition
575137
+logvol /tmp --fstype=xfs --name=tmp --vgname=VolGroup --size=1024 --fsoptions="nodev,nosuid,noexec"
575137
+# CCE-26639-5: Ensure /var Located On Separate Partition
575137
+logvol /var --fstype=xfs --name=var --vgname=VolGroup --size=2048 --fsoptions="nodev"
575137
+# CCE-26215-4: Ensure /var/log Located On Separate Partition
575137
+logvol /var/log --fstype=xfs --name=log --vgname=VolGroup --size=1024 --fsoptions="nodev,nosuid,noexec"
575137
+# CCE-26436-6: Ensure /var/log/audit Located On Separate Partition
575137
+logvol /var/log/audit --fstype=xfs --name=audit --vgname=VolGroup --size=512 --fsoptions="nodev,nosuid,noexec"
575137
+logvol swap --name=swap --vgname=VolGroup --size=2016
575137
+
575137
+# The OpenSCAP installer add-on is used to apply SCAP (Security Content Automation Protocol)
575137
+# content - security policies - on the installed system.This add-on has been enabled by default
575137
+# since Red Hat Enterprise Linux 7.2. When enabled, the packages necessary to provide this 
575137
+# functionality will automatically be installed. However, by default, no policies are enforced,
575137
+# meaning that no checks are performed during or after installation unless specifically configured.
575137
+#  
575137
+#  Important
575137
+#   Applying a security policy is not necessary on all systems. This screen should only be used
575137
+#   when a specific policy is mandated by your organization rules or government regulations.
575137
+#   Unlike most other commands, this add-on does not accept regular options, but uses key-value
575137
+#   pairs in the body of the %addon definition instead. These pairs are whitespace-agnostic.
575137
+#   Values can be optionally enclosed in single quotes (') or double quotes (").
575137
+#   
575137
+#  The following keys are recognized by the add-on:
575137
+#    content-type - Type of the security content. Possible values are datastream, archive, rpm, and scap-security-guide.
575137
+#      - If the content-type is scap-security-guide, the add-on will use content provided by the
575137
+#        scap-security-guide package, which is present on the boot media. This means that all other keys except profile will have no effect.
575137
+#    content-url - Location of the security content. The content must be accessible using HTTP, HTTPS, or FTP; local storage is currently not supported. A network connection must be available to reach content definitions in a remote location.
575137
+#    datastream-id - ID of the data stream referenced in the content-url value. Used only if content-type is datastream.
575137
+#    xccdf-id - ID of the benchmark you want to use.
575137
+#    xccdf-path - Path to the XCCDF file which should be used; given as a relative path in the archive.
575137
+#    profile - ID of the profile to be applied. Use default to apply the default profile.
575137
+#    fingerprint - A MD5, SHA1 or SHA2 checksum of the content referenced by content-url.
575137
+#    tailoring-path - Path to a tailoring file which should be used, given as a relative path in the archive.
575137
+#
575137
+#  The following is an example %addon org_fedora_oscap section which uses content from the
575137
+#  scap-security-guide on the installation media: 
575137
+%addon org_fedora_oscap
575137
+	content-type = scap-security-guide
575137
+	profile = xccdf_org.ssgproject.content_profile_ospp
575137
+%end
575137
+
575137
+# Packages selection (%packages section is required)
575137
+%packages
575137
+
575137
+# Require @Base
575137
+@Base
575137
+
575137
+# Install selected additional packages (required by profile)
575137
+# CCE-27024-9: Install AIDE
575137
+aide
575137
+
575137
+# Install libreswan package
575137
+libreswan
575137
+
575137
+%end # End of %packages section
575137
+
575137
+# Reboot after the installation is complete (optional)
575137
+# --eject	attempt to eject CD or DVD media before rebooting
575137
+reboot --eject
575137
\ No newline at end of file
575137
diff --git a/rhel8/kickstart/ssg-rhel8-pci-dss-oaa-ks.cfg b/rhel8/kickstart/ssg-rhel8-pci-dss-oaa-ks.cfg
575137
new file mode 100644
575137
index 0000000000..524c90d85e
575137
--- /dev/null
575137
+++ b/rhel8/kickstart/ssg-rhel8-pci-dss-oaa-ks.cfg
575137
@@ -0,0 +1,163 @@
575137
+# SCAP Security Guide PCI-DSS profile kickstart for Red Hat Enterprise Linux 7 Server
575137
+# Version: 0.0.2
575137
+# Date: 2015-08-02
575137
+#
575137
+# Based on:
575137
+# http://fedoraproject.org/wiki/Anaconda/Kickstart
575137
+# https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/7/html/Installation_Guide/sect-kickstart-syntax.html
575137
+# http://usgcb.nist.gov/usgcb/content/configuration/workstation-ks.cfg
575137
+
575137
+# Install a fresh new system (optional)
575137
+install
575137
+
575137
+# Specify installation method to use for installation
575137
+# To use a different one comment out the 'url' one below, update
575137
+# the selected choice with proper options & un-comment it
575137
+#
575137
+# Install from an installation tree on a remote server via FTP or HTTP:
575137
+# --url		the URL to install from
575137
+#
575137
+# Example:
575137
+#
575137
+# url --url=http://192.168.122.1/image
575137
+#
575137
+# Modify concrete URL in the above example appropriately to reflect the actual
575137
+# environment machine is to be installed in
575137
+#
575137
+# Other possible / supported installation methods:
575137
+# * install from the first CD-ROM/DVD drive on the system:
575137
+#
575137
+# cdrom
575137
+#
575137
+# * install from a directory of ISO images on a local drive:
575137
+#
575137
+# harddrive --partition=hdb2 --dir=/tmp/install-tree
575137
+#
575137
+# * install from provided NFS server:
575137
+#
575137
+# nfs --server=<hostname> --dir=<directory> [--opts=<nfs options>]
575137
+#
575137
+
575137
+# Set language to use during installation and the default language to use on the installed system (required)
575137
+lang en_US.UTF-8
575137
+
575137
+# Set system keyboard type / layout (required)
575137
+keyboard us
575137
+
575137
+# Configure network information for target system and activate network devices in the installer environment (optional)
575137
+# --onboot	enable device at a boot time
575137
+# --device	device to be activated and / or configured with the network command
575137
+# --bootproto	method to obtain networking configuration for device (default dhcp)
575137
+# --noipv6	disable IPv6 on this device
575137
+network --onboot yes --device eth0 --bootproto dhcp --noipv6
575137
+
575137
+# Set the system's root password (required)
575137
+# Plaintext password is: server
575137
+# Refer to e.g.
575137
+#   https://pykickstart.readthedocs.io/en/latest/commands.html#rootpw
575137
+# to see how to create encrypted password form for different plaintext password
575137
+rootpw --iscrypted $6$0WWGZ1e6icT$1KiHZK.Nzp3HQerfiy8Ic3pOeCWeIzA.zkQ7mkvYT3bNC5UeGK2ceE5b6TkSg4D/kiSudkT04QlSKknsrNE220
575137
+
575137
+# Configure firewall settings for the system (optional)
575137
+# --enabled	reject incoming connections that are not in response to outbound requests
575137
+# --ssh		allow sshd service through the firewall
575137
+firewall --enabled --ssh
575137
+
575137
+# Set up the authentication options for the system (required)
575137
+# --enableshadow	enable shadowed passwords by default
575137
+# --passalgo		hash / crypt algorithm for new passwords
575137
+# See the manual page for authconfig for a complete list of possible options.
575137
+authconfig --enableshadow --passalgo=sha512
575137
+
575137
+# State of SELinux on the installed system (optional)
575137
+# Defaults to enforcing
575137
+selinux --enforcing
575137
+
575137
+# Set the system time zone (required)
575137
+timezone --utc America/New_York
575137
+
575137
+# Specify how the bootloader should be installed (required)
575137
+# Plaintext password is: password
575137
+# Refer to e.g. http://fedoraproject.org/wiki/Anaconda/Kickstart#rootpw to see how to create
575137
+# encrypted password form for different plaintext password
575137
+bootloader --location=mbr --append="crashkernel=auto rhgb quiet" --password=$6$rhel6usgcb$kOzIfC4zLbuo3ECp1er99NRYikN419wxYMmons8Vm/37Qtg0T8aB9dKxHwqapz8wWAFuVkuI/UJqQBU92bA5C0
575137
+
575137
+# Initialize (format) all disks (optional)
575137
+zerombr
575137
+
575137
+# The following partition layout scheme assumes disk of size 20GB or larger
575137
+# Modify size of partitions appropriately to reflect actual machine's hardware
575137
+# 
575137
+# Remove Linux partitions from the system prior to creating new ones (optional)
575137
+# --linux	erase all Linux partitions
575137
+# --initlabel	initialize the disk label to the default based on the underlying architecture
575137
+clearpart --linux --initlabel
575137
+
575137
+# Create primary system partitions (required for installs)
575137
+part /boot --fstype=xfs --size=512
575137
+part pv.01 --grow --size=1
575137
+
575137
+# Create a Logical Volume Management (LVM) group (optional)
575137
+volgroup VolGroup --pesize=4096 pv.01
575137
+
575137
+# Create particular logical volumes (optional)
575137
+logvol / --fstype=xfs --name=LogVol06 --vgname=VolGroup --size=12288 --grow
575137
+# CCE-26557-9: Ensure /home Located On Separate Partition
575137
+logvol /home --fstype=xfs --name=LogVol02 --vgname=VolGroup --size=1024 --fsoptions="nodev"
575137
+# CCE-26435-8: Ensure /tmp Located On Separate Partition
575137
+logvol /tmp --fstype=xfs --name=LogVol01 --vgname=VolGroup --size=1024 --fsoptions="nodev,noexec,nosuid"
575137
+# CCE-26639-5: Ensure /var Located On Separate Partition
575137
+logvol /var --fstype=xfs --name=LogVol03 --vgname=VolGroup --size=2048 --fsoptions="nodev"
575137
+# CCE-26215-4: Ensure /var/log Located On Separate Partition
575137
+logvol /var/log --fstype=xfs --name=LogVol04 --vgname=VolGroup --size=1024 --fsoptions="nodev"
575137
+# CCE-26436-6: Ensure /var/log/audit Located On Separate Partition
575137
+logvol /var/log/audit --fstype=xfs --name=LogVol05 --vgname=VolGroup --size=512 --fsoptions="nodev"
575137
+logvol swap --name=lv_swap --vgname=VolGroup --size=2016
575137
+
575137
+# The OpenSCAP installer add-on is used to apply SCAP (Security Content Automation Protocol)
575137
+# content - security policies - on the installed system.This add-on has been enabled by default
575137
+# since Red Hat Enterprise Linux 7.2. When enabled, the packages necessary to provide this 
575137
+# functionality will automatically be installed. However, by default, no policies are enforced,
575137
+# meaning that no checks are performed during or after installation unless specifically configured.
575137
+#  
575137
+#  Important
575137
+#   Applying a security policy is not necessary on all systems. This screen should only be used
575137
+#   when a specific policy is mandated by your organization rules or government regulations.
575137
+#   Unlike most other commands, this add-on does not accept regular options, but uses key-value
575137
+#   pairs in the body of the %addon definition instead. These pairs are whitespace-agnostic.
575137
+#   Values can be optionally enclosed in single quotes (') or double quotes (").
575137
+#   
575137
+#  The following keys are recognized by the add-on:
575137
+#    content-type - Type of the security content. Possible values are datastream, archive, rpm, and scap-security-guide.
575137
+#      - If the content-type is scap-security-guide, the add-on will use content provided by the
575137
+#        scap-security-guide package, which is present on the boot media. This means that all other keys except profile will have no effect.
575137
+#    content-url - Location of the security content. The content must be accessible using HTTP, HTTPS, or FTP; local storage is currently not supported. A network connection must be available to reach content definitions in a remote location.
575137
+#    datastream-id - ID of the data stream referenced in the content-url value. Used only if content-type is datastream.
575137
+#    xccdf-id - ID of the benchmark you want to use.
575137
+#    xccdf-path - Path to the XCCDF file which should be used; given as a relative path in the archive.
575137
+#    profile - ID of the profile to be applied. Use default to apply the default profile.
575137
+#    fingerprint - A MD5, SHA1 or SHA2 checksum of the content referenced by content-url.
575137
+#    tailoring-path - Path to a tailoring file which should be used, given as a relative path in the archive.
575137
+#
575137
+#  The following is an example %addon org_fedora_oscap section which uses content from the
575137
+#  scap-security-guide on the installation media: 
575137
+%addon org_fedora_oscap
575137
+        content-type = scap-security-guide
575137
+        profile = xccdf_org.ssgproject.content_profile_pci-dss
575137
+%end
575137
+
575137
+# Packages selection (%packages section is required)
575137
+%packages
575137
+
575137
+# Install selected additional packages (required by PCI-DSS profile)
575137
+# CCE-27024-9: Install AIDE
575137
+aide
575137
+
575137
+# Install libreswan package
575137
+libreswan
575137
+
575137
+%end # End of %packages section
575137
+
575137
+# Reboot after the installation is complete (optional)
575137
+# --eject	attempt to eject CD or DVD media before rebooting
575137
+reboot --eject
575137
575137
From 46b3cb9b9231513fa59e9612d034a267ede7b618 Mon Sep 17 00:00:00 2001
575137
From: Gabriel Becker <ggasparb@redhat.com>
575137
Date: Tue, 11 Dec 2018 17:03:50 +0100
575137
Subject: [PATCH 2/6] Fix references for RHEL8 and remove date/version from
575137
 RHEL8 kickstart files.
575137
575137
---
575137
 rhel8/kickstart/ssg-rhel8-ospp-ks.cfg                       | 4 +---
575137
 ...sg-rhel8-pci-dss-oaa-ks.cfg => ssg-rhel8-pci-dss-ks.cfg} | 6 ++----
575137
 2 files changed, 3 insertions(+), 7 deletions(-)
575137
 rename rhel8/kickstart/{ssg-rhel8-pci-dss-oaa-ks.cfg => ssg-rhel8-pci-dss-ks.cfg} (98%)
575137
575137
diff --git a/rhel8/kickstart/ssg-rhel8-ospp-ks.cfg b/rhel8/kickstart/ssg-rhel8-ospp-ks.cfg
575137
index 9077e09c9f..3cda22fd49 100644
575137
--- a/rhel8/kickstart/ssg-rhel8-ospp-ks.cfg
575137
+++ b/rhel8/kickstart/ssg-rhel8-ospp-ks.cfg
575137
@@ -1,6 +1,4 @@
575137
-# SCAP Security Guide OSPP/USGCB profile kickstart for Red Hat Enterprise Linux 7 Server
575137
-# Version: 0.0.2
575137
-# Date: 2015-11-19
575137
+# SCAP Security Guide OSPP/USGCB profile kickstart for Red Hat Enterprise Linux 8 Server
575137
 #
575137
 # Based on:
575137
 # http://fedoraproject.org/wiki/Anaconda/Kickstart
575137
diff --git a/rhel8/kickstart/ssg-rhel8-pci-dss-oaa-ks.cfg b/rhel8/kickstart/ssg-rhel8-pci-dss-ks.cfg
575137
similarity index 98%
575137
rename from rhel8/kickstart/ssg-rhel8-pci-dss-oaa-ks.cfg
575137
rename to rhel8/kickstart/ssg-rhel8-pci-dss-ks.cfg
575137
index 524c90d85e..8f333864fb 100644
575137
--- a/rhel8/kickstart/ssg-rhel8-pci-dss-oaa-ks.cfg
575137
+++ b/rhel8/kickstart/ssg-rhel8-pci-dss-ks.cfg
575137
@@ -1,6 +1,4 @@
575137
-# SCAP Security Guide PCI-DSS profile kickstart for Red Hat Enterprise Linux 7 Server
575137
-# Version: 0.0.2
575137
-# Date: 2015-08-02
575137
+# SCAP Security Guide PCI-DSS profile kickstart for Red Hat Enterprise Linux 8 Server
575137
 #
575137
 # Based on:
575137
 # http://fedoraproject.org/wiki/Anaconda/Kickstart
575137
@@ -15,7 +13,7 @@ install
575137
 # the selected choice with proper options & un-comment it
575137
 #
575137
 # Install from an installation tree on a remote server via FTP or HTTP:
575137
-# --url		the URL to install from
575137
+# --url	        the URL to install from
575137
 #
575137
 # Example:
575137
 #
575137
575137
From 16dea2bcffff16d85ae65d54df37f653c8a3d5cd Mon Sep 17 00:00:00 2001
575137
From: Gabriel Becker <ggasparb@redhat.com>
575137
Date: Wed, 12 Dec 2018 09:48:56 +0100
575137
Subject: [PATCH 3/6] Remove RHEL7 references from RHEL8 kickstart files.
575137
575137
Remove variant "Server" as it doesn't exist in RHEL8 anymore.
575137
---
575137
 rhel8/kickstart/ssg-rhel8-ospp-ks.cfg    | 3 +--
575137
 rhel8/kickstart/ssg-rhel8-pci-dss-ks.cfg | 3 +--
575137
 2 files changed, 2 insertions(+), 4 deletions(-)
575137
575137
diff --git a/rhel8/kickstart/ssg-rhel8-ospp-ks.cfg b/rhel8/kickstart/ssg-rhel8-ospp-ks.cfg
575137
index 3cda22fd49..8f701fe7aa 100644
575137
--- a/rhel8/kickstart/ssg-rhel8-ospp-ks.cfg
575137
+++ b/rhel8/kickstart/ssg-rhel8-ospp-ks.cfg
575137
@@ -1,8 +1,7 @@
575137
-# SCAP Security Guide OSPP/USGCB profile kickstart for Red Hat Enterprise Linux 8 Server
575137
+# SCAP Security Guide OSPP/USGCB profile kickstart for Red Hat Enterprise Linux 8
575137
 #
575137
 # Based on:
575137
 # http://fedoraproject.org/wiki/Anaconda/Kickstart
575137
-# https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/7/html/Installation_Guide/sect-kickstart-syntax.html
575137
 # http://usgcb.nist.gov/usgcb/content/configuration/workstation-ks.cfg
575137
 
575137
 # Install a fresh new system (optional)
575137
diff --git a/rhel8/kickstart/ssg-rhel8-pci-dss-ks.cfg b/rhel8/kickstart/ssg-rhel8-pci-dss-ks.cfg
575137
index 8f333864fb..a01025d122 100644
575137
--- a/rhel8/kickstart/ssg-rhel8-pci-dss-ks.cfg
575137
+++ b/rhel8/kickstart/ssg-rhel8-pci-dss-ks.cfg
575137
@@ -1,8 +1,7 @@
575137
-# SCAP Security Guide PCI-DSS profile kickstart for Red Hat Enterprise Linux 8 Server
575137
+# SCAP Security Guide PCI-DSS profile kickstart for Red Hat Enterprise Linux 8
575137
 #
575137
 # Based on:
575137
 # http://fedoraproject.org/wiki/Anaconda/Kickstart
575137
-# https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/7/html/Installation_Guide/sect-kickstart-syntax.html
575137
 # http://usgcb.nist.gov/usgcb/content/configuration/workstation-ks.cfg
575137
 
575137
 # Install a fresh new system (optional)
575137
575137
From 3d244c082c8068462da75a4d25c039b105577a1c Mon Sep 17 00:00:00 2001
575137
From: Gabriel Becker <ggasparb@redhat.com>
575137
Date: Wed, 12 Dec 2018 13:34:12 +0100
575137
Subject: [PATCH 4/6] Remove USGCB reference from RHEL8 OSPP profile kickstart.
575137
575137
---
575137
 rhel8/kickstart/ssg-rhel8-ospp-ks.cfg | 2 +-
575137
 1 file changed, 1 insertion(+), 1 deletion(-)
575137
575137
diff --git a/rhel8/kickstart/ssg-rhel8-ospp-ks.cfg b/rhel8/kickstart/ssg-rhel8-ospp-ks.cfg
575137
index 8f701fe7aa..920de1c7d9 100644
575137
--- a/rhel8/kickstart/ssg-rhel8-ospp-ks.cfg
575137
+++ b/rhel8/kickstart/ssg-rhel8-ospp-ks.cfg
575137
@@ -1,4 +1,4 @@
575137
-# SCAP Security Guide OSPP/USGCB profile kickstart for Red Hat Enterprise Linux 8
575137
+# SCAP Security Guide OSPP profile kickstart for Red Hat Enterprise Linux 8
575137
 #
575137
 # Based on:
575137
 # http://fedoraproject.org/wiki/Anaconda/Kickstart
575137
575137
From 0a86d0f204e9d49115a40585f4a1a72689f02b7a Mon Sep 17 00:00:00 2001
575137
From: Gabriel Becker <ggasparb@redhat.com>
575137
Date: Thu, 13 Dec 2018 17:29:14 +0100
575137
Subject: [PATCH 5/6] Remove device "eth0" option from RHEL8 kickstart files.
575137
575137
---
575137
 rhel8/kickstart/ssg-rhel8-ospp-ks.cfg    | 2 +-
575137
 rhel8/kickstart/ssg-rhel8-pci-dss-ks.cfg | 2 +-
575137
 2 files changed, 2 insertions(+), 2 deletions(-)
575137
575137
diff --git a/rhel8/kickstart/ssg-rhel8-ospp-ks.cfg b/rhel8/kickstart/ssg-rhel8-ospp-ks.cfg
575137
index 920de1c7d9..352035db56 100644
575137
--- a/rhel8/kickstart/ssg-rhel8-ospp-ks.cfg
575137
+++ b/rhel8/kickstart/ssg-rhel8-ospp-ks.cfg
575137
@@ -50,7 +50,7 @@ keyboard us
575137
 #       "--bootproto=static" must be used. For example:
575137
 # network --bootproto=static --ip=10.0.2.15 --netmask=255.255.255.0 --gateway=10.0.2.254 --nameserver 192.168.2.1,192.168.3.1
575137
 #
575137
-network --onboot yes --device eth0 --bootproto dhcp
575137
+network --onboot yes --bootproto dhcp
575137
 
575137
 # Set the system's root password (required)
575137
 # Plaintext password is: server
575137
diff --git a/rhel8/kickstart/ssg-rhel8-pci-dss-ks.cfg b/rhel8/kickstart/ssg-rhel8-pci-dss-ks.cfg
575137
index a01025d122..c8d634266a 100644
575137
--- a/rhel8/kickstart/ssg-rhel8-pci-dss-ks.cfg
575137
+++ b/rhel8/kickstart/ssg-rhel8-pci-dss-ks.cfg
575137
@@ -46,7 +46,7 @@ keyboard us
575137
 # --device	device to be activated and / or configured with the network command
575137
 # --bootproto	method to obtain networking configuration for device (default dhcp)
575137
 # --noipv6	disable IPv6 on this device
575137
-network --onboot yes --device eth0 --bootproto dhcp --noipv6
575137
+network --onboot yes --bootproto dhcp --noipv6
575137
 
575137
 # Set the system's root password (required)
575137
 # Plaintext password is: server
575137
575137
From a929f93bc25a6f749083437eb4622db2c13963bf Mon Sep 17 00:00:00 2001
575137
From: Gabriel Becker <ggasparb@redhat.com>
575137
Date: Fri, 14 Dec 2018 16:04:01 +0100
575137
Subject: [PATCH 6/6] Disable default password for MBR encryption from RHEL8
575137
 kickstart files.
575137
575137
There is a bug preventing that to work properly and it should be
575137
reverted when it gets fixed.
575137
---
575137
 rhel8/kickstart/ssg-rhel8-ospp-ks.cfg    |  4 ----
575137
 rhel8/kickstart/ssg-rhel8-pci-dss-ks.cfg | 11 ++++++++---
575137
 2 files changed, 8 insertions(+), 7 deletions(-)
575137
575137
diff --git a/rhel8/kickstart/ssg-rhel8-ospp-ks.cfg b/rhel8/kickstart/ssg-rhel8-ospp-ks.cfg
575137
index 352035db56..5c6210a097 100644
575137
--- a/rhel8/kickstart/ssg-rhel8-ospp-ks.cfg
575137
+++ b/rhel8/kickstart/ssg-rhel8-ospp-ks.cfg
575137
@@ -83,14 +83,10 @@ selinux --enforcing
575137
 timezone --utc America/New_York
575137
 
575137
 # Specify how the bootloader should be installed (required)
575137
-# Plaintext password is: password
575137
 # Refer to e.g.
575137
 #   https://pykickstart.readthedocs.io/en/latest/commands.html#rootpw
575137
 # to see how to create encrypted password form for different plaintext password
575137
-#
575137
-# PASSWORD TEMPORARILY DISABLED - see bz1651624
575137
 bootloader --location=mbr --append="audit=1 audit_backlog_limit=8192 slub_debug=P page_poison=1 vsyscall=none"
575137
-#bootloader --location=mbr --append="audit=1 audit_backlog_limit=8192 slub_debug=P page_poison=1 vsyscall=none" --password=$6$rhel6usgcb$kOzIfC4zLbuo3ECp1er99NRYikN419wxYMmons8Vm/37Qtg0T8aB9dKxHwqapz8wWAFuVkuI/UJqQBU92bA5C0
575137
 
575137
 # Initialize (format) all disks (optional)
575137
 zerombr
575137
diff --git a/rhel8/kickstart/ssg-rhel8-pci-dss-ks.cfg b/rhel8/kickstart/ssg-rhel8-pci-dss-ks.cfg
575137
index c8d634266a..a00476c8f4 100644
575137
--- a/rhel8/kickstart/ssg-rhel8-pci-dss-ks.cfg
575137
+++ b/rhel8/kickstart/ssg-rhel8-pci-dss-ks.cfg
575137
@@ -75,9 +75,14 @@ timezone --utc America/New_York
575137
 
575137
 # Specify how the bootloader should be installed (required)
575137
 # Plaintext password is: password
575137
-# Refer to e.g. http://fedoraproject.org/wiki/Anaconda/Kickstart#rootpw to see how to create
575137
-# encrypted password form for different plaintext password
575137
-bootloader --location=mbr --append="crashkernel=auto rhgb quiet" --password=$6$rhel6usgcb$kOzIfC4zLbuo3ECp1er99NRYikN419wxYMmons8Vm/37Qtg0T8aB9dKxHwqapz8wWAFuVkuI/UJqQBU92bA5C0
575137
+# Refer to e.g.
575137
+#   https://pykickstart.readthedocs.io/en/latest/commands.html#rootpw
575137
+# to see how to create encrypted password form for different plaintext password
575137
+#
575137
+# PASSWORD TEMPORARILY DISABLED
575137
+bootloader --location=mbr --append="audit=1 audit_backlog_limit=8192 slub_debug=P page_poison=1 vsyscall=none"
575137
+#bootloader --location=mbr --append="audit=1 audit_backlog_limit=8192 slub_debug=P page_poison=1 vsyscall=none" --password=$6$rhel6usgcb$kOzIfC4zLbuo3ECp1er99NRYikN419wxYMmons8Vm/37Qtg0T8aB9dKxHwqapz8wWAFuVkuI/UJqQBU92bA5C0
575137
+
575137
 
575137
 # Initialize (format) all disks (optional)
575137
 zerombr