fix fix useradd

create-image.sh

@@ -2,7 +2,7 @@
 
 set -x
 
-APPLIANCE_NAME="Rocky-9-aarch64-minimal"
+APPLIANCE_NAME="Rocky-9-aarch64-Orange-Pi-5-minimal"
 KICKSTARTER_FILENAME="${APPLIANCE_NAME}.ks"
 IMAGE_NAME="${APPLIANCE_NAME}-$(TZ='UTC' date +%Y.%m.%d-%H%M%S).raw"
 COMPRESSED_IMAGE_NAME="${IMAGE_NAME}.zst"
@@ -22,34 +22,34 @@ if ! command -v shasum > /dev/null; then
     exit 1
 fi
 
-{
-    appliance-creator \
-        --config "${KICKSTARTER_FILENAME}" \
-        --name "${APPLIANCE_NAME}" \
-        --format raw \
-        --no-compress \
-        --outdir "${PWD}" \
-        --cache "/root/cache" \
-        --debug \
-        --verbose
-        # DO NOT USE THE '--checksum' OPTION BECAUSE, FOR SOME REASON
-        # UTF8 ERRORS ARE GENERATED DURING IMAGE CREATION
-        # AND THE IMAGE CREATION STEP FAILS
-        #--checksum \
+appliance-creator \
+    --config "${KICKSTARTER_FILENAME}" \
+    --name "${APPLIANCE_NAME}" \
+    --format raw \
+    --no-compress \
+    --outdir "${PWD}" \
+    --debug \
+    --verbose
+    # DO NOT USE THE '--checksum' OPTION BECAUSE, FOR SOME REASON
+    # UTF8 ERRORS ARE GENERATED DURING IMAGE CREATION
+    # AND THE IMAGE CREATION STEP FAILS
+    #--checksum \
+    # DO NOT USE THE '--cache' OPTION SINCE IT USES OLDER VERSIONS
+    # OF PACKAGES, WHICH IS THE WORST WHEN TESTING CHANGES:w
+    #--cache "/root/cache" \
 
-    if [[ -d "${APPLIANCE_NAME}" ]]; then
+if [[ -d "${APPLIANCE_NAME}" ]]; then
 
-        pushd "${APPLIANCE_NAME}" || exit 1
-        mv -v -f "${APPLIANCE_NAME}-sda.raw" "${IMAGE_NAME}"
-        zstd -9 -z "${IMAGE_NAME}"
+    pushd "${APPLIANCE_NAME}" || exit 1
+    mv -v -f "${APPLIANCE_NAME}-sda.raw" "${IMAGE_NAME}"
+    zstd -9 -z "${IMAGE_NAME}"
 
-        sha256sum "${IMAGE_NAME}" > "${IMAGE_NAME}.sha256"
-        sha512sum "${IMAGE_NAME}" > "${IMAGE_NAME}.sha512"
-        sha256sum "${COMPRESSED_IMAGE_NAME}" > "${COMPRESSED_IMAGE_NAME}.sha256"
-        sha512sum "${COMPRESSED_IMAGE_NAME}" > "${COMPRESSED_IMAGE_NAME}.sha512"
-        popd || exit 1
+    sha256sum "${IMAGE_NAME}" > "${IMAGE_NAME}.sha256"
+    sha512sum "${IMAGE_NAME}" > "${IMAGE_NAME}.sha512"
+    sha256sum "${COMPRESSED_IMAGE_NAME}" > "${COMPRESSED_IMAGE_NAME}.sha256"
+    sha512sum "${COMPRESSED_IMAGE_NAME}" > "${COMPRESSED_IMAGE_NAME}.sha512"
+    popd || exit 1
 
-        echo 'DONE'
-        echo "Please chown '${APPLIANCE_NAME}/' if necessary"
-    fi
-} 1> "${APPLIANCE_NAME}.1.stdout.log" 2> "${APPLIANCE_NAME}.2.stderr.log"
+    echo 'DONE'
+    echo "Please chown '${APPLIANCE_NAME}/' if necessary"
+fi

includes/bootloader-stuff.ksi

@@ -14,11 +14,6 @@ dnf list installed | grep 'dracut-config-generic' > /dev/null && \
 #    /lib/kernel/install.d/10-devicetree.install remove
 #fi
 
-# remove '/boot/dtb' because the kernel should use '/boot/dtb'
-if [ -d /boot/dtb ]; then
-    rm -r -v -f /boot/dtb
-fi
-
 # Kernel selection at boot
 cat << EOF > /etc/sysconfig/kernel
 # This file was generated by the Kickstart repository used to create this disk image

includes/package-list.ksi

@@ -2,7 +2,6 @@
 
 # Include packages that are basic and also packages that are expected to be present
 @core
-@standard
 
 # Extra packages to do 'uboot -> grub -> linux'
 dracut-config-generic
@@ -19,15 +18,16 @@ systemd-udev
 uboot-tools
 uboot-images-armv8
 # Raspberry Pi firmware
-bcm283x-firmware # this will pull in other RPi related firmware ;)
+#bcm283x-firmware # this will pull in other RPi related firmware ;)
 # Raspberry Pi overlays
-bcm283x-overlays
+#bcm283x-overlays
 
 # Kernel selection
 ## mainline (the latest "stable" release from kernel.org)
-kernel-ml # TODO: change this to whatever <sig-kernel> ends up using
+#kernel-ml # TODO: change this to whatever <sig-kernel> ends up using
 ## LTS (the latest "longterm" release from kernel.org)
 #kernel-lt # TODO: change this to whatever <sig-kernel> ends up using
+kernel-opi5
 
 # Other packages
 bash-completion
@@ -47,6 +47,5 @@ tmux
 # Remove some packages
 -dracut-config-rescue
 -java-11-*
--kmod-kvdo
 
 %end

includes/post-install.ksi

@@ -10,7 +10,7 @@ DEFAULT_USERNAME='rocky'
 DEFAULT_PASSWORD='rockylinux'
 DEFAULT_GROUPS='wheel'
 
-useradd --comment "Rocky Linux" \
+/sbin/useradd --comment "Rocky Linux" \
     --uid 1000 \
     --create-home \
     --user-group "${DEFAULT_USERNAME}" \

includes/rocky-9-repos.ksi

@@ -5,14 +5,14 @@ url --url=https://download.rockylinux.org/pub/rocky/9/BaseOS/aarch64/os
 # the 'kernel-*' packages are disabled from these "default" repositories
 # because we will use either the LTS kernel or the latest mainline kernel
 # from the '<sig-kernel>' repo
-repo --install --name=AppStream   --mirrorlist=https://mirrors.rockylinux.org/mirrorlist?repo=AppStream-9&arch=aarch64
-repo --install --name=BaseOS      --mirrorlist=https://mirrors.rockylinux.org/mirrorlist?repo=BaseOS-9&arch=aarch64
-repo --install --name=CRB         --mirrorlist=https://mirrors.rockylinux.org/mirrorlist?repo=CRB-9&arch=aarch64
-repo --install --name=SIG-AltArch --mirrorlist=https://mirrors.rockylinux.org/mirrorlist?repo=rocky-sig-altarch-common-9&arch=aarch64
+repo --install --name=AppStream   --baseurl=https://download.rockylinux.org/pub/rocky/9/AppStream/aarch64/os
+repo --install --name=BaseOS      --baseurl=https://download.rockylinux.org/pub/rocky/9/BaseOS/aarch64/os
+repo --install --name=CRB         --baseurl=https://download.rockylinux.org/pub/rocky/9/CRB/aarch64/os
+repo --install --name=SIG-AltArch --baseurl=https://download.rockylinux.org/pub/sig/9/altarch/aarch64/altarch-common
 
 # Enable EPEL
 # TODO: disable this
-repo --install --name=EPEL --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=epel-9&arch=aarch64
+repo --install --name=EPEL --baseurl=https://dl.fedoraproject.org/pub/epel/$releasever/Everything/aarch64
 
 # Enable the Kernel ELRepo for the mainline kernel
 # TODO: disable this after <sig-kernel> is ready
@@ -22,7 +22,7 @@ repo --install --name=ELRepo-Kernel --mirrorlist=http://mirrors.elrepo.org/mirro
 # Pratham Patel's (thefossguy) COPR for SIG/AltArch stuff
 # Enable this for the following SBCs:
 #   - Orange Pi 5 (non B, non Pro models)
-#repo --install --name=COPR-thefossguy --baseurl=https://download.copr.fedorainfracloud.org/results/prathampatel/rocky-9-sig-altarch/rhel-9-aarch64
+repo --install --name=COPR-thefossguy-OPi5 --baseurl=https://download.copr.fedorainfracloud.org/results/prathampatel/rocky-9-orange-pi-5/rhel-9-aarch64
 
 # Enable two additional repositories
 # <sig-altarch>: All SBC-specific stuff that is not "Enterprise Linux" (uboot, on-board WiFi/BT firmware and other tools)