Merge remote-tracking branch 'nyxnor/master'

Kicksecure · Aug 12, 2023 · c18d517 · c18d517
2 parents ccad34a + e6c1684
commit c18d517
Show file tree

Hide file tree

Showing 5 changed files with 281 additions and 26 deletions.
diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
@@ -42,25 +42,45 @@ jobs:
                     - image: debian:stable
                     - image: debian:testing
                     - image: ubuntu:latest
-                    - image: linuxmintd/mint21-amd64:latest
+                    - image: linuxmintd/mint21.2-amd64:latest
+                    - image: fedora:latest
 
         container:
             image: ${{ matrix.image }}
 
         steps:
             - uses: actions/checkout@v3
             - name: System Basic Packages
-              run: apt-get update -y && apt-get install -y shellcheck sudo
+              run: |
+                  if command -v apt-get; then
+                    apt-get update -y && apt-get install -y shellcheck sudo
+                  elif command -v dnf; then
+                    dnf update -y && dnf install -y ShellCheck sudo
+                  else
+                    exit 1
+                  fi
             - name: System information
-              run: cat /etc/os-release; uname -a; echo "${PATH}"; cat /etc/sudoers; ls /etc/sudoers.d;
+              run: |
+                  cat /etc/os-release
+                  uname -a
+                  echo "${PATH}"
+                  cat /etc/sudoers
+                  ls /etc/sudoers.d
             - name: Normal user with sudo privileges
               run: |
-                  adduser --gecos "" --disabled-password user
-                  usermod -aG sudo user
-                  echo "%sudo ALL=(ALL) NOPASSWD: ALL" | tee /etc/sudoers.d/user
+                  if test -f /etc/debian_version; then
+                    adduser --gecos "" --disabled-password user
+                    usermod -aG sudo user
+                    echo "%sudo ALL=(ALL) NOPASSWD: ALL" | tee /etc/sudoers.d/user
+                  elif test -f /etc/fedora-release; then
+                    adduser user
+                    usermod -aG wheel user
+                    echo "%wheel ALL=(ALL) NOPASSWD: ALL" | tee /etc/sudoers.d/user
+                  else
+                    exit 1
+                  fi
             - name: Run Installer
-              run: su -s /bin/bash user -- usr/bin/installer-dist -n -l debug -k -D --ci
+              #run: su -s /bin/bash user -- usr/bin/installer-dist -n -l debug -k -D --ci
+              run: sudo -u user -- usr/bin/installer-dist -n -l debug -k -D --ci
             - name: Run Installer ShellCheck
               run: shellcheck usr/bin/installer-dist
-
-# vim: sw=4
diff --git a/man/installer-dist.1.ronn b/man/installer-dist.1.ronn
@@ -44,6 +44,13 @@ Guest and Interface can be set by changing the script name to the format
 
         Set guest's hypervisor. Options: kvm, virtualbox (default).
 
+`--oracle-repo`
+
+        Set Oracle repository for VirtualBox. Default for Fedora based
+        distributions, optional for Debian based distributions, but may
+        be set by the developers if the Debian repository stops serving
+        the VirtualBox package.
+
 `-o`, `--onion`
 
         Make requests over the onion network.