Changeset 3090


Ignore:
Timestamp:
Mar 13, 2013, 10:12:46 PM (6 years ago)
Author:
bruno
Message:
  • Try to improve ctrl-alt-del detection by adding busybox options (including syslog, klog which were missing). showkey show that the sendkey from KVM generates the right keycodes, but a release RETURN key is seen in the middle that may make this test a void one, compared to a real physical test.
  • rcS now alos displays messages on tty9
  • more inittab cleanups taken from various examples
Location:
branches/3.0
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/3.0/mindi-busybox/.config

    r3088 r3090  
    22# Automatically generated make config: don't edit
    33# Busybox version: 1.18.5-rPBREV
    4 # Wed Mar 13 01:54:31 2013
     4# Wed Mar 13 18:16:16 2013
    55#
    66CONFIG_HAVE_DOT_CONFIG=y
     
    1414#
    1515# CONFIG_DESKTOP is not set
    16 # CONFIG_EXTRA_COMPAT is not set
     16CONFIG_EXTRA_COMPAT=y
    1717CONFIG_INCLUDE_SUSv2=y
    1818# CONFIG_USE_PORTABLE_CODE is not set
     
    2222# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
    2323CONFIG_SHOW_USAGE=y
    24 # CONFIG_FEATURE_VERBOSE_USAGE is not set
     24CONFIG_FEATURE_VERBOSE_USAGE=y
    2525CONFIG_FEATURE_COMPRESS_USAGE=y
    2626CONFIG_FEATURE_INSTALLER=y
     
    9292CONFIG_PASSWORD_MINLEN=6
    9393CONFIG_MD5_SIZE_VS_SPEED=2
    94 # CONFIG_FEATURE_FAST_TOP is not set
     94CONFIG_FEATURE_FAST_TOP=y
    9595# CONFIG_FEATURE_ETC_NETWORKS is not set
    9696CONFIG_FEATURE_USE_TERMIOS=y
     
    105105# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set
    106106CONFIG_FEATURE_NON_POSIX_CP=y
    107 # CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
     107CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y
    108108CONFIG_FEATURE_COPYBUF_KB=4
    109109# CONFIG_MONOTONIC_SYSCALL is not set
     
    426426CONFIG_FEATURE_INIT_SCTTY=y
    427427CONFIG_FEATURE_INIT_SYSLOG=y
    428 CONFIG_FEATURE_EXTRA_QUIET=y
     428# CONFIG_FEATURE_EXTRA_QUIET is not set
    429429CONFIG_FEATURE_INIT_COREDUMPS=y
    430430CONFIG_FEATURE_INITRD=y
     
    977977# System Logging Utilities
    978978#
    979 # CONFIG_SYSLOGD is not set
     979CONFIG_SYSLOGD=y
    980980# CONFIG_FEATURE_ROTATE_LOGFILE is not set
    981 # CONFIG_FEATURE_REMOTE_LOG is not set
    982 # CONFIG_FEATURE_SYSLOGD_DUP is not set
    983 CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0
    984 # CONFIG_FEATURE_IPC_SYSLOG is not set
    985 CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
    986 # CONFIG_LOGREAD is not set
    987 # CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
    988 # CONFIG_KLOGD is not set
    989 # CONFIG_FEATURE_KLOGD_KLOGCTL is not set
     981CONFIG_FEATURE_REMOTE_LOG=y
     982CONFIG_FEATURE_SYSLOGD_DUP=y
     983CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256
     984CONFIG_FEATURE_IPC_SYSLOG=y
     985CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
     986CONFIG_LOGREAD=y
     987CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
     988CONFIG_KLOGD=y
     989CONFIG_FEATURE_KLOGD_KLOGCTL=y
    990990# CONFIG_LOGGER is not set
  • branches/3.0/mindi/rootfs/etc/init.d/rcS

    r3051 r3090  
    106106    openvt $opt 7 /bin/sh /sbin/wait-for-petris
    107107    openvt $opt 8 /usr/bin/tail -f $LOGFILE
     108    openvt $opt 9 /usr/bin/tail -f /var/log/messages
    108109    # May avoid shell error messages
    109110    chmod 666 /dev/tty* /dev/console
  • branches/3.0/mindi/rootfs/etc/inittab

    r3089 r3090  
    11#
    22# inittab       This file describes how the INIT process should set up
    3 #               the system in a certain run-level.
     3#               the system in the mindi-busybox context
    44#
    5 # Default runlevel for MondoRescue 3
    6 #
    7 id:3:initdefault:
     5
     6# Order is important, read from bottom to top
     7
     8# By default launch the MondoRescue script
     9console::sysinit:/etc/init.d/rcS
     10
     11console::restart:/sbin/init
    812
    913# Trap CTRL-ALT-DELETE
    10 ca::ctrlaltdel:/sbin/reboot
    11 #::ctrlaltdel:/bin/umount -a -r
     14null::ctrlaltdel:/sbin/reboot
    1215
    13 ::respawn:-/bin/sh
    14 tty2::askfirst:/bin/sh
    15 tty3::askfirst:/bin/sh
    16 tty4::askfirst:/bin/sh
    17 tty5::askfirst:/bin/sh
    18 tty6::askfirst:/bin/sh
    19 tty7::askfirst:/bin/sh
    20 
    21 # Single user mode
    22 su:S:wait:/bin/sh
     16null::shutdown:/bin/killall klogd
     17null::shutdown:/bin/killall syslogd
     18null::shutdown:/bin/umount -a -r
  • branches/3.0/mondo/test/mondo-test

    r3088 r3090  
    1212
    1313# You may have multiple distros here
    14 #TESTVMDIST="rhel-6-x86_64"
     14TESTVMDIST="rhel-6-x86_64"
    1515#TESTVMDIST="ubuntu-11.04-i386"
    16 TESTVMDIST="debian-6.0-x86_64 ubuntu-11.04-i386 fedora-16-x86_64 opensuse-12.1-x86_64 mageia-2-i386 mandriva-2010.1-i386 rhel-6-x86_64 rhel-5-i386 fedora-17-i386 ubuntu-12.10-x86_64"
     16#TESTVMDIST="debian-6.0-x86_64 ubuntu-11.04-i386 fedora-16-x86_64 opensuse-12.1-x86_64 mageia-2-i386 mandriva-2010.1-i386 rhel-6-x86_64 rhel-5-i386 fedora-17-i386 ubuntu-12.10-x86_64"
    1717VMCOMMADIST=`echo $TESTVMDIST | sed 's/ /,/g'`
    1818MRUSER=mrtest
     
    5959
    6060# First start building for all these distro we want
    61 pb -p mondorescue -r branches/3.0 -m $VMCOMMADIST sbx2vm mondo mindi mindi-busybox
     61pb -p mondorescue -g -r branches/3.0 -m $VMCOMMADIST sbx2vm mondo mindi mindi-busybox
    6262
    6363sudocmd "rm -rf $MRTEST/* $MRTEST/.??*"
Note: See TracChangeset for help on using the changeset viewer.