From d88901024cfe2bbd89ac7d4d5ea54cc097c7f888 Mon Sep 17 00:00:00 2001
From: bms8197 <bogdan@898.ro>
Date: Tue, 28 Jun 2022 13:58:41 +0300
Subject: [PATCH] committing changes in /etc made by "-bash"

Package changes:
---
 .etckeeper             |  3 ++-
 dkms/framework.conf    |  9 ++++++---
 dkms/sign_helper.sh    |  2 --
 kernel/install.d/dkms  | 10 +++++-----
 kernel/postinst.d/dkms | 17 ++++++++---------
 kernel/prerm.d/dkms    | 16 +++++++---------
 6 files changed, 28 insertions(+), 29 deletions(-)
 delete mode 100755 dkms/sign_helper.sh

diff --git a/.etckeeper b/.etckeeper
index 39b95a9..57e5763 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -18,6 +18,7 @@ mkdir -p './cron.weekly'
 mkdir -p './crypto-policies/policies/modules'
 mkdir -p './cxs/newusers'
 mkdir -p './dbus-1/session.d'
+mkdir -p './dkms/framework.conf.d'
 mkdir -p './dnf/aliases.d'
 mkdir -p './dnf/modules.defaults.d'
 mkdir -p './dnf/plugins/copr.d'
@@ -485,7 +486,7 @@ maybe chmod 0755 'dhcp/dhclient.d'
 maybe chmod 0755 'dhcp/dhclient.d/chrony.sh'
 maybe chmod 0755 'dkms'
 maybe chmod 0644 'dkms/framework.conf'
-maybe chmod 0755 'dkms/sign_helper.sh'
+maybe chmod 0755 'dkms/framework.conf.d'
 maybe chmod 0755 'dnf'
 maybe chmod 0755 'dnf/aliases.d'
 maybe chmod 0644 'dnf/dnf.conf'
diff --git a/dkms/framework.conf b/dkms/framework.conf
index 0a43d5d..3bb62d2 100644
--- a/dkms/framework.conf
+++ b/dkms/framework.conf
@@ -25,9 +25,12 @@
 # non-null value:
 # autoinstall_all_kernels=""
 
-# Script to sign modules during build, script is called with kernel version
-# and module name:
-# sign_tool="/etc/dkms/sign_helper.sh"
+# Location of the sign-file kernel binary (default: depends on distributioin):
+# sign_file="/path/to/sign-file"
+
+# Location of the key and certificate used for Secure boot (default: /var/lib/dkms):
+# mok_signing_key: /var/lib/dkms/mok.key
+# mok_certificate: /var/lib/dkms/mok.pub
 
 # Automatically modprobe the built modules upon succesful installation:
 modprobe_on_install="true"
diff --git a/dkms/sign_helper.sh b/dkms/sign_helper.sh
deleted file mode 100755
index 441661e..0000000
--- a/dkms/sign_helper.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/lib/modules/"$1"/build/scripts/sign-file sha512 /root/dkms.key /root/dkms.der "$2"
diff --git a/kernel/install.d/dkms b/kernel/install.d/dkms
index f1b3b38..ae23156 100755
--- a/kernel/install.d/dkms
+++ b/kernel/install.d/dkms
@@ -1,9 +1,9 @@
-#!/bin/bash
+#!/bin/sh
 
-if [[ "$1" == "add" ]]; then
-	/etc/kernel/postinst.d/dkms $2
+if [ "$1" = "add" ]; then
+	/etc/kernel/postinst.d/dkms "$2"
 fi
 
-if [[ "$1" == "remove" ]]; then
-	/etc/kernel/prerm.d/dkms $2
+if [ "$1" = "remove" ]; then
+	/etc/kernel/prerm.d/dkms "$2"
 fi
diff --git a/kernel/postinst.d/dkms b/kernel/postinst.d/dkms
index c90c2d6..c0b9cda 100755
--- a/kernel/postinst.d/dkms
+++ b/kernel/postinst.d/dkms
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # We're passed the version of the kernel being installed
 inst_kern=$1
@@ -11,17 +11,16 @@ _get_kernel_dir() {
        Linux)          DIR="/lib/modules/$KVER/build" ;;
        GNU/kFreeBSD)   DIR="/usr/src/kfreebsd-headers-$KVER/sys" ;;
     esac
-    echo $DIR
+    echo "$DIR"
 }
 
 _check_kernel_dir() {
-    DIR=$(_get_kernel_dir $1)
+    DIR=$(_get_kernel_dir "$1")
     case ${uname_s} in
-       Linux)          test -e $DIR/include ;;
-       GNU/kFreeBSD)   test -e $DIR/kern && test -e $DIR/conf/kmod.mk ;;
-       *)              return 1 ;;
+       Linux)          test -e "$DIR/include" ;;
+       GNU/kFreeBSD)   test -e "$DIR/kern" && test -e "$DIR/conf/kmod.mk" ;;
+       *)              false ;;
     esac
-    return $?
 }
 
 case "${uname_s}" in
@@ -36,10 +35,10 @@ case "${uname_s}" in
 esac
 
 if [ -x /usr/lib/dkms/dkms_autoinstaller ]; then
-    exec /usr/lib/dkms/dkms_autoinstaller start $inst_kern
+    exec /usr/lib/dkms/dkms_autoinstaller start "$inst_kern"
 fi
 
-if ! _check_kernel_dir $inst_kern ; then
+if ! _check_kernel_dir "$inst_kern" ; then
     echo "dkms: WARNING: $kernel headers are missing, which may explain the above failures." >&2
     echo "      please install the $header_pkg package to fix this." >&2
 fi
diff --git a/kernel/prerm.d/dkms b/kernel/prerm.d/dkms
index 55c5991..aeb8e3a 100755
--- a/kernel/prerm.d/dkms
+++ b/kernel/prerm.d/dkms
@@ -1,16 +1,14 @@
-#!/bin/bash
+#!/bin/sh
 
 # We're passed the version of the kernel being removed
 inst_kern=$1
 
-if [ -x /usr/sbin/dkms ]; then
-while read line; do
-   name=`echo "$line" | awk '{print $1}' | sed 's/,$//' | cut -d'/' -f1`
-   vers=`echo "$line" | awk '{print $1}' | sed 's/,$//' | cut -d'/' -f2`
-   arch=`echo "$line" | awk '{print $3}' | sed 's/:$//'`
-   echo "dkms: removing: $name $vers ($inst_kern) ($arch)" >&2
-   dkms remove -m $name -v $vers -k $inst_kern -a $arch
-done < <(dkms status -k $inst_kern 2>/dev/null | grep ": installed")
+if command -v dkms > /dev/null; then
+	dkms status -k "$inst_kern" 2>/dev/null | while IFS=",:/ " read -r name vers _ arch status; do
+		[ "$status" = "installed" ] || continue
+		echo "dkms: removing: $name $vers ($inst_kern) ($arch)" >&2
+		dkms remove -m "$name" -v "$vers" -k "$inst_kern" -a "$arch"
+	done
 fi
 
 rmdir --ignore-fail-on-non-empty \