summaryrefslogtreecommitdiffstats
path: root/initramfs
diff options
context:
space:
mode:
authorDirk von Suchodoletz2007-07-01 00:27:51 +0200
committerDirk von Suchodoletz2007-07-01 00:27:51 +0200
commitd9cac76fee8b375f70eabfb6498cf06d066c6ebe (patch)
tree6cf4d34dae655920384b45b4c8cde2a6b153d411 /initramfs
parent* removed a comment that is no longer true (diff)
downloadcore-d9cac76fee8b375f70eabfb6498cf06d066c6ebe.tar.gz
core-d9cac76fee8b375f70eabfb6498cf06d066c6ebe.tar.xz
core-d9cac76fee8b375f70eabfb6498cf06d066c6ebe.zip
Better formatting of SLX version string in issue file. Fixes in pcitable
file (snd- ...), see #100 git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1199 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs')
-rwxr-xr-xinitramfs/initrd-stuff/bin/servconfig12
-rw-r--r--initramfs/initrd-stuff/usr/share/hwdata/pcitable10
2 files changed, 14 insertions, 8 deletions
diff --git a/initramfs/initrd-stuff/bin/servconfig b/initramfs/initrd-stuff/bin/servconfig
index 9440b405..98bb6943 100755
--- a/initramfs/initrd-stuff/bin/servconfig
+++ b/initramfs/initrd-stuff/bin/servconfig
@@ -60,8 +60,14 @@ cp -a /rootfs/* /mnt 2>/dev/null
# set greeting and add information on booted system
len=$(expr length ${SLXVERSION}${SYSTEM_NAME})
-vdstr="V${SLXVERSION}/${SYSTEM_NAME})"
-while [ $len -le 28 ] ; do
+if [ $len -le 28 ] ; then
+ vdstr="Stateless Workstation (V${SLXVERSION}/${SYSTEM_NAME})"
+ smax=28
+else
+ vdstr="V${SLXVERSION}/${SYSTEM_NAME}"
+ smax=52
+fi
+while [ $len -le $smax ] ; do
vdstr="$vdstr "
len=$(expr $len + 1)
done
@@ -79,7 +85,7 @@ echo "
| |_| | | | |___| | | | ____| | |___ / /
_____/|__| |______|__| |__| |_______|______|__| |__|
- Stateless Workstation ($vdstr (c) <OpenSLX.ORG>
+ $vdstr (c) <OpenSLX.ORG>
">/mnt/etc/issue
#############################################################################
diff --git a/initramfs/initrd-stuff/usr/share/hwdata/pcitable b/initramfs/initrd-stuff/usr/share/hwdata/pcitable
index 5ce1e3d4..3cbc4eea 100644
--- a/initramfs/initrd-stuff/usr/share/hwdata/pcitable
+++ b/initramfs/initrd-stuff/usr/share/hwdata/pcitable
@@ -817,8 +817,8 @@
0x1013 0x00d5 "Card:Cirrus Logic GD5464" "Cirrus Logic|GD5464BD"
0x1013 0x00d6 "Card:Cirrus Logic GD5465" "Cirrus Logic|GD 5465 [Laguna]"
0x1013 0x00e8 "Card:Cirrus Logic GD543x" "Cirrus Logic|GD 5436U"
-0x1013 0x1010 "cs46xx" "Cirrus Logic|CS 4614/22/24 [CrystalClear SoundFusion Audio Accelerator]"
-0x1013 0x1014 "cs46xx" "Cirrus Logic|CS 4614/22/24 [CrystalClear SoundFusion Audio Accelerator]"
+0x1013 0x1010 "snd-cs46xx" "Cirrus Logic|CS 4614/22/24 [CrystalClear SoundFusion Audio Accelerator]"
+0x1013 0x1014 "snd-cs46xx" "Cirrus Logic|CS 4614/22/24 [CrystalClear SoundFusion Audio Accelerator]"
0x1013 0x1100 "pd6729" "Cirrus Logic|CL 6729"
0x1013 0x1110 "yenta_socket" "Cirrus Logic|PD 6832"
0x1013 0x1112 "yenta_socket" "Cirrus Logic|PD 6834 PCMCIA/CardBus Ctrlr"
@@ -828,10 +828,10 @@
0x1013 0x1204 "Card:Cirrus Logic GD754x (laptop)" "Cirrus Logic|GD 7541 [Nordic Light]"
0x1013 0x4000 "unknown" "Cirrus Logic|MD 5620 [CLM Data Fax Voice]"
0x1013 0x4400 "unknown" "Cirrus Logic|CD 4400"
-0x1013 0x6001 "cs46xx" "Cirrus Logic|Cirrus CS4610/1 CrystalClear SoundFusion Audio"
+0x1013 0x6001 "snd-cs46xx" "Cirrus Logic|Cirrus CS4610/1 CrystalClear SoundFusion Audio"
0x1013 0x6003 "snd-cs46xx" "Cirrus Logic|CS 4614/22/24 [CrystalClear SoundFusion Audio Accelerator]"
-0x1013 0x6004 "cs46xx" "Cirrus Logic|unknown (? CrystalClear SoundFusion Audio Accelerator?)"
-0x1013 0x6005 "cs4281" "Cirrus Logic|Crystal CS4281 PCI Audio"
+0x1013 0x6004 "snd-cs46xx" "Cirrus Logic|unknown (? CrystalClear SoundFusion Audio Accelerator?)"
+0x1013 0x6005 "snd-cs4281" "Cirrus Logic|Crystal CS4281 PCI Audio"
0x1014 0x0002 "unknown" "IBM|PCI to MCA Bridge"
0x1014 0x0005 "unknown" "IBM|Alta Lite"
0x1014 0x0007 "unknown" "IBM|Alta MP"