summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--initrd/distro-specs/ubuntu/README-6.0612
-rw-r--r--initrd/distro-specs/ubuntu/functions-5.103
-rwxr-xr-xinitrd/initrd-stuff/bin/servconfig4
-rw-r--r--initrd/initrd-stuff/etc/functions3
-rwxr-xr-xinitrd/initrd-stuff/init10
-rwxr-xr-xinstaller/ld4-inst2
6 files changed, 23 insertions, 11 deletions
diff --git a/initrd/distro-specs/ubuntu/README-6.06 b/initrd/distro-specs/ubuntu/README-6.06
new file mode 100644
index 00000000..4555c70d
--- /dev/null
+++ b/initrd/distro-specs/ubuntu/README-6.06
@@ -0,0 +1,12 @@
+fehler kubuntu 6.06:
+
+distro-functions: line 43: udevstert not found
+module unix not found -> im kernel
+anderer pfad in xorg.conf:
+fonts in /urs/share/X11/fonts + module pfad löschen
+
+bei livecd: cannot create dir /media/loop0 readonly!
+kioskmode deaktivieren + kdm start
+inittab anpassen! + konsole1 macht immer timeout auch wenn sich keiner anmeldet
+ACHTUNG: bei kdm root anmeldung ohne pw möglich!
+
diff --git a/initrd/distro-specs/ubuntu/functions-5.10 b/initrd/distro-specs/ubuntu/functions-5.10
index 53408c69..69f693d1 100644
--- a/initrd/distro-specs/ubuntu/functions-5.10
+++ b/initrd/distro-specs/ubuntu/functions-5.10
@@ -16,7 +16,8 @@ preinit () {
echo "dhcp:x:101:">>/etc/group
echo "dhcp:x:101:101::/nonexistent:/bin/false" >>/etc/passwd
- # load unix module to provide sockets
+ # load unix module to provide sockets (is compiled into kernel on
+ # the live CDs!?)
modprobe ${MODPRV} unix || error "$df_errumod" nonfatal
}
diff --git a/initrd/initrd-stuff/bin/servconfig b/initrd/initrd-stuff/bin/servconfig
index 190a2489..121a6460 100755
--- a/initrd/initrd-stuff/bin/servconfig
+++ b/initrd/initrd-stuff/bin/servconfig
@@ -268,10 +268,8 @@ if [ "x$vmware" != "x" ] && [ "x$vmware" != "xno" ] ; then
if [ -d /mnt/usr/share/vmware ] ; then
ln -sf /usr/share/vmware /var/lib/vmware
elif [ -n "${imgsrv}" ] ; then
- # nfsmnt script should be used here ...
+ # more general mount script should be used here!?
( nfsmnt ${imgsrv} /mnt/var/lib/vmware || error "$scfg_nfs" nonfatal ) &
- #mount -n -t nfs -o ro,nolock,intr,nodev,soft,timeo=2,nosuid \
- # ${imgsrv}
fi
# generate a runlevel script
d_mkrlscript init vmware-prep "Starting preparation of vmware environment"
diff --git a/initrd/initrd-stuff/etc/functions b/initrd/initrd-stuff/etc/functions
index e8b12f76..a07ebaef 100644
--- a/initrd/initrd-stuff/etc/functions
+++ b/initrd/initrd-stuff/etc/functions
@@ -55,7 +55,8 @@ if [ -n "$2" ] ; then
[ "$DEBUGLEVEL" -gt 2 ] && usleep 20
else
echo -e "${error_msg}${e_msg}${error_shell}"
- # load usb modules to have keyboard enabled
+ # load usb modules to have keyboard enabled - they might have to be
+ # copied into initramfs with mkdxsinitramfs ...
modprobe -a usbcore uhci-hcd ohci-hcd usbhid 2>&1 >/dev/null
/bin/sh
echo -n "Reboot now? [y]"
diff --git a/initrd/initrd-stuff/init b/initrd/initrd-stuff/init
index 8a4baf73..743e195e 100755
--- a/initrd/initrd-stuff/init
+++ b/initrd/initrd-stuff/init
@@ -2,11 +2,11 @@
# Description: main script for new type of initial ramdisk for
# linux diskless clients version 4
#
-# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 22-05-2006
+# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 23-05-2006
#
# Copyright: (c) 2006 - RZ Universitaet Freiburg
#
-# Version: 0.2.4g
+# Version: 0.2.4h
# functions common for all distros, messages contains all error and info
# output
@@ -161,9 +161,9 @@ fi
# check if at least one type of IP configuration is availabe
if [ -z "$DHCP" -a -z "$LDAP" -a -z "$IPINFO" ] ; then
echo -e "# You did not specify any advanced configuration mode for your \
-clients. You\nmight want to add the token 'dhcp' for DHCP configuration, \
-'file(=source)'\nfor config file get via TFTP or 'ldap(=source)' for LDAP \
-configuration to\nyour kernel command line." >> /etc/machine-setup
+clients. You\n# might want to add the token 'dhcp' for DHCP configuration, \
+'file(=source)'\n# for config file get via TFTP or 'ldap(=source)' for LDAP \
+configuration to\n# your kernel command line." >> /etc/machine-setup
if strinfile "clientip" /etc/machine-setup ; then
# IP configuration seems to be present in machine-setup file
. /etc/machine-setup
diff --git a/installer/ld4-inst b/installer/ld4-inst
index e09ab432..34ea5649 100755
--- a/installer/ld4-inst
+++ b/installer/ld4-inst
@@ -489,7 +489,7 @@ ${rootdir} ${netname}/${netmask}(ro,no_root_squash,async)" \
[ -z "$keep" ] && unlink ${2}
fi
# linking files
- # if SuSE und DHCP dann Kopie statt Link
+ # fixme!! if SuSE und DHCP dann Kopie statt Link
if [ ${server_distro} = "suse" ] && echo ${dxs_dhcpd_conf}|\
grep dhcp &>/dev/null; then
rm ${2}${extension} &>/dev/null