diff options
| -rwxr-xr-x | initramfs/stage3-stuff/init | 9 | ||||
| -rwxr-xr-x | os-plugins/plugins/xserver/files/suse-gfx-install.sh | 4 |
2 files changed, 11 insertions, 2 deletions
diff --git a/initramfs/stage3-stuff/init b/initramfs/stage3-stuff/init index 7aef385a..bf18486e 100755 --- a/initramfs/stage3-stuff/init +++ b/initramfs/stage3-stuff/init @@ -303,6 +303,9 @@ in $0\n# deprecated: please use rootfs=nfs://...\nnfsserver=\"${nfsserver}\"\ # be distinguished from other (dhcp) clients vci=*) vci=${opts#vci=};; + # option for ddcinfo + ddcinfo=*) + ddcinfo=${opts#ddcinfo=};; esac done @@ -866,6 +869,12 @@ if [ -n "$uniondirs" ]; then fi runinithook '70-before-plugins' + +# ddcinfo temporary overwrite (with kernel cmdline ddcinfo=1) +if [ "${ddcinfo}" = "1" && -f /initramfs/plugin-conf/xserver.conf ]; then + echo 'xserver_ddcinfo="1"' >> /initramfs/plugin-conf/xserver.conf +fi + # runtimer [ $DEBUGLEVEL -eq 8 -o $DEBUGLEVEL -eq 20 ] && \ echo "** Plugin configuration started at $(sysup)" diff --git a/os-plugins/plugins/xserver/files/suse-gfx-install.sh b/os-plugins/plugins/xserver/files/suse-gfx-install.sh index cb38627f..347c1a32 100755 --- a/os-plugins/plugins/xserver/files/suse-gfx-install.sh +++ b/os-plugins/plugins/xserver/files/suse-gfx-install.sh @@ -169,7 +169,7 @@ if [ "$1" = "nvidia" ]; then # zypper refresh is requested if something is not found if [ "1" -le "$(cat logfile | grep -o "zypper refresh"| wc -l)" ]; then - zypper refresh >/dev/null 2>&1 + zypper --no-gpg-checks refresh >/dev/null 2>&1 fi # take unique urls from logfile @@ -273,7 +273,7 @@ if [ "$1" = "ati" ]; then # zypper refresh is requested if something is not found if [ "1" -le "$(cat logfile | grep -o "zypper refresh" | wc -l)" ]; then - zypper refresh >/dev/null 2>&1 + zypper --no-gpg-check refresh >/dev/null 2>&1 fi # take unique urls from logfile |