Merge pull request #18 from tcooper/freeipa-fixes

fix ipadomain for freeipa and freeipaclient kickstarts

.gitignore

@@ -0,0 +1,2 @@
+*.img
+*.qcow2

README.md

@@ -4,7 +4,7 @@ createhdds.py creates and maintains the set of pre-rolled hard disk images neede
 
 ## Requirements
 
-createhdds requires libvirt-daemon-kvm, libvirt-python3, python3-libguestfs, python3-fedfind, qemu-kvm, virt-install, and (for ppc64 images) powerpc-utils. You will need somewhere around 100-150GB of disk space for the full set of base images for all supported arches.
+createhdds requires libvirt-daemon-kvm, python3-libvirt, python3-libguestfs, python3-fedfind, qemu-kvm, virt-install, and (for ppc64 images) powerpc-utils. You will need somewhere around 100-150GB of disk space for the full set of base images for all supported arches.
 
 ## Usage
 

createhdds.py

@@ -42,6 +42,7 @@ from six.moves.urllib.request import urlopen
 # directory.
 SCRIPTDIR = os.path.abspath(os.path.dirname(sys.argv[0]))
 CPUARCH = platform.processor()
+if CPUARCH == '' : CPUARCH = platform.machine()
 logger = logging.getLogger('createhdds')
 
 def handle_size(size):
@@ -197,8 +198,7 @@ class GuestfsImage(object):
 
 class VirtInstallImage(object):
     """Class representing an image created by virt-install. 'release'
-    is the release the image will be built for. 'variant' is the
-    variant whose install tree should be used. 'arch' is the arch.
+    is the release the image will be built for. 'arch' is the arch.
     'size' is the desired image size, in gigabytes. 'imgver' is
     the image 'version' - in practice it's simply a string that gets
     included in the image file name if specified. 'maxage' is the
@@ -207,7 +207,7 @@ class VirtInstallImage(object):
     rebuild it. 'bootopts' are used to pass boot options to the
     virtual image to provide better control of the VM.
     """
-    def __init__(self, name, release, arch, size, variant=None, imgver='', maxage=14, bootopts=None):
+    def __init__(self, name, release, arch, size, imgver='', maxage=14, bootopts=None):
         self.name = name
         self.size = size
         self.filename = "disk_rocky{0}_{1}".format(str(release), name)
@@ -215,16 +215,8 @@ class VirtInstallImage(object):
             self.filename = "{0}_{1}".format(self.filename, imgver)
         self.filename = "{0}_{1}.qcow2".format(self.filename, arch)
         self.release = release
-        self.variant = variant
         self.arch = arch
         self.maxage = maxage
-        if variant:
-            self.variant = variant
-        else:
-            if str(release).isdigit() and int(release) < 24:
-                self.variant = "Server"
-            else:
-                self.variant = "Everything"
         self.bootopts = bootopts
 
     @property
@@ -247,7 +239,7 @@ class VirtInstallImage(object):
                 logger.debug("Using kickstart %s", cand)
                 return cand
 
-    def create(self, textinst, retries=3):
+    def create(self, baseurl, textinst, retries=3):
         """Create the image."""
         if self.arch not in supported_arches():
             logger.info("Won't create %s image on %s host. This is normal, don't worry. If you "
@@ -259,13 +251,16 @@ class VirtInstallImage(object):
         # properly returns 1 on failure, but using workaround for old
         # bug where it didn't in case EPEL doesn't have 0.3.1
         shortid = "rocky{0}".format(self.release)
+        # rocky has beta, rc# and lookahead releases that aren't in osinfo db
+        # replace text suffix in those with unknown.
+        shortid = "{0}-unknown".format(shortid.split('-')[0])
         args = ["osinfo-query", "os", "short-id={0}".format(shortid)]
         process = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL)
         out = process.communicate()[0].decode()
         if shortid not in out:
             # this will just use the most recent rocky release number
             # virt-install / osinfo knows
-            shortid = 'rocky-unknown'
+            shortid = "rocky{0}".format(self.release).split('.')[0] + "-unknown"
 
         # destroy and delete the domain we use for all virt-installs
         conn = libvirt.open()
@@ -286,29 +281,20 @@ class VirtInstallImage(object):
         arch = self.arch
         rockydir = 'rocky/linux'
         memsize = '3072'
-        if arch == 'i686':
-            arch = 'i386'
         if arch in ['ppc64','ppc64le']:
             rockydir = 'rocky-secondary'
             memsize = '4096'
-        if arch == 'i386':
-            # i686 is in rocky-secondary (until it died)
-            rockydir = 'rocky-secondary'
 
-        variant = self.variant
-        # From F31 onwards, Workstation tree is not installable and we
-        # build Workstation images out of Everything
-        # We will always use the dvd1 ISO and the closest behavior is the Everything variant
-        variant = 'Everything'
         try:
+            locbase = "https://download.rockylinux.org/{0}/rocky".format(baseurl)
             # loctmp is the Distribution tree installation source. Point at the good location
-            loctmp = "https://download.rockylinux.org/pub/rocky/{0}/BaseOS/{1}/os"
+            loctmp = "{0}/{1}/BaseOS/{2}/os"
             ksfile = self.kickstart_file
             xargs = "inst.ks=file:/{0}".format(ksfile)
             args = ["virt-install", "--disk", "size={0},path={1}".format(self.size, tmpfile),
                     "--os-variant", shortid, "-x", xargs, "--initrd-inject",
                     "{0}/{1}".format(SCRIPTDIR, ksfile), "--location",
-                    loctmp.format(str(self.release), arch), "--name", "createhdds",
+                    loctmp.format(locbase, str(self.release), arch), "--name", "createhdds",
                     "--memory", memsize, "--noreboot", "--wait", "-1"]
             if logger.getEffectiveLevel() == logging.DEBUG:
                 # let's get virt-install debug logs too
@@ -351,7 +337,7 @@ class VirtInstallImage(object):
                     os.remove(tmpfile)
                 if retries:
                     logger.info("Retrying: %s retries remain after this", str(retries))
-                    return self.create(textinst, retries=retries-1)
+                    return self.create(baseurl, textinst, retries=retries-1)
                 else:
                     sys.exit("Image creation timed out too many times!")
             if ret > 0:
@@ -474,8 +460,6 @@ def get_virtinstall_images(imggrp, nextrel=None, releases=None):
     name = imggrp['name']
     # this is the second place we set a default for maxage - bit ugly
     maxage = int(imggrp.get('maxage', 14))
-    # ditto variant
-    variant = imggrp.get('variant')
     if not releases:
         releases = imggrp['releases']
     size = imggrp.get('size', 0)
@@ -490,7 +474,7 @@ def get_virtinstall_images(imggrp, nextrel=None, releases=None):
                     continue
                 key = "{0}-{1}".format(rel, arch)
                 # using a dict here avoids dupes
-                imgs[key] = VirtInstallImage(name, rel, arch, variant=variant, size=size,
+                imgs[key] = VirtInstallImage(name, rel, arch, size=size,
                                              imgver=imgver, maxage=maxage, bootopts=bootopts)
     return list(imgs.values())
 
@@ -627,7 +611,10 @@ def cli_all(args, hdds):
     missing.extend(outdated)
     for (num, img) in enumerate(missing, 1):
         logger.info("Creating image %s...[%s/%s]", img.filename, str(num), str(len(missing)))
-        img.create(args.textinst)
+        if img.filename.endswith(".img"):
+          img.create(args.textinst)
+        else:
+          img.create(args.baseurl, args.textinst)
 
 def cli_check(args, hdds):
     """Function for the CLI 'check' subcommand. Basically just calls
@@ -705,7 +692,10 @@ def cli_image(args, *_):
 
     for (num, img) in enumerate(imgs, 1):
         logger.info("Creating image %s...[%s/%s]", img.filename, str(num), str(len(imgs)))
-        img.create(args.textinst)
+        if imgtype == 'guestfs':
+          img.create(args.textinst)
+        else:
+          img.create(args.baseurl, args.textinst)
 
 def parse_args(hdds):
     """Parse arguments with argparse."""
@@ -718,6 +708,10 @@ def parse_args(hdds):
     parser.add_argument(
         '-t', '--textinst', help="For any virt-install images, run the install in text mode "
         "and show details on stdout", action='store_true')
+    parser.add_argument(
+        '-b', '--baseurl', help="For any virt-install images, support alt baseurl for initrd and vmlinuz.",
+        choices=('pub', 'stg'),
+        default='pub')
 
     # This is a workaround for a somewhat infamous argparse bug
     # in Python 3. See:

desktop-8-BETA.ks

@@ -0,0 +1,28 @@
+bootloader --location=mbr
+network --bootproto=dhcp
+url --url="https://download.rockylinux.org/stg/rocky/8-BETA/BaseOS/x86_64/os/"
+lang en_US.UTF-8
+keyboard us
+timezone --utc America/New_York
+clearpart --all
+autopart
+rootpw --plaintext weakpassword
+user --name=test --password=weakpassword --plaintext
+firstboot --enable
+poweroff
+text
+
+%packages
+@^workstation-product-environment
+-selinux-policy-minimum
+%end
+
+%post
+touch $INSTALL_ROOT/home/home_preserved
+%end
+
+%post
+/usr/bin/sed -i 's/^mirrorlist/#mirrorlist/g' /etc/yum.repos.d/Rocky-*.repo
+/usr/bin/sed -i 's,^#\(baseurl=http[s]*://\),\1,g' /etc/yum.repos.d/Rocky-*.repo
+/usr/bin/echo "stg/rocky" > /etc/dnf/vars/contentdir
+%end

desktop-8-LookAhead.ks

@@ -0,0 +1,28 @@
+bootloader --location=mbr
+network --bootproto=dhcp
+url --url="https://download.rockylinux.org/stg/rocky/8-LookAhead/BaseOS/x86_64/os/"
+lang en_US.UTF-8
+keyboard us
+timezone --utc America/New_York
+clearpart --all
+autopart
+rootpw --plaintext weakpassword
+user --name=test --password=weakpassword --plaintext
+firstboot --enable
+poweroff
+text
+
+%packages
+@^workstation-product-environment
+-selinux-policy-minimum
+%end
+
+%post
+touch $INSTALL_ROOT/home/home_preserved
+%end
+
+%post
+/usr/bin/sed -i 's/^mirrorlist/#mirrorlist/g' /etc/yum.repos.d/Rocky-*.repo
+/usr/bin/sed -i 's,^#\(baseurl=http[s]*://\),\1,g' /etc/yum.repos.d/Rocky-*.repo
+/usr/bin/echo "stg/rocky" > /etc/dnf/vars/contentdir
+%end

desktop-8.ks

@@ -0,0 +1,22 @@
+bootloader --location=mbr
+network --bootproto=dhcp
+url --url="https://download.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os/"
+lang en_US.UTF-8
+keyboard us
+timezone --utc America/New_York
+clearpart --all
+autopart
+rootpw --plaintext weakpassword
+user --name=test --password=weakpassword --plaintext
+firstboot --enable
+poweroff
+text
+
+%packages
+@^workstation-product-environment
+-selinux-policy-minimum
+%end
+
+%post
+touch $INSTALL_ROOT/home/home_preserved
+%end

desktop.ks

@@ -1,6 +1,6 @@
 bootloader --location=mbr
 network --bootproto=dhcp
-url --url="https://download.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os/"
+url --url="https://download.rockylinux.org/pub/rocky/9/BaseOS/x86_64/os/"
 lang en_US.UTF-8
 keyboard us
 timezone --utc America/New_York
@@ -10,6 +10,7 @@ rootpw --plaintext weakpassword
 user --name=test --password=weakpassword --plaintext
 firstboot --enable
 poweroff
+text
 
 %packages
 @^workstation-product-environment

desktopencrypt-8-BETA.ks

@@ -0,0 +1,24 @@
+bootloader --location=mbr
+network --bootproto=dhcp
+url --url="https://download.rockylinux.org/stg/rocky/8-BETA/BaseOS/x86_64/os/"
+lang en_US.UTF-8
+keyboard us
+timezone --utc America/New_York
+clearpart --all
+autopart --encrypted --passphrase=weakpassword
+rootpw --plaintext weakpassword
+user --name=test --password=weakpassword --plaintext
+firstboot --enable
+poweroff
+text
+
+%packages
+@^workstation-product-environment
+-selinux-policy-minimum
+%end
+
+%post
+/usr/bin/sed -i 's/^mirrorlist/#mirrorlist/g' /etc/yum.repos.d/Rocky-*.repo
+/usr/bin/sed -i 's,^#\(baseurl=http[s]*://\),\1,g' /etc/yum.repos.d/Rocky-*.repo
+/usr/bin/echo "stg/rocky" > /etc/dnf/vars/contentdir
+%end

desktopencrypt-8-LookAhead.ks

@@ -0,0 +1,24 @@
+bootloader --location=mbr
+network --bootproto=dhcp
+url --url="https://download.rockylinux.org/stg/rocky/8-LookAhead/BaseOS/x86_64/os/"
+lang en_US.UTF-8
+keyboard us
+timezone --utc America/New_York
+clearpart --all
+autopart --encrypted --passphrase=weakpassword
+rootpw --plaintext weakpassword
+user --name=test --password=weakpassword --plaintext
+firstboot --enable
+poweroff
+text
+
+%packages
+@^workstation-product-environment
+-selinux-policy-minimum
+%end
+
+%post
+/usr/bin/sed -i 's/^mirrorlist/#mirrorlist/g' /etc/yum.repos.d/Rocky-*.repo
+/usr/bin/sed -i 's,^#\(baseurl=http[s]*://\),\1,g' /etc/yum.repos.d/Rocky-*.repo
+/usr/bin/echo "stg/rocky" > /etc/dnf/vars/contentdir
+%end

desktopencrypt-8-aarch64.ks

@@ -0,0 +1,18 @@
+bootloader --location=mbr --append="console=tty0 quiet"
+network --bootproto=dhcp
+url --url="https://download.rockylinux.org/pub/rocky/8/BaseOS/aarch64/os/"
+lang en_US.UTF-8
+keyboard us
+timezone --utc America/New_York
+clearpart --all
+autopart --encrypted --passphrase=weakpassword
+rootpw --plaintext weakpassword
+user --name=test --password=weakpassword --plaintext
+firstboot --enable
+poweroff
+text
+
+%packages
+@^workstation-product-environment
+-selinux-policy-minimum
+%end

desktopencrypt-8.ks

@@ -0,0 +1,18 @@
+bootloader --location=mbr
+network --bootproto=dhcp
+url --url="https://download.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os/"
+lang en_US.UTF-8
+keyboard us
+timezone --utc America/New_York
+clearpart --all
+autopart --encrypted --passphrase=weakpassword
+rootpw --plaintext weakpassword
+user --name=test --password=weakpassword --plaintext
+firstboot --enable
+poweroff
+text
+
+%packages
+@^workstation-product-environment
+-selinux-policy-minimum
+%end

desktopencrypt-aarch64.ks

@@ -1,6 +1,6 @@
 bootloader --location=mbr --append="console=tty0 quiet"
 network --bootproto=dhcp
-url --url="https://download.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os/"
+url --url="https://download.rockylinux.org/pub/rocky/9/BaseOS/aarch64/os/"
 lang en_US.UTF-8
 keyboard us
 timezone --utc America/New_York
@@ -10,6 +10,7 @@ rootpw --plaintext weakpassword
 user --name=test --password=weakpassword --plaintext
 firstboot --enable
 poweroff
+text
 
 %packages
 @^workstation-product-environment

desktopencrypt.ks

@@ -1,6 +1,6 @@
 bootloader --location=mbr
 network --bootproto=dhcp
-url --url="https://download.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os/"
+url --url="https://download.rockylinux.org/pub/rocky/9/BaseOS/x86_64/os/"
 lang en_US.UTF-8
 keyboard us
 timezone --utc America/New_York
@@ -10,6 +10,7 @@ rootpw --plaintext weakpassword
 user --name=test --password=weakpassword --plaintext
 firstboot --enable
 poweroff
+text
 
 %packages
 @^workstation-product-environment

hdds.json

@@ -2,19 +2,19 @@
     "guestfs" : [
         {
             "name" : "full",
-            "size" : "10G",
+            "size" : "25G",
             "labels" : ["mbr", "gpt"],
             "parts" : [
                 {
                     "filesystem" : "ext4",
                     "type" : "p",
                     "start" : "4096",
-                    "end" : "10485760"
+                    "end" : "26214400"
                 },
                 {
                     "filesystem" : "ext4",
                     "type" : "p",
-                    "start" : "10485761",
+                    "start" : "26214401",
                     "end" : "-4097"
                 }
             ],
@@ -52,7 +52,7 @@
             ]
         },
         {
-            "name" : "ks",
+            "name" : "ks-8",
             "size" : "100M",
             "parts" : [
                 {
@@ -66,7 +66,36 @@
                 {
                     "part" : "1",
                     "target" : "/root-user-crypted-net.ks",
-                    "source" : "root-user-crypted-net.ks"
+                    "source" : "root-user-crypted-net-8.ks"
+                },
+                {
+                    "part" : "1",
+                    "target" : "/freeipa.ks",
+                    "source" : "freeipa.ks"
+                },
+                {
+                    "part" : "1",
+                    "target" : "/freeipaclient.ks",
+                    "source" : "freeipaclient.ks"
+                }
+            ]
+        },
+        {
+            "name" : "ks-9",
+            "size" : "100M",
+            "parts" : [
+                {
+                    "filesystem" : "ext4",
+                    "type" : "p",
+                    "start" : "4096",
+                    "end" : "-1"
+                }
+            ],
+            "uploads" : [
+                {
+                    "part" : "1",
+                    "target" : "/root-user-crypted-net.ks",
+                    "source" : "root-user-crypted-net-9.ks"
                 },
                 {
                     "part" : "1",
@@ -125,48 +154,63 @@
         {
             "name" : "minimal",
             "releases" : {
-                "8.5" : ["x86_64", "aarch64"]
+                "8" : ["x86_64", "aarch64"],
+                "8-BETA" : ["x86_64"],
+                "8-LookAhead" : ["x86_64"],
+                "9" : ["x86_64", "aarch64"]
             },
-            "size" : "10"
+            "size" : "15"
         },
         {
             "name" : "minimal-uefi",
             "releases" : {
-                "8.5" : ["x86_64", "aarch64"]
+                "8" : ["x86_64", "aarch64"],
+                "8-BETA" : ["x86_64"],
+                "8-LookAhead" : ["x86_64"],
+                "9" : ["x86_64", "aarch64"]
             },
-            "size" : "10",
+            "size" : "15",
             "bootopts": "uefi"
         },
         {
             "name" : "desktop",
             "releases" : {
-                "8.5": ["x86_64", "aarch64"]
+                "8": ["x86_64", "aarch64"],
+                "8-BETA" : ["x86_64"],
+                "8-LookAhead" : ["x86_64"],
+                "9" : ["x86_64", "aarch64"]
             },
-            "size" : "20",
-            "variant": "Workstation"
+            "size" : "20"
         },
         {
             "name" : "desktopencrypt",
             "releases" : {
-                "8.5" : ["x86_64", "aarch64"]
+                "8" : ["x86_64", "aarch64"],
+                "8-BETA" : ["x86_64"],
+                "8-LookAhead" : ["x86_64"],
+                "9" : ["x86_64", "aarch64"]
             },
-            "size" : "20",
-            "variant": "Workstation"
+            "size" : "20"
         },
         {
             "name" : "server",
             "releases" : {
-                "8.5" : ["x86_64", "aarch64"]
+                "8" : ["x86_64", "aarch64"],
+                "8-BETA" : ["x86_64"],
+                "8-LookAhead" : ["x86_64"],
+                "9" : ["x86_64", "aarch64"]
             },
-            "size" : "7",
-            "variant": "Server"
+            "size" : "9"
         },
         {
             "name" : "support",
             "releases" : {
-                "8.5" : ["x86_64", "aarch64"]
+                "8" : ["x86_64", "aarch64"],
+                "8-BETA" : ["x86_64"],
+                "8-LookAhead" : ["x86_64"],
+                "9" : ["x86_64", "aarch64"]
             },
-            "size" : "11"
+            "size" : "36"
         }
     ],
     "renames" : []

minimal-8-BETA.ks

@@ -0,0 +1,21 @@
+bootloader --location=mbr
+network --bootproto=dhcp
+url --url="https://download.rockylinux.org/stg/rocky/8-BETA/BaseOS/x86_64/os/"
+lang en_US.UTF-8
+keyboard us
+timezone --utc America/New_York
+clearpart --all
+autopart
+rootpw weakpassword
+poweroff
+text
+
+%packages
+@core
+%end
+
+%post
+/usr/bin/sed -i 's/^mirrorlist/#mirrorlist/g' /etc/yum.repos.d/Rocky-*.repo
+/usr/bin/sed -i 's,^#\(baseurl=http[s]*://\),\1,g' /etc/yum.repos.d/Rocky-*.repo
+/usr/bin/echo "stg/rocky" > /etc/dnf/vars/contentdir
+%end

minimal-8-LookAhead.ks

@@ -0,0 +1,21 @@
+bootloader --location=mbr
+network --bootproto=dhcp
+url --url="https://download.rockylinux.org/stg/rocky/8-LookAhead/BaseOS/x86_64/os/"
+lang en_US.UTF-8
+keyboard us
+timezone --utc America/New_York
+clearpart --all
+autopart
+rootpw weakpassword
+poweroff
+text
+
+%packages
+@core
+%end
+
+%post
+/usr/bin/sed -i 's/^mirrorlist/#mirrorlist/g' /etc/yum.repos.d/Rocky-*.repo
+/usr/bin/sed -i 's,^#\(baseurl=http[s]*://\),\1,g' /etc/yum.repos.d/Rocky-*.repo
+/usr/bin/echo "stg/rocky" > /etc/dnf/vars/contentdir
+%end

minimal-8.ks

@@ -0,0 +1,15 @@
+bootloader --location=mbr
+network --bootproto=dhcp
+url --url="https://download.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os/"
+lang en_US.UTF-8
+keyboard us
+timezone --utc America/New_York
+clearpart --all
+autopart
+rootpw weakpassword
+poweroff
+text
+
+%packages
+@core
+%end

minimal-uefi-8-BETA.ks

@@ -0,0 +1,25 @@
+bootloader --location=mbr
+network --bootproto=dhcp
+url --url="https://download.rockylinux.org/stg/rocky/8-BETA/BaseOS/x86_64/os/"
+lang en_US.UTF-8
+keyboard us
+timezone --utc America/New_York
+clearpart --all
+autopart
+rootpw weakpassword
+poweroff
+text
+
+%packages
+@core
+%end
+
+%post
+touch $INSTALL_ROOT/home/home_preserved
+%end
+
+%post
+/usr/bin/sed -i 's/^mirrorlist/#mirrorlist/g' /etc/yum.repos.d/Rocky-*.repo
+/usr/bin/sed -i 's,^#\(baseurl=http[s]*://\),\1,g' /etc/yum.repos.d/Rocky-*.repo
+/usr/bin/echo "stg/rocky" > /etc/dnf/vars/contentdir
+%end

minimal-uefi-8-LookAhead.ks

@@ -0,0 +1,25 @@
+bootloader --location=mbr
+network --bootproto=dhcp
+url --url="https://download.rockylinux.org/stg/rocky/8-LookAhead/BaseOS/x86_64/os/"
+lang en_US.UTF-8
+keyboard us
+timezone --utc America/New_York
+clearpart --all
+autopart
+rootpw weakpassword
+poweroff
+text
+
+%packages
+@core
+%end
+
+%post
+touch $INSTALL_ROOT/home/home_preserved
+%end
+
+%post
+/usr/bin/sed -i 's/^mirrorlist/#mirrorlist/g' /etc/yum.repos.d/Rocky-*.repo
+/usr/bin/sed -i 's,^#\(baseurl=http[s]*://\),\1,g' /etc/yum.repos.d/Rocky-*.repo
+/usr/bin/echo "stg/rocky" > /etc/dnf/vars/contentdir
+%end

minimal-uefi-8.ks

@@ -0,0 +1,19 @@
+bootloader --location=mbr
+network --bootproto=dhcp
+url --url="https://download.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os/"
+lang en_US.UTF-8
+keyboard us
+timezone --utc America/New_York
+clearpart --all
+autopart
+rootpw weakpassword
+poweroff
+text
+
+%packages
+@core
+%end
+
+%post
+touch $INSTALL_ROOT/home/home_preserved
+%end

minimal-uefi.ks

@@ -1,6 +1,6 @@
 bootloader --location=mbr
 network --bootproto=dhcp
-url --url="https://download.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os/"
+url --url="https://download.rockylinux.org/pub/rocky/9/BaseOS/x86_64/os/"
 lang en_US.UTF-8
 keyboard us
 timezone --utc America/New_York
@@ -8,6 +8,7 @@ clearpart --all
 autopart
 rootpw weakpassword
 poweroff
+text
 
 %packages
 @core

minimal.ks

@@ -1,6 +1,6 @@
 bootloader --location=mbr
 network --bootproto=dhcp
-url --url="https://download.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os/"
+url --url="https://download.rockylinux.org/pub/rocky/9/BaseOS/x86_64/os/"
 lang en_US.UTF-8
 keyboard us
 timezone --utc America/New_York
@@ -8,6 +8,7 @@ clearpart --all
 autopart
 rootpw weakpassword
 poweroff
+text
 
 %packages
 @core

server-8-BETA.ks

@@ -0,0 +1,23 @@
+bootloader --location=mbr
+network --bootproto=dhcp
+url --url="https://download.rockylinux.org/stg/rocky/8-BETA/BaseOS/x86_64/os/"
+lang en_US.UTF-8
+keyboard us
+timezone --utc America/New_York
+clearpart --all
+autopart
+rootpw weakpassword
+user --name=test --password=weakpassword --plaintext
+poweroff
+text
+
+%packages
+@^server-product-environment
+plymouth-system-theme
+%end
+
+%post
+/usr/bin/sed -i 's/^mirrorlist/#mirrorlist/g' /etc/yum.repos.d/Rocky-*.repo
+/usr/bin/sed -i 's,^#\(baseurl=http[s]*://\),\1,g' /etc/yum.repos.d/Rocky-*.repo
+/usr/bin/echo "stg/rocky" > /etc/dnf/vars/contentdir
+%end

server-8-LookAhead.ks

@@ -0,0 +1,23 @@
+bootloader --location=mbr
+network --bootproto=dhcp
+url --url="https://download.rockylinux.org/stg/rocky/8-LookAhead/BaseOS/x86_64/os/"
+lang en_US.UTF-8
+keyboard us
+timezone --utc America/New_York
+clearpart --all
+autopart
+rootpw weakpassword
+user --name=test --password=weakpassword --plaintext
+poweroff
+text
+
+%packages
+@^server-product-environment
+plymouth-system-theme
+%end
+
+%post
+/usr/bin/sed -i 's/^mirrorlist/#mirrorlist/g' /etc/yum.repos.d/Rocky-*.repo
+/usr/bin/sed -i 's,^#\(baseurl=http[s]*://\),\1,g' /etc/yum.repos.d/Rocky-*.repo
+/usr/bin/echo "stg/rocky" > /etc/dnf/vars/contentdir
+%end

server-8.ks

@@ -0,0 +1,17 @@
+bootloader --location=mbr
+network --bootproto=dhcp
+url --url="https://download.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os/"
+lang en_US.UTF-8
+keyboard us
+timezone --utc America/New_York
+clearpart --all
+autopart
+rootpw weakpassword
+user --name=test --password=weakpassword --plaintext
+poweroff
+text
+
+%packages
+@^server-product-environment
+plymouth-system-theme
+%end

server.ks

@@ -1,6 +1,6 @@
 bootloader --location=mbr
 network --bootproto=dhcp
-url --url="https://download.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os/"
+url --url="https://download.rockylinux.org/pub/rocky/9/BaseOS/x86_64/os/"
 lang en_US.UTF-8
 keyboard us
 timezone --utc America/New_York
@@ -9,6 +9,7 @@ autopart
 rootpw weakpassword
 user --name=test --password=weakpassword --plaintext
 poweroff
+text
 
 %packages
 @^server-product-environment

support-8-BETA.ks

@@ -0,0 +1,26 @@
+bootloader --location=mbr
+network --bootproto=dhcp
+url --url="https://download.rockylinux.org/stg/rocky/8-BETA/BaseOS/x86_64/os/"
+#repo --name="epel" --baseurl="http://mirrors.kernel.org/fedora-epel/8/Everything/x86_64/"
+# use epel to keep scsi-target-utils instead of targetcli
+lang en_US.UTF-8
+keyboard us
+timezone --utc America/New_York
+clearpart --all
+autopart
+rootpw weakpassword
+poweroff
+text
+
+%packages
+@core
+targetcli
+nfs-utils
+dnsmasq
+%end
+
+%post
+/usr/bin/sed -i 's/^mirrorlist/#mirrorlist/g' /etc/yum.repos.d/Rocky-*.repo
+/usr/bin/sed -i 's,^#\(baseurl=http[s]*://\),\1,g' /etc/yum.repos.d/Rocky-*.repo
+/usr/bin/echo "stg/rocky" > /etc/dnf/vars/contentdir
+%end

support-8-LookAhead.ks

@@ -0,0 +1,24 @@
+bootloader --location=mbr
+network --bootproto=dhcp
+url --url="https://download.rockylinux.org/stg/rocky/8-LookAhead/BaseOS/x86_64/os/"
+lang en_US.UTF-8
+keyboard us
+timezone --utc America/New_York
+clearpart --all
+autopart
+rootpw weakpassword
+poweroff
+text
+
+%packages
+@core
+targetcli
+nfs-utils
+dnsmasq
+%end
+
+%post
+/usr/bin/sed -i 's/^mirrorlist/#mirrorlist/g' /etc/yum.repos.d/Rocky-*.repo
+/usr/bin/sed -i 's,^#\(baseurl=http[s]*://\),\1,g' /etc/yum.repos.d/Rocky-*.repo
+/usr/bin/echo "stg/rocky" > /etc/dnf/vars/contentdir
+%end

support-8.ks

@@ -0,0 +1,20 @@
+bootloader --location=mbr
+network --bootproto=dhcp
+url --url="https://download.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os/"
+#repo --name="epel" --baseurl="http://mirrors.kernel.org/fedora-epel/8/Everything/x86_64/"
+# use epel to keep scsi-target-utils instead of targetcli
+lang en_US.UTF-8
+keyboard us
+timezone --utc America/New_York
+clearpart --all
+autopart
+rootpw weakpassword
+poweroff
+text
+
+%packages
+@core
+targetcli
+nfs-utils
+dnsmasq
+%end

support.ks

@@ -1,7 +1,7 @@
 bootloader --location=mbr
 network --bootproto=dhcp
-url --url="https://download.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os/"
-#repo --name="epel" --baseurl="http://mirrors.kernel.org/fedora-epel/8/Everything/x86_64/"
+url --url="https://download.rockylinux.org/pub/rocky/9/BaseOS/x86_64/os/"
+#repo --name="epel" --baseurl="http://mirrors.kernel.org/fedora-epel/9/Everything/x86_64/"
 # use epel to keep scsi-target-utils instead of targetcli
 lang en_US.UTF-8
 keyboard us
@@ -10,6 +10,7 @@ clearpart --all
 autopart
 rootpw weakpassword
 poweroff
+text
 
 %packages
 @core

uploads/freeipa.ks

@@ -1,6 +1,6 @@
 cdrom
 bootloader --location=mbr
-network --device=link --activate --bootproto=static --ip=172.16.2.100 --netmask=255.255.255.0 --gateway=172.16.2.2 --hostname=ipa001.test.openqa.fedoraproject.org
+network --device=link --activate --bootproto=static --ip=172.16.2.100 --netmask=255.255.255.0 --gateway=172.16.2.2 --hostname=ipa001.test.openqa.rockylinux.org
 lang en_US.UTF-8
 keyboard us
 timezone --utc America/New_York

uploads/freeipaclient.ks

@@ -1,6 +1,6 @@
 cdrom
 bootloader --location=mbr
-network --device=link --activate --bootproto=static --ip=172.16.2.101 --netmask=255.255.255.0 --gateway=172.16.2.2 --hostname=client001.test.openqa.fedoraproject.org --nameserver=172.16.2.100
+network --device=link --activate --bootproto=static --ip=172.16.2.101 --netmask=255.255.255.0 --gateway=172.16.2.2 --hostname=client001.test.openqa.rockylinux.org --nameserver=172.16.2.100
 lang en_US.UTF-8
 keyboard us
 timezone --utc America/New_York
@@ -11,4 +11,4 @@ autopart
 %end
 rootpw anaconda
 reboot
-realm join --one-time-password=monkeys ipa001.test.openqa.fedoraproject.org
+realm join --one-time-password=monkeys ipa001.test.openqa.rockylinux.org

uploads/root-user-crypted-net-9.ks

@@ -0,0 +1,17 @@
+bootloader --location=mbr
+network --device=link --activate --bootproto=dhcp
+url --url="https://download.rockylinux.org/pub/rocky/9/BaseOS/x86_64/os/"
+lang en_US.UTF-8
+keyboard us
+timezone --utc America/New_York
+clearpart --all
+autopart
+
+rootpw --iscrypted $6$ansiogjasd0io9u3$9E1vMbLbXW14grtguedFGVjvhyBz1T.KIA3MJl1SWnGbtTpiXIAjbazIQAUKRNkNIEmd3mI0NCkFIVBrN41fZ.
+user --name=test --password=$6$ansioasgfgadsghd$O8O8zom5hx.V8ib1jV91xuvIgYqA2b99tzhibkk3URITdCrDtbRbwJjMK1kW4l0/9W0brraGC4NUBtDoGv4Kl. --iscrypted
+
+reboot
+
+%packages
+@core
+%end