X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=autoconfig.functions;h=01d2a5770812ed644b465c872e68ecfa0df5a9fd;hb=71e0695dbec19af6e9f0d6633957b40a6223bfab;hp=7638ecca97edf38059723f8a3c19305b52f272a3;hpb=20365ddcfab071d7447b346a6ebf804b56d394b6;p=grml-autoconfig.git

diff --git a/autoconfig.functions b/autoconfig.functions
index 7638ecc..01d2a57 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -512,6 +512,14 @@ config_kernel(){
 
 # {{{ secure boot
 config_secureboot(){
+  # systemd does this for us, but if we are not running under systemd then mokutil
+  # doesn't work as needed as it relies on /sys/firmware/efi/efivars (while
+  # /sys/firmware/efi/vars would exist)
+  if ! $SYSTEMD ; then
+    modprobe efivars
+    mount -t efivars efivarfs /sys/firmware/efi/efivars
+  fi
+
   if [ -x /usr/bin/mokutil ] ; then
     local secstate=$(mokutil --sb-state 2>/dev/null) # "SecureBoot enabled"
     if [ -n "$secstate" ] ; then
@@ -1317,6 +1325,10 @@ if checkbootparam 'startx' && ! echo "$CMDLINE" | grep -q 'startx.*nostartx' ; t
    einfo "Setting up and invoking grml-x ${WINDOWMANAGER}. Just exit X windows system to get full featured consoles."
    config_userlocal
    if $SYSTEMD ; then
+     if [ -n "$WINDOWMANAGER" ] ; then
+       mkdir -p /var/run/grml-x/
+       echo "$WINDOWMANAGER" > /var/run/grml-x/window-manager
+     fi
      chvt 7
      return
    fi