Make kargs.sh work with systemd service and for Ubuntu

Author: e0ne

bindata/manifests/daemon/daemonset.yaml

@@ -116,7 +116,7 @@ spec:
           command:
             - /bin/bash
             - -c
-            - mkdir -p /host/var/lib/sriov/ && cp /usr/bin/sriov-network-config-daemon /host/var/lib/sriov/sriov-network-config-daemon && chcon -t bin_t /host/var/lib/sriov/sriov-network-config-daemon | true # Allow systemd to run the file, use pipe true to not failed if the system doesn't have selinux or apparmor enabled
+            - mkdir -p /host/var/lib/sriov/ && cp /usr/bin/sriov-network-config-daemon /host/var/lib/sriov/sriov-network-config-daemon && chcon -t bin_t /host/var/lib/sriov/sriov-network-config-daemon | true  && cp /bindata/scripts/kargs.sh /host/usr/bin/kargs.sh && chcon -t bin_t /host/usr/bin/kargs.sh | true # Allow systemd to run the file, use pipe true to not failed if the system doesn't have selinux or apparmor enabled
           securityContext:
             privileged: true
           resources:

bindata/scripts/kargs.sh

@@ -5,54 +5,81 @@ command=$1
 shift
 declare -a kargs=( "$@" )
 ret=0
-args=$(chroot /host/ cat /proc/cmdline)
 
-IS_OS_UBUNTU=true; [[ "$(chroot /host/ grep -i ubuntu /etc/os-release -c)" == "0" ]] && IS_OS_UBUNTU=false
+if [[ -d "/bindata/scripts" ]];then
+    chroot_path="/host/"
+else
+    chroot_path="/"
+fi
+
+args=$(chroot "$chroot_path" cat /proc/cmdline)
+
+IS_OS_UBUNTU=true; [[ "$(chroot "$chroot_path" grep -i ubuntu /etc/os-release -c)" == "0" ]] && IS_OS_UBUNTU=false
 
 # Kernel args configuration isn't supported for Ubuntu now, so we shouldn't do anything here
 if ${IS_OS_UBUNTU} ; then
+    grab_config="/etc/default/grub"
+    grub_cmdline=$(chroot "$chroot_path" grep GRUB_CMDLINE_LINUX_DEFAULT $grab_config | awk -F'=' '{gsub(/"/, "", $2); print $2}')
+
+    for t in "${kargs[@]}";do
+        if [[ $command == "add" ]];then
+          if [[ $args != *${t}* ]];then
+              grub_cmdline="$grub_cmdline $t"
+              let ret++
+          fi
+        fi
+        if [[ $command == "remove" ]];then
+          if [[ $grub_cmdline == *${t}* ]];then
+                grub_cmdline=$(echo $grub_cmdline  | sed "s/\b$t\b//g" | sed 's/  */ /g')
+                let ret++
+           fi
+        fi
+    done
+
+    sed -i "/LICENSE_SN_FILE = \"sn\"/c\LICENSE_SN_FILE = '$@'" $grab_config
+
     echo $ret
     exit 0
 fi
 
-if chroot /host/ test -f /run/ostree-booted ; then
+if chroot "$chroot_path" test -f /run/ostree-booted ; then
     for t in "${kargs[@]}";do
         if [[ $command == "add" ]];then
           if [[ $args != *${t}* ]];then
-              if chroot /host/ rpm-ostree kargs | grep -vq ${t}; then
-                  chroot /host/ rpm-ostree kargs --append ${t} > /dev/null 2>&1
+              if chroot "$chroot_path" rpm-ostree kargs | grep -vq ${t}; then
+                  chroot "$chroot_path" rpm-ostree kargs --append ${t} > /dev/null 2>&1
               fi
               let ret++
           fi
         fi
         if [[ $command == "remove" ]];then
           if [[ $args == *${t}* ]];then
-                if chroot /host/ rpm-ostree kargs | grep -q ${t}; then
-                    chroot /host/ rpm-ostree kargs --delete ${t} > /dev/null 2>&1
+                if chroot "$chroot_path" rpm-ostree kargs | grep -q ${t}; then
+                    chroot "$chroot_path" rpm-ostree kargs --delete ${t} > /dev/null 2>&1
                 fi
                 let ret++
             fi
         fi
     done
 else
-    chroot /host/ which grubby > /dev/null 2>&1
+    chroot "$chroot_path" which grubby > /dev/null 2>&1
     # if grubby is not there, let's tell it
     if [ $? -ne 0 ]; then
         exit 127
     fi
     for t in "${kargs[@]}";do
       if [[ $command == "add" ]];then
         if [[ $args != *${t}* ]];then
-            if chroot /host/ grubby --info=DEFAULT | grep args | grep -vq ${t}; then
-                chroot /host/ grubby --update-kernel=DEFAULT --args=${t} > /dev/null 2>&1
+            if chroot "$chroot_path" grubby --info=DEFAULT | grep args | grep -vq ${t}; then
+                chroot "$chroot_path" grubby --update-kernel=DEFAULT --args=${t} > /dev/null 2>&1
             fi
             let ret++
         fi
       fi
       if [[ $command == "remove" ]];then
           if [[ $args == *${t}* ]];then
-            if chroot /host/ grubby --info=DEFAULT | grep args | grep -q ${t}; then
-                chroot /host/ grubby --update-kernel=DEFAULT --remove-args=${t} > /dev/null 2>&1
+            if chroot "$chroot_path" grubby --info=DEFAULT | grep args | grep -q ${t}; then
+                chroot "$chroot_path" grubby --update-kernel=DEFAULT --remove-args=${t} > /dev/null 2>&1
             fi
             let ret++
           fi

pkg/plugins/generic/generic_plugin.go

@@ -81,7 +81,8 @@ type genericPluginOptions struct {
 	skipBridgeConfiguration bool
 }
 
-const scriptsPath = "bindata/scripts/kargs.sh"
+const daemonScriptsPath = "bindata/scripts/kargs.sh"
+const systemdScriptsPath = "/usr/bin/kargs.sh"
 
 // Initialize our plugin and set up initial values
 func NewGenericPlugin(helpers helper.HostHelpersInterface, options ...Option) (plugin.VendorPlugin, error) {
@@ -277,7 +278,11 @@ func needDriverCheckVdpaType(state *sriovnetworkv1.SriovNetworkNodeState, driver
 // editKernelArg Tries to add the kernel args via ostree or grubby.
 func editKernelArg(helper helper.HostHelpersInterface, mode, karg string) error {
 	log.Log.Info("generic plugin editKernelArg()", "mode", mode, "karg", karg)
-	_, _, err := helper.RunCommand("/bin/sh", scriptsPath, mode, karg)
+	script := daemonScriptsPath
+	if vars.UsingSystemdMode {
+		script = systemdScriptsPath
+	}
+	_, _, err := helper.RunCommand("/bin/sh", script, mode, karg)
 	if err != nil {
 		// if grubby is not there log and assume kernel args are set correctly.
 		if utils.IsCommandNotFound(err) {