Changeset 3090 in MondoRescue

Timestamp:

Mar 13, 2013, 10:12:46 PM (12 years ago)

Author:

Bruno Cornec

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:

• mindi-busybox/.config (modified) (7 diffs)
• mindi/rootfs/etc/init.d/rcS (modified) (1 diff)
• mindi/rootfs/etc/inittab (modified) (1 diff)
• mondo/test/mondo-test (modified) (2 diffs)

branches/3.0/mindi-busybox/.config

@@ -2 +2 @@
 # Automatically generated make config: don't edit
 # Busybox version: 1.18.5-rPBREV
-# Wed Mar 13 01:54:31 2013
+# Wed Mar 13 18:16:16 2013
 #
 CONFIG_HAVE_DOT_CONFIG=y
@@ -14 +14 @@
 #
 # CONFIG_DESKTOP is not set
-# CONFIG_EXTRA_COMPAT is not set
+CONFIG_EXTRA_COMPAT=y
 CONFIG_INCLUDE_SUSv2=y
 # CONFIG_USE_PORTABLE_CODE is not set
@@ -22 +22 @@
 # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
 CONFIG_SHOW_USAGE=y
-# CONFIG_FEATURE_VERBOSE_USAGE is not set
+CONFIG_FEATURE_VERBOSE_USAGE=y
 CONFIG_FEATURE_COMPRESS_USAGE=y
 CONFIG_FEATURE_INSTALLER=y
@@ -92 +92 @@
 CONFIG_PASSWORD_MINLEN=6
 CONFIG_MD5_SIZE_VS_SPEED=2
-# CONFIG_FEATURE_FAST_TOP is not set
+CONFIG_FEATURE_FAST_TOP=y
 # CONFIG_FEATURE_ETC_NETWORKS is not set
 CONFIG_FEATURE_USE_TERMIOS=y
@@ -105 +105 @@
 # CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set
 CONFIG_FEATURE_NON_POSIX_CP=y
-# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
+CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y
 CONFIG_FEATURE_COPYBUF_KB=4
 # CONFIG_MONOTONIC_SYSCALL is not set
@@ -426 +426 @@
 CONFIG_FEATURE_INIT_SCTTY=y
 CONFIG_FEATURE_INIT_SYSLOG=y
-CONFIG_FEATURE_EXTRA_QUIET=y
+# CONFIG_FEATURE_EXTRA_QUIET is not set
 CONFIG_FEATURE_INIT_COREDUMPS=y
 CONFIG_FEATURE_INITRD=y
@@ -977 +977 @@
 # System Logging Utilities
 #
-# CONFIG_SYSLOGD is not set
+CONFIG_SYSLOGD=y
 # CONFIG_FEATURE_ROTATE_LOGFILE is not set
-# CONFIG_FEATURE_REMOTE_LOG is not set
-# CONFIG_FEATURE_SYSLOGD_DUP is not set
-CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0
-# CONFIG_FEATURE_IPC_SYSLOG is not set
-CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
-# CONFIG_LOGREAD is not set
-# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
-# CONFIG_KLOGD is not set
-# CONFIG_FEATURE_KLOGD_KLOGCTL is not set
+CONFIG_FEATURE_REMOTE_LOG=y
+CONFIG_FEATURE_SYSLOGD_DUP=y
+CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256
+CONFIG_FEATURE_IPC_SYSLOG=y
+CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
+CONFIG_LOGREAD=y
+CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
+CONFIG_KLOGD=y
+CONFIG_FEATURE_KLOGD_KLOGCTL=y
 # CONFIG_LOGGER is not set

branches/3.0/mindi/rootfs/etc/init.d/rcS

@@ -106 +106 @@
     openvt $opt 7 /bin/sh /sbin/wait-for-petris
     openvt $opt 8 /usr/bin/tail -f $LOGFILE
+    openvt $opt 9 /usr/bin/tail -f /var/log/messages
     # May avoid shell error messages
     chmod 666 /dev/tty* /dev/console

branches/3.0/mindi/rootfs/etc/inittab

@@ -1 +1 @@
 #
 # inittab       This file describes how the INIT process should set up
-#               the system in a certain run-level.
+#               the system in the mindi-busybox context
 #
-# Default runlevel for MondoRescue 3
-# 
-id:3:initdefault:
+
+# Order is important, read from bottom to top
+
+# By default launch the MondoRescue script
+console::sysinit:/etc/init.d/rcS
+
+console::restart:/sbin/init
 
 # Trap CTRL-ALT-DELETE
-ca::ctrlaltdel:/sbin/reboot
-#::ctrlaltdel:/bin/umount -a -r
+null::ctrlaltdel:/sbin/reboot
 
-::respawn:-/bin/sh
-tty2::askfirst:/bin/sh
-tty3::askfirst:/bin/sh
-tty4::askfirst:/bin/sh
-tty5::askfirst:/bin/sh
-tty6::askfirst:/bin/sh
-tty7::askfirst:/bin/sh
-
-# Single user mode
-su:S:wait:/bin/sh
+null::shutdown:/bin/killall klogd
+null::shutdown:/bin/killall syslogd
+null::shutdown:/bin/umount -a -r

branches/3.0/mondo/test/mondo-test

@@ -12 +12 @@
 
 # You may have multiple distros here
-#TESTVMDIST="rhel-6-x86_64"
+TESTVMDIST="rhel-6-x86_64"
 #TESTVMDIST="ubuntu-11.04-i386"
-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"
+#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"
 VMCOMMADIST=`echo $TESTVMDIST | sed 's/ /,/g'`
 MRUSER=mrtest
@@ -59 +59 @@
 
 # First start building for all these distro we want
-pb -p mondorescue -r branches/3.0 -m $VMCOMMADIST sbx2vm mondo mindi mindi-busybox
+pb -p mondorescue -g -r branches/3.0 -m $VMCOMMADIST sbx2vm mondo mindi mindi-busybox
 
 sudocmd "rm -rf $MRTEST/* $MRTEST/.??*"