diff options
| author | Dirk von Suchodoletz | 2007-03-20 15:49:13 +0100 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2007-03-20 15:49:13 +0100 |
| commit | 934d1c3e3d45c0d881af566a106377beaa36182f (patch) | |
| tree | 29636c0c61c3672ca46c8db6021868a2aa6e8ddb | |
| parent | * oops: fixed stupid naming problems (instead of ...-x86_64 we have to use ..... (diff) | |
| download | core-934d1c3e3d45c0d881af566a106377beaa36182f.tar.gz core-934d1c3e3d45c0d881af566a106377beaa36182f.tar.xz core-934d1c3e3d45c0d881af566a106377beaa36182f.zip | |
Fix for mkdxsinitrd (skip strip) ...
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@787 95ad53e4-c205-0410-b2fa-d234c58c8868
| -rw-r--r-- | initramfs/initrd-stuff/etc/messages | 2 | ||||
| -rwxr-xr-x | initramfs/initrd-stuff/init | 7 | ||||
| -rwxr-xr-x | initramfs/mkdxsinitrd | 3 | ||||
| -rw-r--r-- | installer/default_files/hwdata/pcitable.local | 1 |
4 files changed, 6 insertions, 7 deletions
diff --git a/initramfs/initrd-stuff/etc/messages b/initramfs/initrd-stuff/etc/messages index 6d40f429..9934bfd5 100644 --- a/initramfs/initrd-stuff/etc/messages +++ b/initramfs/initrd-stuff/etc/messages @@ -84,7 +84,7 @@ process list and list the modules loaded until\n now." init_errhw=" For some reason the hardware autoconfig $init_errcfg" init_errxorg=" For some reason no xorg.conf appeared" init_errsw=" For some reason the software configuration $init_errcfg" -init_wait=" Waited $i ticks to unmount kernel module directory ..." +init_wait=" Waited $ticks ticks to unmount kernel module directory ..." init_errumnt=" Unmount of the kernel modules directory \ failed for some reason. Some\n modprobe still active!?" init_erritab=" The file /etc/inittab does not exist or is no regular one. It \ diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init index 5b7a3f4b..0059f9cf 100755 --- a/initramfs/initrd-stuff/init +++ b/initramfs/initrd-stuff/init @@ -625,8 +625,9 @@ postinit [ $DEBUGLEVEL -gt 2 -a $DEBUGLEVEL != 8 ] && /bin/sh # unmount the bind mounted modules directory -for i in 0 200 300 500 800 1000 1200 2000 5000 ; do - usleep $i && umount -n /lib/modules/${KERNEL} 2>/dev/null && break +export ticks +for ticks in 0 200 300 500 800 1000 1200 2000 5000 ; do + usleep $ticks && umount -n /lib/modules/${KERNEL} 2>/dev/null && break error "$init_wait" nonfatal done @@ -653,7 +654,7 @@ killall -9 udevd hwautocfg servconfig 2>/mnt/dev/null [ -f /tmp/watchdogpid ] && kill $(cat /tmp/watchdogpid) 2>/mnt/dev/null umount -n /proc # unset old environment variables -unset debug date initrd ip dnbdroot nbdroot nfsroot vci vga +unset debug date initrd ip dnbdroot nbdroot nfsroot ticks vci vga unset BOOT_IMAGE KCMDLINE KERNEL MODPRV NWMODULES OLDPWD UDEVD_EVENT_TIMEOUT \ UDEVD_EXPECTED_SEQNUM PATH # new style of pivoting (switch_root or run-init in klibc) diff --git a/initramfs/mkdxsinitrd b/initramfs/mkdxsinitrd index 1237d97f..a85ca6ae 100755 --- a/initramfs/mkdxsinitrd +++ b/initramfs/mkdxsinitrd @@ -801,9 +801,6 @@ for cfg in default/initramfs/preinit.local \ cp ${SLX_PRIVATE_PATH}/config/$cfg ${INSTDIR}/bin done -# remove unneeded debug info, fixme not really tested yet -strip ${INSTDIR}/bin/* ${INSTDIR}/lib/* &>/dev/null - ######################################################################### # End of file copy procedures diff --git a/installer/default_files/hwdata/pcitable.local b/installer/default_files/hwdata/pcitable.local index d1f6549a..a7e94bfd 100644 --- a/installer/default_files/hwdata/pcitable.local +++ b/installer/default_files/hwdata/pcitable.local @@ -21,3 +21,4 @@ 0x8086 0x2592 "Card:Intel 915" 0x10de 0x0242 "Card:NVIDIA Geforce 6100" 0x1002 0x5974 "Card:ATI Radeon RS482" +0x1002 0x5b70 "Card:ATI Radeon (generic)" |