From 5372025f1d779f8c3303794f6237059ecd8f05f0 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Sat, 5 May 2007 14:46:39 +0000
Subject: Hope that solves the "hanging/no keyboard" X display problem:
 Reordering of start scripts, devices available ...

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@996 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initramfs/initrd-stuff/init | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'initramfs/initrd-stuff/init')

diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init
index e83b1939..463376b4 100755
--- a/initramfs/initrd-stuff/init
+++ b/initramfs/initrd-stuff/init
@@ -157,6 +157,8 @@ in $0\ncountry=\"${COUNTRY}\"" >> /etc/machine-setup
     unionfs=*)
       unionfs=1
       uniondirs=${opts#unionfs=}
+      # most probably it is a good idea to run ldconfig, so enable it
+      ldsc="yes"
     ;;
     # same for AUFS; alternative to unionfs
     aufs)
@@ -164,6 +166,8 @@ in $0\ncountry=\"${COUNTRY}\"" >> /etc/machine-setup
     aufs=*)
       aufs=1
       uniondirs=${opts#aufs=}
+      # most probably it is a good idea to run ldconfig, so enable it
+      ldsc="yes"
     ;;
     # if cowloop should be used, only ontop of network block device and in
     # combination with classical fs, like ext2 useful
@@ -510,17 +514,6 @@ if [ -n "${unionfs}" -o -n "${aufs}" ] ; then
   mkdir -p /mnt/uniontmp
   mount -n --move ${rwdir}/uniontmp /mnt/uniontmp
   chmod 0755 /mnt/uniontmp /mnt
-  # if additional sources should be used for a combined root filesystem
-  # probably more sources should be merged into union (${union} is defined)
-  # allow more than one union??
-  if [ -n "${unionfs}" -o -n "${aufs}" ] ; then
-    # for dir in "${union}"; do
-    # testmkd /unionadd/$dir
-    # mount $dir unionadd/$dir
-    # unionctl mnt --add --after /mnt --mode ro /unionadd/$dir
-    # most probably it is a good idea to run ldconfig, so enable it
-    ldsc="yes"
-  fi
   # run ldconfig if not switched off via kernel command line
   ldcfg
   # runlevel directories should contain no links
-- 
cgit v1.2.3-55-g7522