summaryrefslogtreecommitdiffstats
path: root/initrd
diff options
context:
space:
mode:
authorDirk von Suchodoletz2006-07-03 18:55:16 +0200
committerDirk von Suchodoletz2006-07-03 18:55:16 +0200
commit8de23081b21d6f6f164af6342e9698f540e00191 (patch)
treef643cf89ea4fcbd98cf55fbba5a77d3fcd31a7e3 /initrd
parentFixed a pcitable file related bug (for some reason the new version was (diff)
downloadcore-8de23081b21d6f6f164af6342e9698f540e00191.tar.gz
core-8de23081b21d6f6f164af6342e9698f540e00191.tar.xz
core-8de23081b21d6f6f164af6342e9698f540e00191.zip
Just check in - do not use this version.
git-svn-id: http://svn.openslx.org/svn/openslx/ld4@266 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initrd')
-rwxr-xr-xinitrd/initrd-stuff/bin/servconfig4
-rwxr-xr-xinitrd/initrd-stuff/init2
-rw-r--r--initrd/initrd-stuff/usr/share/hwdata/Cards4
3 files changed, 6 insertions, 4 deletions
diff --git a/initrd/initrd-stuff/bin/servconfig b/initrd/initrd-stuff/bin/servconfig
index 43b9402c..92ee2cd8 100755
--- a/initrd/initrd-stuff/bin/servconfig
+++ b/initrd/initrd-stuff/bin/servconfig
@@ -52,7 +52,7 @@ echo "
/ _ | _ | | | |_| |
| | | | | | | | | | /
| |_| | | |_| | | |___ / _
- _____/ |_______/ |______| |__| |__|
+ _____/ |______/ |______| |__| |__|
Diskless Workstation (v4.0/$dstr (c) <odlx project>
">/mnt/etc/issue
@@ -267,7 +267,7 @@ if [ "x$vmware" != "x" ] && [ "x$vmware" != "xno" ] ; then
#fi
# generate a runlevel script
d_mkrlscript init vmware-prep "Starting preparation of vmware environment"
- sed "s,^#.*,,;/^$/d;s,^,\t," /etc/vmware-prep >> \
+ sed "s,^#.*,,;/^$/d;s,^,\\t," /etc/vmware-prep >> \
/mnt/etc/${D_INITDIR}/vmware-prep
d_mkrlscript close vmware-prep ""
chmod u+x /mnt/etc/${D_INITDIR}/vmware-prep
diff --git a/initrd/initrd-stuff/init b/initrd/initrd-stuff/init
index db11a51e..31e1335e 100755
--- a/initrd/initrd-stuff/init
+++ b/initrd/initrd-stuff/init
@@ -477,7 +477,7 @@ postinit
[ -x /bin/postinit.local ] && /bin/postinit.local
# start a debug shell in higher debug levels
-[ $DEBUGLEVEL -gt 2 ] && /bin/sh
+[ $DEBUGLEVEL -gt 2 ] && start_shell
# unmount the bind mounted modules directory
for i in 0 40 100 200 300 500 800 1000 1200; do
diff --git a/initrd/initrd-stuff/usr/share/hwdata/Cards b/initrd/initrd-stuff/usr/share/hwdata/Cards
index 1f3c46a8..37fed48c 100644
--- a/initrd/initrd-stuff/usr/share/hwdata/Cards
+++ b/initrd/initrd-stuff/usr/share/hwdata/Cards
@@ -2093,7 +2093,9 @@ CHIPSET R300
DRIVER radeon
LINE #Option "nodri"
-
+NAME ATI Radeon X300
+CHIPSET R300
+DRIVER radeon
######################################################################
NAME ATI Rage Fury Pro AGP