summaryrefslogtreecommitdiffstats
path: root/initramfs/stage3-stuff/init
diff options
context:
space:
mode:
authorBastian Wissler2009-04-07 13:48:26 +0200
committerBastian Wissler2009-04-07 13:48:26 +0200
commit2701c635fa37da9eede75f21f6cb2bb4592621d9 (patch)
tree54333fa147243b00fe1835e9606e234e2f1062a6 /initramfs/stage3-stuff/init
parentadding new pxe menu stuff to branch 5.0, (+ small theme fix) (diff)
downloadcore-2701c635fa37da9eede75f21f6cb2bb4592621d9.tar.gz
core-2701c635fa37da9eede75f21f6cb2bb4592621d9.tar.xz
core-2701c635fa37da9eede75f21f6cb2bb4592621d9.zip
init:
* Added option for enabling ddcinfo in xserver per kernel cmdline xserver: * Fixed some strange gpg-check with "zypper refresh" -> this caused some trouble with fresh installation of the xserver plugin git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2805 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs/stage3-stuff/init')
-rwxr-xr-xinitramfs/stage3-stuff/init9
1 files changed, 9 insertions, 0 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)"