diff options
175 files changed, 444 insertions, 25 deletions
@@ -197,6 +197,10 @@ plain-install: cp -p boot-env/syslinux/pxemenu-*.example boot-env/syslinux/README.pxe \ $(SLX_BUILD_PATH)$(SLX_CONFIG_PATH)/boot-env/syslinux/; \ cp -p tools/mksquashfs $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/share/squashfs/; \ + cp -p initramfs/eglibc-packages/mksquashfs/usr/bin/mksquashfs3 \ + $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/share/squashfs/mksquashfs3; \ + cp -p initramfs/eglibc-packages/mksquashfs/usr/bin/mksquashfs \ + $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/share/squashfs/mksquashfs4; \ tar --exclude=.svn -cp -C initramfs tpm | \ tar -xp -C $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/share; \ @@ -1,4 +1,4 @@ OPENSLX_VERSION_MAJOR="5" OPENSLX_VERSION_MINOR="0" -OPENSLX_VERSION_RELEASE="93.0" +OPENSLX_VERSION_RELEASE="93.1" OPENSLX_VERSION_STRING="${OPENSLX_VERSION_MAJOR}.${OPENSLX_VERSION_MINOR}.${OPENSLX_VERSION_RELEASE}" diff --git a/boot-env/OpenSLX/MakeInitRamFS/Engine/Base.pm b/boot-env/OpenSLX/MakeInitRamFS/Engine/Base.pm index 6de0a4fe..b09543dc 100644 --- a/boot-env/OpenSLX/MakeInitRamFS/Engine/Base.pm +++ b/boot-env/OpenSLX/MakeInitRamFS/Engine/Base.pm @@ -1,4 +1,4 @@ -# Copyright (c) 2006-2008 - OpenSLX GmbH +# Copyright (c) 2006..2010 - OpenSLX GmbH # # This program is free software distributed under the GPL version 2. # See http://openslx.org/COPYING @@ -275,12 +275,13 @@ sub _copyKernelModules } } - # build a list of required firmwares out of the list of modules + # build a list of required firmwares out of the list of modules - not + # totally optimal my @firmwares; $self->addCMD("mkdir -p $self->{'build-path'}/lib/firmware/$self->{'kernel-version'}"); foreach my $moduleToBeCopied(%modulesToBeCopied) { $moduleToBeCopied =~ /.*\/(.*?)$/; - # implies usage of Switch + # implies usage of switch vlog(1,$1); switch ($1){ case "e100.ko" {push @firmwares, split ' ', "e100"} @@ -289,6 +290,10 @@ sub _copyKernelModules "iwlwifi-3945-1.ucode iwlwifi-3945-2.ucode iwlwifi-4965-1.ucode iwlwifi-4965-2.ucode iwlwifi-5000-1.ucode" } case "tg3.ko" {push @firmwares, split ' ', "tigon/"} + # modules required for graphic adaptors (bootsplash, Xorg) + case "radeon.ko" {push @firmwares, split ' ', "radeon/"} + case "mga.ko" {push @firmwares, split ' ', "matrox/"} + case "r128.ko" {push @firmwares, split ' ', "r128/"} } } # copy all the firmwares that we think are required diff --git a/initramfs/distro-specs/ubuntu/functions-default b/initramfs/distro-specs/ubuntu/functions-default index beb63db1..11d82e9a 100644 --- a/initramfs/distro-specs/ubuntu/functions-default +++ b/initramfs/distro-specs/ubuntu/functions-default @@ -31,7 +31,7 @@ D_DIRINDXS="/var/run/sysconfig/tmp /var/lib/nobody /var/lib/misc /var/lib/pam \ # distro specific stuff to initialize postinit () { - if [ $DEBUGLEVEL -gt 2 ]; then + if [ $DEBUGLEVEL -gt 3 ]; then export DEBUG_UPSTART=" -v --debug" fi } @@ -51,10 +51,12 @@ config_distro () { disabled\n# upstart scripts. They are moved by servconfig to init if this is \ required." >/mnt/etc/init.inactive/README mv /mnt/etc/init/* /mnt/etc/init.inactive + # remove plymouth component from *dm.conf (not needed with splashy) + sed "/# Check kernel c/,/done/d" -i /mnt/etc/init.inactive/*dm.conf # copy initial upstart scripts back for file in alsa-mixer-save.conf control-alt-delete.conf dbus.conf \ dmesg.conf hwclock.conf hwclock-save.conf irqbalance.conf \ - module-init-tools.conf mountall.conf mounted*conf plymouth*conf \ + module-init-tools.conf mountall.conf mounted*conf \ networking.conf procps.conf rc*.conf tty*conf udev*conf \ upstart-udev-bridge.conf ; do mv /mnt/etc/init.inactive/${file} /mnt/etc/init >/dev/null 2>&1 diff --git a/initramfs/eglibc-packages/mksquashfs/lib/libm.so.6 b/initramfs/eglibc-packages/mksquashfs/lib/libm.so.6 Binary files differnew file mode 100644 index 00000000..0e557bfe --- /dev/null +++ b/initramfs/eglibc-packages/mksquashfs/lib/libm.so.6 diff --git a/initramfs/eglibc-packages/mksquashfs/lib/libpthread.so.0 b/initramfs/eglibc-packages/mksquashfs/lib/libpthread.so.0 Binary files differnew file mode 100755 index 00000000..55de7d33 --- /dev/null +++ b/initramfs/eglibc-packages/mksquashfs/lib/libpthread.so.0 diff --git a/initramfs/eglibc-packages/mksquashfs/usr/bin/mksquashfs b/initramfs/eglibc-packages/mksquashfs/usr/bin/mksquashfs Binary files differnew file mode 100755 index 00000000..b40e6e42 --- /dev/null +++ b/initramfs/eglibc-packages/mksquashfs/usr/bin/mksquashfs diff --git a/initramfs/eglibc-packages/mksquashfs/usr/bin/mksquashfs3 b/initramfs/eglibc-packages/mksquashfs/usr/bin/mksquashfs3 Binary files differnew file mode 100755 index 00000000..0f4efdc8 --- /dev/null +++ b/initramfs/eglibc-packages/mksquashfs/usr/bin/mksquashfs3 diff --git a/initramfs/eglibc-packages/nbd-client/sbin/nbd-client b/initramfs/eglibc-packages/nbd-client/sbin/nbd-client Binary files differnew file mode 100755 index 00000000..634e6ff3 --- /dev/null +++ b/initramfs/eglibc-packages/nbd-client/sbin/nbd-client diff --git a/initramfs/eglibc-rootfs/bin/busybox b/initramfs/eglibc-rootfs/bin/busybox Binary files differnew file mode 100755 index 00000000..5e47c8bd --- /dev/null +++ b/initramfs/eglibc-rootfs/bin/busybox diff --git a/initramfs/eglibc-rootfs/bin/cat b/initramfs/eglibc-rootfs/bin/cat new file mode 120000 index 00000000..c3fa8102 --- /dev/null +++ b/initramfs/eglibc-rootfs/bin/cat @@ -0,0 +1 @@ +busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/bin/chgrp b/initramfs/eglibc-rootfs/bin/chgrp new file mode 120000 index 00000000..c3fa8102 --- /dev/null +++ b/initramfs/eglibc-rootfs/bin/chgrp @@ -0,0 +1 @@ +busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/bin/chmod b/initramfs/eglibc-rootfs/bin/chmod new file mode 120000 index 00000000..c3fa8102 --- /dev/null +++ b/initramfs/eglibc-rootfs/bin/chmod @@ -0,0 +1 @@ +busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/bin/chown b/initramfs/eglibc-rootfs/bin/chown new file mode 120000 index 00000000..c3fa8102 --- /dev/null +++ b/initramfs/eglibc-rootfs/bin/chown @@ -0,0 +1 @@ +busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/bin/cp b/initramfs/eglibc-rootfs/bin/cp new file mode 120000 index 00000000..c3fa8102 --- /dev/null +++ b/initramfs/eglibc-rootfs/bin/cp @@ -0,0 +1 @@ +busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/bin/cpio b/initramfs/eglibc-rootfs/bin/cpio new file mode 120000 index 00000000..c3fa8102 --- /dev/null +++ b/initramfs/eglibc-rootfs/bin/cpio @@ -0,0 +1 @@ +busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/bin/cttyhack b/initramfs/eglibc-rootfs/bin/cttyhack new file mode 120000 index 00000000..c3fa8102 --- /dev/null +++ b/initramfs/eglibc-rootfs/bin/cttyhack @@ -0,0 +1 @@ +busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/bin/date b/initramfs/eglibc-rootfs/bin/date new file mode 120000 index 00000000..c3fa8102 --- /dev/null +++ b/initramfs/eglibc-rootfs/bin/date @@ -0,0 +1 @@ +busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/bin/dd b/initramfs/eglibc-rootfs/bin/dd new file mode 120000 index 00000000..c3fa8102 --- /dev/null +++ b/initramfs/eglibc-rootfs/bin/dd @@ -0,0 +1 @@ +busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/bin/df b/initramfs/eglibc-rootfs/bin/df new file mode 120000 index 00000000..c3fa8102 --- /dev/null +++ b/initramfs/eglibc-rootfs/bin/df @@ -0,0 +1 @@ +busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/bin/dmesg b/initramfs/eglibc-rootfs/bin/dmesg new file mode 120000 index 00000000..c3fa8102 --- /dev/null +++ b/initramfs/eglibc-rootfs/bin/dmesg @@ -0,0 +1 @@ +busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/bin/echo b/initramfs/eglibc-rootfs/bin/echo new file mode 120000 index 00000000..c3fa8102 --- /dev/null +++ b/initramfs/eglibc-rootfs/bin/echo @@ -0,0 +1 @@ +busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/bin/egrep b/initramfs/eglibc-rootfs/bin/egrep new file mode 120000 index 00000000..c3fa8102 --- /dev/null +++ b/initramfs/eglibc-rootfs/bin/egrep @@ -0,0 +1 @@ +busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/bin/false b/initramfs/eglibc-rootfs/bin/false new file mode 120000 index 00000000..c3fa8102 --- /dev/null +++ b/initramfs/eglibc-rootfs/bin/false @@ -0,0 +1 @@ +busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/bin/grep b/initramfs/eglibc-rootfs/bin/grep new file mode 120000 index 00000000..c3fa8102 --- /dev/null +++ b/initramfs/eglibc-rootfs/bin/grep @@ -0,0 +1 @@ +busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/bin/gunzip b/initramfs/eglibc-rootfs/bin/gunzip new file mode 120000 index 00000000..c3fa8102 --- /dev/null +++ b/initramfs/eglibc-rootfs/bin/gunzip @@ -0,0 +1 @@ +busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/bin/gzip b/initramfs/eglibc-rootfs/bin/gzip new file mode 120000 index 00000000..c3fa8102 --- /dev/null +++ b/initramfs/eglibc-rootfs/bin/gzip @@ -0,0 +1 @@ +busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/bin/hush b/initramfs/eglibc-rootfs/bin/hush new file mode 120000 index 00000000..c3fa8102 --- /dev/null +++ b/initramfs/eglibc-rootfs/bin/hush @@ -0,0 +1 @@ +busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/bin/ip b/initramfs/eglibc-rootfs/bin/ip new file mode 120000 index 00000000..c3fa8102 --- /dev/null +++ b/initramfs/eglibc-rootfs/bin/ip @@ -0,0 +1 @@ +busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/bin/ipcalc b/initramfs/eglibc-rootfs/bin/ipcalc new file mode 120000 index 00000000..c3fa8102 --- /dev/null +++ b/initramfs/eglibc-rootfs/bin/ipcalc @@ -0,0 +1 @@ +busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/bin/kill b/initramfs/eglibc-rootfs/bin/kill new file mode 120000 index 00000000..c3fa8102 --- /dev/null +++ b/initramfs/eglibc-rootfs/bin/kill @@ -0,0 +1 @@ +busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/bin/ln b/initramfs/eglibc-rootfs/bin/ln new file mode 120000 index 00000000..c3fa8102 --- /dev/null +++ b/initramfs/eglibc-rootfs/bin/ln @@ -0,0 +1 @@ +busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/bin/ls b/initramfs/eglibc-rootfs/bin/ls new file mode 120000 index 00000000..c3fa8102 --- /dev/null +++ b/initramfs/eglibc-rootfs/bin/ls @@ -0,0 +1 @@ +busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/bin/mkdir b/initramfs/eglibc-rootfs/bin/mkdir new file mode 120000 index 00000000..c3fa8102 --- /dev/null +++ b/initramfs/eglibc-rootfs/bin/mkdir @@ -0,0 +1 @@ +busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/bin/mknod b/initramfs/eglibc-rootfs/bin/mknod new file mode 120000 index 00000000..c3fa8102 --- /dev/null +++ b/initramfs/eglibc-rootfs/bin/mknod @@ -0,0 +1 @@ +busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/bin/mount b/initramfs/eglibc-rootfs/bin/mount new file mode 120000 index 00000000..c3fa8102 --- /dev/null +++ b/initramfs/eglibc-rootfs/bin/mount @@ -0,0 +1 @@ +busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/bin/mv b/initramfs/eglibc-rootfs/bin/mv new file mode 120000 index 00000000..c3fa8102 --- /dev/null +++ b/initramfs/eglibc-rootfs/bin/mv @@ -0,0 +1 @@ +busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/bin/nice b/initramfs/eglibc-rootfs/bin/nice new file mode 120000 index 00000000..c3fa8102 --- /dev/null +++ b/initramfs/eglibc-rootfs/bin/nice @@ -0,0 +1 @@ +busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/bin/pidof b/initramfs/eglibc-rootfs/bin/pidof new file mode 120000 index 00000000..c3fa8102 --- /dev/null +++ b/initramfs/eglibc-rootfs/bin/pidof @@ -0,0 +1 @@ +busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/bin/ping b/initramfs/eglibc-rootfs/bin/ping new file mode 120000 index 00000000..c3fa8102 --- /dev/null +++ b/initramfs/eglibc-rootfs/bin/ping @@ -0,0 +1 @@ +busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/bin/ps b/initramfs/eglibc-rootfs/bin/ps new file mode 120000 index 00000000..c3fa8102 --- /dev/null +++ b/initramfs/eglibc-rootfs/bin/ps @@ -0,0 +1 @@ +busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/bin/pwd b/initramfs/eglibc-rootfs/bin/pwd new file mode 120000 index 00000000..c3fa8102 --- /dev/null +++ b/initramfs/eglibc-rootfs/bin/pwd @@ -0,0 +1 @@ +busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/bin/rm b/initramfs/eglibc-rootfs/bin/rm new file mode 120000 index 00000000..c3fa8102 --- /dev/null +++ b/initramfs/eglibc-rootfs/bin/rm @@ -0,0 +1 @@ +busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/bin/sed b/initramfs/eglibc-rootfs/bin/sed new file mode 120000 index 00000000..c3fa8102 --- /dev/null +++ b/initramfs/eglibc-rootfs/bin/sed @@ -0,0 +1 @@ +busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/bin/sh b/initramfs/eglibc-rootfs/bin/sh new file mode 120000 index 00000000..c3fa8102 --- /dev/null +++ b/initramfs/eglibc-rootfs/bin/sh @@ -0,0 +1 @@ +busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/bin/sleep b/initramfs/eglibc-rootfs/bin/sleep new file mode 120000 index 00000000..c3fa8102 --- /dev/null +++ b/initramfs/eglibc-rootfs/bin/sleep @@ -0,0 +1 @@ +busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/bin/sync b/initramfs/eglibc-rootfs/bin/sync new file mode 120000 index 00000000..c3fa8102 --- /dev/null +++ b/initramfs/eglibc-rootfs/bin/sync @@ -0,0 +1 @@ +busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/bin/tar b/initramfs/eglibc-rootfs/bin/tar new file mode 120000 index 00000000..c3fa8102 --- /dev/null +++ b/initramfs/eglibc-rootfs/bin/tar @@ -0,0 +1 @@ +busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/bin/touch b/initramfs/eglibc-rootfs/bin/touch new file mode 120000 index 00000000..c3fa8102 --- /dev/null +++ b/initramfs/eglibc-rootfs/bin/touch @@ -0,0 +1 @@ +busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/bin/true b/initramfs/eglibc-rootfs/bin/true new file mode 120000 index 00000000..c3fa8102 --- /dev/null +++ b/initramfs/eglibc-rootfs/bin/true @@ -0,0 +1 @@ +busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/bin/umount b/initramfs/eglibc-rootfs/bin/umount new file mode 120000 index 00000000..c3fa8102 --- /dev/null +++ b/initramfs/eglibc-rootfs/bin/umount @@ -0,0 +1 @@ +busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/bin/uname b/initramfs/eglibc-rootfs/bin/uname new file mode 120000 index 00000000..c3fa8102 --- /dev/null +++ b/initramfs/eglibc-rootfs/bin/uname @@ -0,0 +1 @@ +busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/bin/usleep b/initramfs/eglibc-rootfs/bin/usleep new file mode 120000 index 00000000..c3fa8102 --- /dev/null +++ b/initramfs/eglibc-rootfs/bin/usleep @@ -0,0 +1 @@ +busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/bin/vi b/initramfs/eglibc-rootfs/bin/vi new file mode 120000 index 00000000..c3fa8102 --- /dev/null +++ b/initramfs/eglibc-rootfs/bin/vi @@ -0,0 +1 @@ +busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/bin/zcat b/initramfs/eglibc-rootfs/bin/zcat new file mode 120000 index 00000000..c3fa8102 --- /dev/null +++ b/initramfs/eglibc-rootfs/bin/zcat @@ -0,0 +1 @@ +busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/lib/ld-2.11.2.so b/initramfs/eglibc-rootfs/lib/ld-2.11.2.so Binary files differnew file mode 100755 index 00000000..fecb3a46 --- /dev/null +++ b/initramfs/eglibc-rootfs/lib/ld-2.11.2.so diff --git a/initramfs/eglibc-rootfs/lib/ld-linux.so.2 b/initramfs/eglibc-rootfs/lib/ld-linux.so.2 new file mode 120000 index 00000000..e1654955 --- /dev/null +++ b/initramfs/eglibc-rootfs/lib/ld-linux.so.2 @@ -0,0 +1 @@ +ld-2.11.2.so
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/lib/libc.so.6 b/initramfs/eglibc-rootfs/lib/libc.so.6 Binary files differnew file mode 100755 index 00000000..bfd7ef5d --- /dev/null +++ b/initramfs/eglibc-rootfs/lib/libc.so.6 diff --git a/initramfs/eglibc-rootfs/lib/libdbus-1.so.3 b/initramfs/eglibc-rootfs/lib/libdbus-1.so.3 Binary files differnew file mode 100644 index 00000000..526f06dc --- /dev/null +++ b/initramfs/eglibc-rootfs/lib/libdbus-1.so.3 diff --git a/initramfs/eglibc-rootfs/lib/libdl.so.2 b/initramfs/eglibc-rootfs/lib/libdl.so.2 Binary files differnew file mode 100644 index 00000000..b7d6dacc --- /dev/null +++ b/initramfs/eglibc-rootfs/lib/libdl.so.2 diff --git a/initramfs/eglibc-rootfs/lib/librt.so.1 b/initramfs/eglibc-rootfs/lib/librt.so.1 Binary files differnew file mode 100644 index 00000000..fbea0db1 --- /dev/null +++ b/initramfs/eglibc-rootfs/lib/librt.so.1 diff --git a/initramfs/eglibc-rootfs/sbin/fbsplash b/initramfs/eglibc-rootfs/sbin/fbsplash new file mode 120000 index 00000000..71259713 --- /dev/null +++ b/initramfs/eglibc-rootfs/sbin/fbsplash @@ -0,0 +1 @@ +../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/sbin/fdisk b/initramfs/eglibc-rootfs/sbin/fdisk new file mode 120000 index 00000000..71259713 --- /dev/null +++ b/initramfs/eglibc-rootfs/sbin/fdisk @@ -0,0 +1 @@ +../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/sbin/getty b/initramfs/eglibc-rootfs/sbin/getty new file mode 120000 index 00000000..71259713 --- /dev/null +++ b/initramfs/eglibc-rootfs/sbin/getty @@ -0,0 +1 @@ +../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/sbin/halt b/initramfs/eglibc-rootfs/sbin/halt new file mode 120000 index 00000000..71259713 --- /dev/null +++ b/initramfs/eglibc-rootfs/sbin/halt @@ -0,0 +1 @@ +../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/sbin/hdparm b/initramfs/eglibc-rootfs/sbin/hdparm new file mode 120000 index 00000000..71259713 --- /dev/null +++ b/initramfs/eglibc-rootfs/sbin/hdparm @@ -0,0 +1 @@ +../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/sbin/hwclock b/initramfs/eglibc-rootfs/sbin/hwclock new file mode 120000 index 00000000..71259713 --- /dev/null +++ b/initramfs/eglibc-rootfs/sbin/hwclock @@ -0,0 +1 @@ +../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/sbin/inotifyd b/initramfs/eglibc-rootfs/sbin/inotifyd new file mode 120000 index 00000000..71259713 --- /dev/null +++ b/initramfs/eglibc-rootfs/sbin/inotifyd @@ -0,0 +1 @@ +../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/sbin/insmod b/initramfs/eglibc-rootfs/sbin/insmod new file mode 120000 index 00000000..71259713 --- /dev/null +++ b/initramfs/eglibc-rootfs/sbin/insmod @@ -0,0 +1 @@ +../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/sbin/klogd b/initramfs/eglibc-rootfs/sbin/klogd new file mode 120000 index 00000000..71259713 --- /dev/null +++ b/initramfs/eglibc-rootfs/sbin/klogd @@ -0,0 +1 @@ +../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/sbin/ldconfig b/initramfs/eglibc-rootfs/sbin/ldconfig Binary files differnew file mode 100755 index 00000000..74da4189 --- /dev/null +++ b/initramfs/eglibc-rootfs/sbin/ldconfig diff --git a/initramfs/eglibc-rootfs/sbin/loadkmap b/initramfs/eglibc-rootfs/sbin/loadkmap new file mode 120000 index 00000000..71259713 --- /dev/null +++ b/initramfs/eglibc-rootfs/sbin/loadkmap @@ -0,0 +1 @@ +../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/sbin/logread b/initramfs/eglibc-rootfs/sbin/logread new file mode 120000 index 00000000..71259713 --- /dev/null +++ b/initramfs/eglibc-rootfs/sbin/logread @@ -0,0 +1 @@ +../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/sbin/lsmod b/initramfs/eglibc-rootfs/sbin/lsmod new file mode 120000 index 00000000..71259713 --- /dev/null +++ b/initramfs/eglibc-rootfs/sbin/lsmod @@ -0,0 +1 @@ +../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/sbin/lspci b/initramfs/eglibc-rootfs/sbin/lspci new file mode 120000 index 00000000..71259713 --- /dev/null +++ b/initramfs/eglibc-rootfs/sbin/lspci @@ -0,0 +1 @@ +../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/sbin/lsusb b/initramfs/eglibc-rootfs/sbin/lsusb new file mode 120000 index 00000000..71259713 --- /dev/null +++ b/initramfs/eglibc-rootfs/sbin/lsusb @@ -0,0 +1 @@ +../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/sbin/mdev b/initramfs/eglibc-rootfs/sbin/mdev new file mode 120000 index 00000000..71259713 --- /dev/null +++ b/initramfs/eglibc-rootfs/sbin/mdev @@ -0,0 +1 @@ +../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/sbin/mkdosfs b/initramfs/eglibc-rootfs/sbin/mkdosfs new file mode 120000 index 00000000..71259713 --- /dev/null +++ b/initramfs/eglibc-rootfs/sbin/mkdosfs @@ -0,0 +1 @@ +../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/sbin/mkfs.vfat b/initramfs/eglibc-rootfs/sbin/mkfs.vfat new file mode 120000 index 00000000..71259713 --- /dev/null +++ b/initramfs/eglibc-rootfs/sbin/mkfs.vfat @@ -0,0 +1 @@ +../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/sbin/mkswap b/initramfs/eglibc-rootfs/sbin/mkswap new file mode 120000 index 00000000..71259713 --- /dev/null +++ b/initramfs/eglibc-rootfs/sbin/mkswap @@ -0,0 +1 @@ +../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/sbin/modprobe b/initramfs/eglibc-rootfs/sbin/modprobe new file mode 120000 index 00000000..71259713 --- /dev/null +++ b/initramfs/eglibc-rootfs/sbin/modprobe @@ -0,0 +1 @@ +../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/sbin/poweroff b/initramfs/eglibc-rootfs/sbin/poweroff new file mode 120000 index 00000000..71259713 --- /dev/null +++ b/initramfs/eglibc-rootfs/sbin/poweroff @@ -0,0 +1 @@ +../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/sbin/reboot b/initramfs/eglibc-rootfs/sbin/reboot new file mode 120000 index 00000000..71259713 --- /dev/null +++ b/initramfs/eglibc-rootfs/sbin/reboot @@ -0,0 +1 @@ +../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/sbin/rmmod b/initramfs/eglibc-rootfs/sbin/rmmod new file mode 120000 index 00000000..71259713 --- /dev/null +++ b/initramfs/eglibc-rootfs/sbin/rmmod @@ -0,0 +1 @@ +../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/sbin/route b/initramfs/eglibc-rootfs/sbin/route new file mode 120000 index 00000000..71259713 --- /dev/null +++ b/initramfs/eglibc-rootfs/sbin/route @@ -0,0 +1 @@ +../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/sbin/start-stop-daemon b/initramfs/eglibc-rootfs/sbin/start-stop-daemon new file mode 120000 index 00000000..71259713 --- /dev/null +++ b/initramfs/eglibc-rootfs/sbin/start-stop-daemon @@ -0,0 +1 @@ +../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/sbin/swapoff b/initramfs/eglibc-rootfs/sbin/swapoff new file mode 120000 index 00000000..71259713 --- /dev/null +++ b/initramfs/eglibc-rootfs/sbin/swapoff @@ -0,0 +1 @@ +../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/sbin/swapon b/initramfs/eglibc-rootfs/sbin/swapon new file mode 120000 index 00000000..71259713 --- /dev/null +++ b/initramfs/eglibc-rootfs/sbin/swapon @@ -0,0 +1 @@ +../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/sbin/switch_root b/initramfs/eglibc-rootfs/sbin/switch_root new file mode 120000 index 00000000..71259713 --- /dev/null +++ b/initramfs/eglibc-rootfs/sbin/switch_root @@ -0,0 +1 @@ +../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/sbin/sysctl b/initramfs/eglibc-rootfs/sbin/sysctl new file mode 120000 index 00000000..71259713 --- /dev/null +++ b/initramfs/eglibc-rootfs/sbin/sysctl @@ -0,0 +1 @@ +../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/sbin/syslogd b/initramfs/eglibc-rootfs/sbin/syslogd new file mode 120000 index 00000000..71259713 --- /dev/null +++ b/initramfs/eglibc-rootfs/sbin/syslogd @@ -0,0 +1 @@ +../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/sbin/tunctl b/initramfs/eglibc-rootfs/sbin/tunctl new file mode 120000 index 00000000..71259713 --- /dev/null +++ b/initramfs/eglibc-rootfs/sbin/tunctl @@ -0,0 +1 @@ +../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/sbin/udhcpc b/initramfs/eglibc-rootfs/sbin/udhcpc new file mode 120000 index 00000000..71259713 --- /dev/null +++ b/initramfs/eglibc-rootfs/sbin/udhcpc @@ -0,0 +1 @@ +../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/sbin/vconfig b/initramfs/eglibc-rootfs/sbin/vconfig new file mode 120000 index 00000000..71259713 --- /dev/null +++ b/initramfs/eglibc-rootfs/sbin/vconfig @@ -0,0 +1 @@ +../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/sbin/watchdog b/initramfs/eglibc-rootfs/sbin/watchdog new file mode 120000 index 00000000..71259713 --- /dev/null +++ b/initramfs/eglibc-rootfs/sbin/watchdog @@ -0,0 +1 @@ +../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/sbin/zcip b/initramfs/eglibc-rootfs/sbin/zcip new file mode 120000 index 00000000..71259713 --- /dev/null +++ b/initramfs/eglibc-rootfs/sbin/zcip @@ -0,0 +1 @@ +../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/[ b/initramfs/eglibc-rootfs/usr/bin/[ new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/[ @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/[[ b/initramfs/eglibc-rootfs/usr/bin/[[ new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/[[ @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/ar b/initramfs/eglibc-rootfs/usr/bin/ar new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/ar @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/arping b/initramfs/eglibc-rootfs/usr/bin/arping new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/arping @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/awk b/initramfs/eglibc-rootfs/usr/bin/awk new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/awk @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/basename b/initramfs/eglibc-rootfs/usr/bin/basename new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/basename @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/bunzip2 b/initramfs/eglibc-rootfs/usr/bin/bunzip2 new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/bunzip2 @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/bzcat b/initramfs/eglibc-rootfs/usr/bin/bzcat new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/bzcat @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/bzip2 b/initramfs/eglibc-rootfs/usr/bin/bzip2 new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/bzip2 @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/chvt b/initramfs/eglibc-rootfs/usr/bin/chvt new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/chvt @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/cut b/initramfs/eglibc-rootfs/usr/bin/cut new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/cut @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/deallocvt b/initramfs/eglibc-rootfs/usr/bin/deallocvt new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/deallocvt @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/du b/initramfs/eglibc-rootfs/usr/bin/du new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/du @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/eject b/initramfs/eglibc-rootfs/usr/bin/eject new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/eject @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/env b/initramfs/eglibc-rootfs/usr/bin/env new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/env @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/expr b/initramfs/eglibc-rootfs/usr/bin/expr new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/expr @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/find b/initramfs/eglibc-rootfs/usr/bin/find new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/find @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/free b/initramfs/eglibc-rootfs/usr/bin/free new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/free @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/ftpget b/initramfs/eglibc-rootfs/usr/bin/ftpget new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/ftpget @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/ftpput b/initramfs/eglibc-rootfs/usr/bin/ftpput new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/ftpput @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/head b/initramfs/eglibc-rootfs/usr/bin/head new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/head @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/id b/initramfs/eglibc-rootfs/usr/bin/id new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/id @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/killall b/initramfs/eglibc-rootfs/usr/bin/killall new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/killall @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/ld b/initramfs/eglibc-rootfs/usr/bin/ld Binary files differnew file mode 100755 index 00000000..f169e2ec --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/ld diff --git a/initramfs/eglibc-rootfs/usr/bin/ldd b/initramfs/eglibc-rootfs/usr/bin/ldd new file mode 100755 index 00000000..4dba3cfb --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/ldd @@ -0,0 +1,193 @@ +#! /bin/bash +# Copyright (C) 1996-2008, 2009 Free Software Foundation, Inc. +# This file is part of the GNU C Library. + +# The GNU C Library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. + +# The GNU C Library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. + +# You should have received a copy of the GNU Lesser General Public +# License along with the GNU C Library; if not, write to the Free +# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + + +# This is the `ldd' command, which lists what shared libraries are +# used by given dynamically-linked executables. It works by invoking the +# run-time dynamic linker as a command and setting the environment +# variable LD_TRACE_LOADED_OBJECTS to a non-empty value. + +# We should be able to find the translation right at the beginning. +TEXTDOMAIN=libc +TEXTDOMAINDIR=/usr/share/locale + +RTLDLIST="/lib/ld-linux.so.2 /lib64/ld-linux-x86-64.so.2" +warn= +bind_now= +verbose= + +while test $# -gt 0; do + case "$1" in + --vers | --versi | --versio | --version) + echo 'ldd (Debian EGLIBC 2.11.2-2) 2.11.2' + printf $"Copyright (C) %s Free Software Foundation, Inc. +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +" "2009" + printf $"Written by %s and %s. +" "Roland McGrath" "Ulrich Drepper" + exit 0 + ;; + --h | --he | --hel | --help) + printf $"Usage: ldd [OPTION]... FILE... + --help print this help and exit + --version print version information and exit + -d, --data-relocs process data relocations + -r, --function-relocs process data and function relocations + -u, --unused print unused direct dependencies + -v, --verbose print all information +" + printf $"For bug reporting instructions, please see: +%s. +" "<http://www.debian.org/Bugs/>" + exit 0 + ;; + -d | --d | --da | --dat | --data | --data- | --data-r | --data-re | \ + --data-rel | --data-relo | --data-reloc | --data-relocs) + warn=yes + shift + ;; + -r | --f | --fu | --fun | --func | --funct | --functi | --functio | \ + --function | --function- | --function-r | --function-re | --function-rel | \ + --function-relo | --function-reloc | --function-relocs) + warn=yes + bind_now=yes + shift + ;; + -v | --verb | --verbo | --verbos | --verbose) + verbose=yes + shift + ;; + -u | --u | --un | --unu | --unus | --unuse | --unused) + unused=yes + shift + ;; + --v | --ve | --ver) + echo >&2 $"ldd: option \`$1' is ambiguous" + exit 1 + ;; + --) # Stop option processing. + shift; break + ;; + -*) + echo >&2 'ldd:' $"unrecognized option" "\`$1'" + echo >&2 $"Try \`ldd --help' for more information." + exit 1 + ;; + *) + break + ;; + esac +done + +nonelf () +{ + # Maybe extra code for non-ELF binaries. + return 1; +} + +add_env="LD_TRACE_LOADED_OBJECTS=1 LD_WARN=$warn LD_BIND_NOW=$bind_now" +add_env="$add_env LD_LIBRARY_VERSION=\$verify_out" +add_env="$add_env LD_VERBOSE=$verbose" +if test "$unused" = yes; then + add_env="$add_env LD_DEBUG=\"$LD_DEBUG${LD_DEBUG:+,}unused\"" +fi + +# The following use of cat is needed to make ldd work in SELinux +# environments where the executed program might not have permissions +# to write to the console/tty. But only bash 3.x supports the pipefail +# option, and we don't bother to handle the case for older bash versions. +if x=`set -o` && test "$x" != "${x#*pipefail}" && set -o pipefail ; then + try_trace() { + eval $add_env '"$@"' | cat + } +else + try_trace() { + eval $add_env '"$@"' + } +fi + +case $# in +0) + echo >&2 'ldd:' $"missing file arguments" + echo >&2 $"Try \`ldd --help' for more information." + exit 1 + ;; +1) + single_file=t + ;; +*) + single_file=f + ;; +esac + +result=0 +for file do + # We don't list the file name when there is only one. + test $single_file = t || echo "${file}:" + case $file in + */*) : + ;; + *) file=./$file + ;; + esac + if test ! -e "$file"; then + echo "ldd: ${file}:" $"No such file or directory" >&2 + result=1 + elif test ! -f "$file"; then + echo "ldd: ${file}:" $"not regular file" >&2 + result=1 + elif test -r "$file"; then + RTLD= + ret=1 + for rtld in ${RTLDLIST}; do + if test -x $rtld; then + verify_out=`${rtld} --verify "$file"` + ret=$? + case $ret in + [02]) RTLD=${rtld}; break;; + esac + fi + done + case $ret in + 0|2) + try_trace "$RTLD" "$file" || result=1 + ;; + 1|126) + # This can be a non-ELF binary or no binary at all. + nonelf "$file" || { + echo $" not a dynamic executable" + result=1 + } + ;; + *) + echo 'ldd:' ${RTLD} $"exited with unknown exit code" "($ret)" >&2 + exit 1 + ;; + esac + else + echo 'ldd:' $"error: you do not have read permission for" "\`$file'" >&2 + result=1 + fi +done + +exit $result +# Local Variables: +# mode:ksh +# End: diff --git a/initramfs/eglibc-rootfs/usr/bin/less b/initramfs/eglibc-rootfs/usr/bin/less new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/less @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/logger b/initramfs/eglibc-rootfs/usr/bin/logger new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/logger @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/lzmacat b/initramfs/eglibc-rootfs/usr/bin/lzmacat new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/lzmacat @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/md5sum b/initramfs/eglibc-rootfs/usr/bin/md5sum new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/md5sum @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/nc b/initramfs/eglibc-rootfs/usr/bin/nc new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/nc @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/nmeter b/initramfs/eglibc-rootfs/usr/bin/nmeter new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/nmeter @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/openvt b/initramfs/eglibc-rootfs/usr/bin/openvt new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/openvt @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/printf b/initramfs/eglibc-rootfs/usr/bin/printf new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/printf @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/readahead b/initramfs/eglibc-rootfs/usr/bin/readahead new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/readahead @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/readlink b/initramfs/eglibc-rootfs/usr/bin/readlink new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/readlink @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/realpath b/initramfs/eglibc-rootfs/usr/bin/realpath new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/realpath @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/rpm2cpio b/initramfs/eglibc-rootfs/usr/bin/rpm2cpio new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/rpm2cpio @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/sort b/initramfs/eglibc-rootfs/usr/bin/sort new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/sort @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/strings b/initramfs/eglibc-rootfs/usr/bin/strings new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/strings @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/tail b/initramfs/eglibc-rootfs/usr/bin/tail new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/tail @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/test b/initramfs/eglibc-rootfs/usr/bin/test new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/test @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/tftp b/initramfs/eglibc-rootfs/usr/bin/tftp new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/tftp @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/time b/initramfs/eglibc-rootfs/usr/bin/time new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/time @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/timeout b/initramfs/eglibc-rootfs/usr/bin/timeout new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/timeout @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/tr b/initramfs/eglibc-rootfs/usr/bin/tr new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/tr @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/uniq b/initramfs/eglibc-rootfs/usr/bin/uniq new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/uniq @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/unlzma b/initramfs/eglibc-rootfs/usr/bin/unlzma new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/unlzma @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/uptime b/initramfs/eglibc-rootfs/usr/bin/uptime new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/uptime @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/wc b/initramfs/eglibc-rootfs/usr/bin/wc new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/wc @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/wget b/initramfs/eglibc-rootfs/usr/bin/wget new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/wget @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/which b/initramfs/eglibc-rootfs/usr/bin/which new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/which @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/whoami b/initramfs/eglibc-rootfs/usr/bin/whoami new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/whoami @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/bin/xargs b/initramfs/eglibc-rootfs/usr/bin/xargs new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/bin/xargs @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/lib/libbfd-2.20.1-system.20100303.so b/initramfs/eglibc-rootfs/usr/lib/libbfd-2.20.1-system.20100303.so Binary files differnew file mode 100644 index 00000000..ae24957b --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/lib/libbfd-2.20.1-system.20100303.so diff --git a/initramfs/eglibc-rootfs/usr/lib/libhal.so.1 b/initramfs/eglibc-rootfs/usr/lib/libhal.so.1 Binary files differnew file mode 100644 index 00000000..8db463f0 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/lib/libhal.so.1 diff --git a/initramfs/eglibc-rootfs/usr/lib/libhd.so.16 b/initramfs/eglibc-rootfs/usr/lib/libhd.so.16 Binary files differnew file mode 100644 index 00000000..3fd68f29 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/lib/libhd.so.16 diff --git a/initramfs/eglibc-rootfs/usr/lib/libz.so.1 b/initramfs/eglibc-rootfs/usr/lib/libz.so.1 Binary files differnew file mode 100644 index 00000000..c1b51178 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/lib/libz.so.1 diff --git a/initramfs/eglibc-rootfs/usr/sbin/brctl b/initramfs/eglibc-rootfs/usr/sbin/brctl new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/sbin/brctl @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/sbin/chroot b/initramfs/eglibc-rootfs/usr/sbin/chroot new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/sbin/chroot @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/sbin/fbset b/initramfs/eglibc-rootfs/usr/sbin/fbset new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/sbin/fbset @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/sbin/httpd b/initramfs/eglibc-rootfs/usr/sbin/httpd new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/sbin/httpd @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/sbin/hwinfo b/initramfs/eglibc-rootfs/usr/sbin/hwinfo Binary files differnew file mode 100755 index 00000000..5dbe48a4 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/sbin/hwinfo diff --git a/initramfs/eglibc-rootfs/usr/sbin/loadfont b/initramfs/eglibc-rootfs/usr/sbin/loadfont new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/sbin/loadfont @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/sbin/rdate b/initramfs/eglibc-rootfs/usr/sbin/rdate new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/sbin/rdate @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/eglibc-rootfs/usr/sbin/setlogcons b/initramfs/eglibc-rootfs/usr/sbin/setlogcons new file mode 120000 index 00000000..f948f1a7 --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/sbin/setlogcons @@ -0,0 +1 @@ +../../bin/busybox
\ No newline at end of file diff --git a/initramfs/stage3-stuff/bin/hwautocfg b/initramfs/stage3-stuff/bin/hwautocfg index fee54a16..fdf9f485 100755 --- a/initramfs/stage3-stuff/bin/hwautocfg +++ b/initramfs/stage3-stuff/bin/hwautocfg @@ -1,6 +1,6 @@ #!/bin/ash # Copyright (c) 2003..2006 - RZ Uni Freiburg -# Copyright (c) 2006..2009 - OpenSLX GmbH +# Copyright (c) 2006..2010 - OpenSLX GmbH # # This program is free software distributed under the GPL version 2. # See http://openslx.org/COPYING @@ -28,6 +28,40 @@ done echo "0 0 0 0" >/proc/sys/kernel/printk echo "/sbin/mdev" >/proc/sys/kernel/hotplug modprobe -a ${MODPRV} usbhid hid-bright 2>/dev/null & +# get information on the graphics adaptor if bootsplash or xserver plugins are +# present and the new drm/kms infrastructure is present +if strinfile "vga=" /proc/cmdline; then + ( modprobe -a vesafb fbcon 2>/dev/null + hwinfo --gfxcard >/etc/hwinfo.gfxcard ) & +elif [ -e /etc/init-hooks/00-started/xserver.sh -o \ + -e /etc/init-hooks/05-started/bootsplash.sh ] && \ + [ -e /lib/modules/${KERNEL}/kernel/drivers/gpu ]; then + # check for the standard modules (single gpu, multiple connector only) + ( hwinfo --gfxcard >/etc/hwinfo.gfxcard + case $(cat /etc/hwinfo.gfxcard) in + *i915*) + modprobe -a ${MODPRV} i915 2>/dev/null + ;; + *intel*|*Intel*) + modprobe -a ${MODPRV} i810 i830 i915 2>/dev/null + ;; + *nvidia*|*NVidia*|*nouveau*) + modprobe ${MODPRV} nouveau 2>/dev/null + ;; + *radeon*|*Radeon*) + modprobe ${MODPRV} radeon 2>/dev/null + ;; + *mga*|*matrox*|*Matrox*) + modprobe ${MODPRV} mga 2>/dev/null + ;; + *) + modprobe -a ${MODPRV} r128 savage sis tdfx ttm via + ;; + esac + modprobe -a drm fbcon; mdev -s ) & +fi + +# check and then load appropriate network card modules nwcardlist=$(echo ${slxconf_listnwmod}|sed "s/\ /|/g") # save results for later info and for Xen plugin when starting Xen VM hwinfo --netcard --usb-ctrl >/etc/hwinfo.netcard-usbctrl @@ -38,6 +72,7 @@ if [ $(grep -ic "virtio_pci" /etc/modprobe.base) -ge 1 ]; then echo "modprobe virtio_net" >>/etc/modprobe.base fi ash /etc/modprobe.base; mdev -s + # optimization possible: exclude network and usb base drivers from the # following list (bios detection for non-hwautocfg component) ( hwinfo --pci >/etc/hwinfo.data; echo "read pci device list at $(sysup)" \ diff --git a/initramfs/stage3-stuff/init b/initramfs/stage3-stuff/init index 86d9da9c..50bd604c 100755 --- a/initramfs/stage3-stuff/init +++ b/initramfs/stage3-stuff/init @@ -403,15 +403,15 @@ if strinstr "eth" "$nwif" ; then error "$init_errnwad" else # assume a forcedeth problem here (nonmatching MACs) - error "$init_nveth" nonfatal macaddr=${bootmac} fi break fi done fi -# hook to setup bridging (several virtualization tools ...) - +# quickfix for proper nwif passing ... (to be fixed in a more general way) +sed "s/nwif=.*/nwif=\"${nwif}\"/" -i /tmp/env/wrapper.env +# hook to setup bridging (several virtualization tools ... runinithook '20-nw-bridge-config' # set up loopback networking diff --git a/installer/OpenSLX/OSExport/Distro/Suse.pm b/installer/OpenSLX/OSExport/Distro/Suse.pm index f3579bbb..4378224a 100644 --- a/installer/OpenSLX/OSExport/Distro/Suse.pm +++ b/installer/OpenSLX/OSExport/Distro/Suse.pm @@ -40,6 +40,7 @@ sub initDistroInfo - /var/tmp/* - /var/spool/* - /var/run/* + + /var/run/screen - /var/mail - /var/log/* - /var/lock/* diff --git a/installer/OpenSLX/OSExport/Distro/Ubuntu.pm b/installer/OpenSLX/OSExport/Distro/Ubuntu.pm index 77e5a2af..566817b8 100644 --- a/installer/OpenSLX/OSExport/Distro/Ubuntu.pm +++ b/installer/OpenSLX/OSExport/Distro/Ubuntu.pm @@ -40,6 +40,7 @@ sub initDistroInfo - /var/tmp/* - /var/spool/* - /var/run/* + + /var/run/screen - /var/log/* - /var/log/apt/* + /var/log/apt diff --git a/installer/OpenSLX/OSSetup/Distro/Base.pm b/installer/OpenSLX/OSSetup/Distro/Base.pm index f3fe05ab..c5d23a49 100644 --- a/installer/OpenSLX/OSSetup/Distro/Base.pm +++ b/installer/OpenSLX/OSSetup/Distro/Base.pm @@ -78,8 +78,9 @@ sub initialize - /var/lib/vmware - /var/lib/ntp/* - /var/run/* + + /var/run/screen - /var/log/* - + /var + + /var/log/apt - /usr/lib/vmware/modules/* + /usr - /tmp/* @@ -110,6 +111,7 @@ sub initialize - /etc/samba/secrets.tdb - /etc/resolv.conf.* - /etc/opt/openslx + + /etc/opt/openslx - /etc/exports* - /etc/X11/xorg.* - /etc/X11/XF86* diff --git a/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm b/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm index 697d4184..ec58d132 100644 --- a/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm +++ b/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm @@ -1,4 +1,4 @@ -# Copyright (c) 2007 - OpenSLX GmbH +# Copyright (c) 2007..2010 - OpenSLX GmbH # # This program is free software distributed under the GPL version 2. # See http://openslx.org/COPYING @@ -107,9 +107,9 @@ sub suggestAdditionalKernelModules my @suggestedModules; # Ubuntu needs vesafb and fbcon (which drags along some others) - if ($makeInitRamFSEngine->{'distro-name'} =~ m{^ubuntu}i) { - push @suggestedModules, qw( vesafb fbcon ) - } + #if ($makeInitRamFSEngine->{'distro-name'} =~ m{^ubuntu}i) { + push @suggestedModules, qw( i810 i830 i915 mga nouveau r128 radeon savage sis tdfx ttm via drm fbcon vesafb ); + #} return @suggestedModules; } diff --git a/os-plugins/plugins/bootsplash/init-hooks/05-have-kernelvars/bootsplash.sh b/os-plugins/plugins/bootsplash/init-hooks/05-have-kernelvars/bootsplash.sh index 24bdcba4..a54fde96 100644 --- a/os-plugins/plugins/bootsplash/init-hooks/05-have-kernelvars/bootsplash.sh +++ b/os-plugins/plugins/bootsplash/init-hooks/05-have-kernelvars/bootsplash.sh @@ -1,6 +1,6 @@ # splashy depends on /proc/fb with VESA # only activate with kernel option quiet and no debuglevel -if grep -E "(VESA|VGA)" /proc/fb > /dev/null 2>&1 \ +if grep -q ".*" /proc/fb > /dev/null 2>&1 \ && grep -qie " quiet " -qie "^quiet " -qie " quiet$" /proc/cmdline \ > /dev/null 2>&1 \ && [ $DEBUGLEVEL -eq 0 ] \ @@ -15,3 +15,4 @@ if [ ${no_bootsplash} -eq 0 ]; then # add splashy.boot runlevel script export D_SPLASHY=splashy.boot fi + diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm index e6d9a819..96c8c89d 100644 --- a/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm +++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm @@ -48,9 +48,9 @@ sub getDefaultDesktopManager { my $self = shift; - # the default implementation prefers GDM over KDM over XDM - return $self->isGDMInstalled() ? 'gdm' - : $self->isKDMInstalled() ? 'kdm' + # the default implementation prefers KDM over GDM over XDM + return $self->isKDMInstalled() ? 'kdm' + : $self->isGDMInstalled() ? 'gdm' : $self->isXDMInstalled() ? 'xdm' : undef; } diff --git a/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm b/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm index 4bd05278..7d496483 100644 --- a/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm +++ b/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm @@ -508,7 +508,7 @@ sub _ensureSensibleStage3Attrs # one, if it isn't my $manager = $self->{attrs}->{'desktop::manager'} || ''; if (!$self->{$manager}) { - my @managers = map { $self->{$_} ? $_ : () } qw( gdm kdm xdm ); + my @managers = map { $self->{$_} ? $_ : () } qw( kdm gdm xdm ); if (!@managers) { die _tr( "no desktop manager is possible, plugin 'desktop' wouldn't work!" diff --git a/os-plugins/plugins/xserver/OpenSLX/Distro/Suse.pm b/os-plugins/plugins/xserver/OpenSLX/Distro/Suse.pm index 55f42117..29342f3b 100644 --- a/os-plugins/plugins/xserver/OpenSLX/Distro/Suse.pm +++ b/os-plugins/plugins/xserver/OpenSLX/Distro/Suse.pm @@ -41,6 +41,37 @@ sub setupXserverScript # add stuff to the script generated via Base.pm $script .= unshiftHereDoc(<<' End-of-Here'); # SuSE specific extension to stage3 xserver.sh + # Add InputClass to proper setup the keyboard and other input + echo 'Section "InputClass" + Identifier "evdev pointer catchall" + MatchIsPointer "on" + MatchDevicePath "/dev/input/event*" + Driver "evdev" + EndSection + Section "InputClass" + Identifier "evdev keyboard catchall" + MatchIsKeyboard "on" + MatchDevicePath "/dev/input/event*" + Driver "evdev" + EndSection + Section "InputClass" + Identifier "evdev touchpad catchall" + MatchIsTouchpad "on" + MatchDevicePath "/dev/input/event*" + Driver "evdev" + EndSection + Section "InputClass" + Identifier "evdev tablet catchall" + MatchIsTablet "on" + MatchDevicePath "/dev/input/event*" + Driver "evdev" + EndSection + Section "InputClass" + Identifier "evdev touchscreen catchall" + MatchIsTouchscreen "on" + MatchDevicePath "/dev/input/event*" + Driver "evdev" + EndSection' >/mnt/etc/X11/xorg.conf.d/10-evdev.conf # Xorg hardware is autodetected, so no module information provided [ -z "${xmodule}" ] && \ sed "/Section \"Device\"/,/EndSection/d" -i ${xfc} diff --git a/os-plugins/plugins/xserver/OpenSLX/Distro/Suse_10_2.pm b/os-plugins/plugins/xserver/OpenSLX/Distro/Suse_10.pm index f72ba877..f0c3ebb8 100644 --- a/os-plugins/plugins/xserver/OpenSLX/Distro/Suse_10_2.pm +++ b/os-plugins/plugins/xserver/OpenSLX/Distro/Suse_10.pm @@ -1,4 +1,4 @@ -# Copyright (c) 2008 - OpenSLX GmbH +# Copyright (c) 2008..2010 - OpenSLX GmbH # # This program is free software distributed under the GPL version 2. # See http://openslx.org/COPYING @@ -8,11 +8,11 @@ # # General information about OpenSLX can be found at http://openslx.org/ # ----------------------------------------------------------------------------- -# xserver/OpenSLX/Distro/Suse_10_2.pm +# xserver/OpenSLX/Distro/Suse_10.pm # - provides SUSE-specific overrides of the Distro API for the xserver # plugin. # ----------------------------------------------------------------------------- -package xserver::OpenSLX::Distro::Suse_10_2; +package xserver::OpenSLX::Distro::Suse_10; use strict; use warnings; @@ -41,6 +41,8 @@ sub setupXserverScript testmkd /mnt/var/X11R6/bin ln -s /usr/bin/Xorg /mnt/var/X11R6/bin/X rm /mnt/etc/X11/xdm/SuSEconfig.xdm + # use the old kbd keyboard driver instead of evdev + sed "s/\"evdev\"/,/\"kbd\"/" -i ${xfc} # relevant for older xservers only: check for kind of xorg module used # and patch the i8,9XX VGA BIOS if needed #if strinfile '"i810"' $xfc && [ -f /etc/hwinfo.display ] ; then diff --git a/os-plugins/plugins/xserver/OpenSLX/Distro/Ubuntu_8.pm b/os-plugins/plugins/xserver/OpenSLX/Distro/Ubuntu_8.pm index 0c152dba..1fa88446 100644 --- a/os-plugins/plugins/xserver/OpenSLX/Distro/Ubuntu_8.pm +++ b/os-plugins/plugins/xserver/OpenSLX/Distro/Ubuntu_8.pm @@ -35,6 +35,8 @@ sub setupXserverScript $script .= unshiftHereDoc(<<' End-of-Here'); # Ubuntu specific extension to stage3 xserver.sh + # use the old kbd keyboard driver instead of evdev + sed "s/\"evdev\"/,/\"kbd\"/" -i ${xfc} testmkd /mnt/var/run/xauth testmkd /mnt/var/lib/xkb ln -sf /usr/bin/Xorg /mnt/etc/X11/X diff --git a/os-plugins/plugins/xserver/XX_xserver.sh b/os-plugins/plugins/xserver/XX_xserver.sh index a2318c9f..1b757901 100644 --- a/os-plugins/plugins/xserver/XX_xserver.sh +++ b/os-plugins/plugins/xserver/XX_xserver.sh @@ -49,7 +49,7 @@ x_mouse='Section "InputDevice" EndSection' x_keyboard='Section "InputDevice" Identifier "Generic Keyboard" - Driver "kbd" + Driver "evdev" Option "CoreKeyboard" Option "XkbRules" "xorg" Option "XkbModel" "pc105" diff --git a/os-plugins/plugins/xserver/init-hooks/00-started/xserver.sh b/os-plugins/plugins/xserver/init-hooks/00-started/xserver.sh index 3e50b77f..0b08ec13 100644 --- a/os-plugins/plugins/xserver/init-hooks/00-started/xserver.sh +++ b/os-plugins/plugins/xserver/init-hooks/00-started/xserver.sh @@ -43,7 +43,9 @@ case ${slxconf_distro_ver} in "10.04"|"11.3") ;; *) - ( hwinfo --gfxcard >/etc/hwinfo.gfxcard ) & + # hwinfo --gfxcard moved to general hardware detection as needed for two + # different plugins (bootsplash, xserver) + #( hwinfo --gfxcard >/etc/hwinfo.gfxcard ) & ( hwinfo --monitor >/etc/hwinfo.display; grep "Generic Monitor" \ /etc/hwinfo.display >/dev/null 2>&1 && rm /etc/hwinfo.display ) & ;; |