Hack: Xorg-Config Datei in hwautoconf hardkodiert

/var/lib/gdm als RO in RW für Debian


git-svn-id: http://svn.openslx.org/svn/openslx/dxs/ld4@13 95ad53e4-c205-0410-b2fa-d234c58c8868

3 files changed, 12 insertions, 13 deletions

diff --git a/initrd/distro-specs/debian/config b/initrd/distro-specs/debian/config
index 2f7eee71..34d20372 100644
--- a/initrd/distro-specs/debian/config
+++ b/initrd/distro-specs/debian/config
@@ -26,7 +26,7 @@ X11/xdm/pixmaps\n*.rpmsave\ndhclient.script\ninit.d/boot.d/*\n\
 rc2.d/*\nrc5.d/*"
 BINDMPTS="tmp root home"
 DIRINBINDMNT="/var/run /var/log /var/tmp"
-RODIRSINRW="etc/gconf etc/X11/xkb /var/adm /var/lib/texmf /var/lib/rpm"
+RODIRSINRW="etc/gconf etc/X11/xkb /var/adm /var/lib/texmf /var/lib/gdm"
 DISDIRINDXS="/var/X11R6/compose-cache \
 /var/run/sysconfig/tmp /var/adm /var/lib/rpm /var/lib/nobody \
 /var/lib/pam_devperm /var/lib/bluetooth \
diff --git a/initrd/initrd-stuff/bin/hwautocfg b/initrd/initrd-stuff/bin/hwautocfg
index 637ba247..ae9c691c 100755
--- a/initrd/initrd-stuff/bin/hwautocfg
+++ b/initrd/initrd-stuff/bin/hwautocfg
@@ -365,7 +365,7 @@ echo -e "loadkeys -q ${KEYTABLE}\n" >>/mnt/etc/${INITDIR}/boot.ld
 # run X11 / Xorg configurator
 . /etc/sysconfig/xserver >/dev/null 2>&1 || error "  The xserver \
 configuration file generated by hwsetup could not\n  be found." nonfatal
-displaysetup "/mnt/${XF86CONFFILE}"
+displaysetup "/mnt/etc/X11/xorg.conf" #${XF86CONFFILE}"
 
 echo "finished" > /tmp/hwcfg
 
diff --git a/initrd/initrd-stuff/init b/initrd/initrd-stuff/init
index 3c4a34f0..f3317a07 100755
--- a/initrd/initrd-stuff/init
+++ b/initrd/initrd-stuff/init
@@ -107,12 +107,12 @@ might pass that information via kernel command line\n  through setting of \
 enabled via tokens ('ldap' or 'dhcp') in kernel\n  command line."
   fi
 fi
-[ -z "$DHCP" -a -n "$LDAP" -a -z "$IPINFO" ] && error "  Unable to setup at \
-might pass that information via kernel command line\n  through setting of \
-'ipappend 1' in pxelinux.cfg/* or just enable dhcp\n  or ldap. They are \
-enabled via tokens ('ldap' or 'dhcp') in kernel\n  command line."
-  fi
-fi
+#[ -z "$DHCP" -a -n "$LDAP" -a -z "$IPINFO" ] && error "  Unable to setup at \
+#might pass that information via kernel command line\n  through setting of \
+#'ipappend 1' in pxelinux.cfg/* or just enable dhcp\n  or ldap. They are \
+#enabled via tokens ('ldap' or 'dhcp') in kernel\n  command line."
+#  fi
+#fi
 [ -z "$DHCP" -a -n "$LDAP" -a -z "$IPINFO" ] && error "  Unable to setup at \
 least basic functionality, because no IP configuration\n  available. Please \
 beware - ldap works only in combination of either\n  ipappend or similar or \
@@ -210,9 +210,9 @@ fi
 if [ -z "${DNBDOPT}" -a -z "${NBDOPT}" ] ; then
   nfsmnt ${NFSROOT} ${MODPRV}
 fi
-
-  You might want to check the list of mounted filesystems and if /mnt is\n\
-  not empty run 'ls /mnt/lib/modules' to check."
+# Bruchstücke?? Was hat das hier verloren?
+#  You might want to check the list of mounted filesystems and if /mnt is\n\
+#  not empty run 'ls /mnt/lib/modules' to check."
 # start hardware configuration as background process
 hwautocfg &
 
@@ -264,7 +264,7 @@ else
   [ -z "${NOLDSC}" ] && echo -e "ld.so.cache*" >>/tmp/etc.exclude
   # for tar exclude lists might be used, more difficult for cp
   cd /mnt
-  tar -X /tmp/etc.exclude -cp etc/* 2>/dev/null| \
+  tar -X /tmp/etc.exclude -cp etc/* | \
     tar -xp -C ${RWDIR}>/dev/null ;
   cd /
   mount -n --bind ${RWDIR}/etc /mnt/etc
@@ -304,7 +304,6 @@ usbfs\t\t/proc/bus/usb\tusbfs\t\tnoauto\t\t 0 0">/mnt/etc/fstab || \
   error "Failed to create /etc/fstab in the clients root filesystem. The\n\
   noexistence of the file might produce some unexpected behaviour of\n\
   mount commands."
-
 date
 # copy library cache if generated
 if [ -z "${NOLDSC}" ] ; then