dist-git conversion

Fix typo from bad import script. (releng #2781 )
Unfreeze DCON after failed X start, and fail more quickly when there are
2010-07-28 18:16:43 +00:00 · 2009-10-28 02:54:41 +00:00 · 2008-07-24 16:59:03 +00:00 · 2008-06-29 16:05:13 +00:00 · 2008-06-27 21:29:32 +00:00 · 2008-06-27 01:04:27 +00:00
17 changed files with 648 additions and 2255 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,65 +1 @@
-/initscripts-9.43.tar.bz2
-/initscripts-9.44.tar.bz2
-/initscripts-9.45.tar.bz2
-/initscripts-9.46.tar.bz2
-/initscripts-9.47.tar.bz2
-/initscripts-9.48.tar.bz2
-/initscripts-9.50.tar.bz2
-/initscripts-9.51.tar.bz2
-/initscripts-9.52.tar.bz2
-/initscripts-9.53.tar.bz2
-/initscripts-9.54.tar.bz2
-/initscripts-9.55.tar.bz2
-/initscripts-9.56.1.tar.bz2
-/initscripts-9.58.tar.bz2
-/initscripts-9.59.tar.bz2
-/initscripts-9.60.tar.bz2
-/initscripts-9.61.tar.bz2
-/initscripts-9.62.tar.bz2
-/initscripts-9.63.tar.bz2
-/initscripts-9.64.tar.bz2
-/initscripts-9.65.tar.bz2
-/initscripts-9.66.tar.bz2
-/initscripts-9.67.tar.bz2
-/initscripts-9.68.tar.bz2
-/initscripts-9.69.tar.bz2
-/initscripts-9.70.tar.gz
-/initscripts-9.71.tar.gz
-/initscripts-9.72.tar.gz
-/initscripts-9.74.tar.gz
-/initscripts-9.75.tar.gz
-/initscripts-9.76.tar.gz
-/initscripts-9.77.tar.gz
-/initscripts-9.78.tar.gz
-/initscripts-9.79.tar.gz
-/initscripts-9.80.tar.gz
-/initscripts-9.81.tar.gz
-/initscripts-9.82.tar.gz
-/initscripts-9.83.tar.gz
-/initscripts-10.00.tar.gz
-/initscripts-10.01.tar.gz
-/initscripts-10.02.tar.gz
-/initscripts-10.03.tar.gz
-/initscripts-10.04.tar.gz
-/initscripts-10.05.tar.gz
-/initscripts-10.06.tar.gz
-/initscripts-10.07.tar.gz
-/initscripts-10.08.tar.gz
-/initscripts-10.09.tar.gz
-/initscripts-10.10.tar.gz
-/initscripts-10.11.tar.gz
-/initscripts-10.12.tar.gz
-/initscripts-10.13.tar.gz
-/initscripts-10.14.tar.gz
-/initscripts-10.15.tar.gz
-/initscripts-10.16.tar.gz
-/initscripts-10.17.tar.gz
-/initscripts-10.18.tar.gz
-/initscripts-10.19.tar.gz
-/initscripts-10.20.tar.gz
-/initscripts-10.21.tar.gz
-/initscripts-10.23.tar.gz
-/initscripts-10.24.tar.gz
-/initscripts-10.25.tar.gz
-/initscripts-10.26.tar.gz
-/initscripts-10.27.tar.gz
+initscripts-8.76.2.tar.bz2
--- a/README.md
+++ b/README.md
@ -1,3 +0,0 @@
-# Additional information
-
-Check upstream's [README.md](https://github.com/fedora-sysv/initscripts/blob/master/README.md) for more info.
--- a/initscripts-8.76.2-prettyboot.patch
+++ b/initscripts-8.76.2-prettyboot.patch
@ -0,0 +1,68 @@
+diff -ruHp initscripts-8.76.2.orig/rc.d/rc initscripts-8.76.2/rc.d/rc
+--- initscripts-8.76.2.orig/rc.d/rc	2008-06-27 17:03:36.000000000 -0400
+++ initscripts-8.76.2/rc.d/rc	2008-06-27 17:27:07.000000000 -0400
+@@ -29,6 +29,7 @@ export runlevel previous
+ 
+ export CONSOLETYPE
+ cmdline=$(cat /proc/cmdline)
+[ -x /etc/rc.d/init.d/0-boot-anim-start ] && cmdline="$cmdline rhgb"
+ if ! strstr "$cmdline" rhgb; then
+ 	GRAPHICAL="no"
+ 	export GRAPHICAL
+@@ -43,6 +44,8 @@ UPSTART=
+ if [ "$previous" = "N" ]; then
+ 	if [ "$do_confirm" = "yes" ]; then
+ 		echo $"Entering interactive startup"
+		# bail out of pretty boot
+		chvt 1
+ 	else
+ 		echo $"Entering non-interactive startup"
+ 	fi
+diff -ruHp initscripts-8.76.2.orig/rc.d/rc.sysinit initscripts-8.76.2/rc.d/rc.sysinit
+--- initscripts-8.76.2.orig/rc.d/rc.sysinit	2008-06-27 17:03:36.000000000 -0400
+++ initscripts-8.76.2/rc.d/rc.sysinit	2008-06-27 17:03:44.000000000 -0400
+@@ -11,6 +11,14 @@ unamer=`uname -r`
+ 
+ set -m
+ 
+if [ -x /usr/bin/rhgb-client ] ; then
+    # OLPC's rhgb-client depends on localhost being up
+    /sbin/ip addr add 127.0.0.1/8 dev lo
+    /sbin/ip addr add ::1/128 dev lo
+    /sbin/ip link set lo up
+    /usr/bin/rhgb-client --update=sysinit-top # early "we're alive" indication
+fi
+
+ if [ -f /etc/sysconfig/network ]; then
+     . /etc/sysconfig/network
+ fi
+@@ -284,10 +292,13 @@ if [ -x /bin/taskset ]; then
+    fi
+ fi
+ 
+update_boot_stage udev
+( sleep 3 ; update_boot_stage udev_mid ) &
+ nashpid=$(pidof nash 2>/dev/null)
+ [ -n "$nashpid" ] && kill $nashpid >/dev/null 2>&1
+ unset nashpid
+ /sbin/start_udev
+update_boot_stage udev_post
+ 
+ # Load other user-defined modules
+ for file in /etc/sysconfig/modules/*.modules ; do
+diff -ruHp initscripts-8.76.2.orig/udev/rules.d/10-console.rules initscripts-8.76.2/udev/rules.d/10-console.rules
+--- initscripts-8.76.2.orig/udev/rules.d/10-console.rules	2008-07-24 12:26:56.000000000 -0400
+++ initscripts-8.76.2/udev/rules.d/10-console.rules	2008-07-24 12:29:15.000000000 -0400
+@@ -1,5 +1,11 @@
+ # Console initialization - keyboard, font, etc.
+-KERNEL=="tty0",		RUN+="/lib/udev/console_init %k"
+# OLPC: commented out to remove tty0 udev initialization, which takes
+#       place during pretty boot and makes the screen flash (dlo trac #3569).
+#       We set up the console ourselves, both in
+#       96-olpc-keyboard.rules as well as in olpc-configure, and we
+#       set the appropriate font in /etc/init.d/z-boot-anim-stop -- so
+#       this is completely unnecessary.
+#KERNEL=="tty0",		RUN+="/lib/udev/console_init %k"
+ 
+ # Check and set up serial and serial-like consoles if necessary
+ KERNEL=="console",	RUN+="/lib/udev/console_check %k"
--- a/initscripts-8.76.2-readonly.patch
+++ b/initscripts-8.76.2-readonly.patch
@ -0,0 +1,45 @@
+diff -ruHp initscripts-8.76.2.orig/rwtab initscripts-8.76.2/rwtab
+--- initscripts-8.76.2.orig/rwtab	2008-06-26 19:04:43.000000000 -0400
+++ initscripts-8.76.2/rwtab	2008-06-26 20:07:04.000000000 -0400
+@@ -24,9 +24,7 @@ empty	/var/tux
+ empty	/media
+ 
+ files	/etc/adjtime
+-files	/etc/mtab
+ files	/etc/ntp.conf
+-files	/etc/resolv.conf
+ files	/etc/lvm/.cache
+ files	/etc/lvm/archive
+ files	/etc/lvm/backup
+diff -ruHp initscripts-8.76.2.orig/statetab initscripts-8.76.2/statetab
+--- initscripts-8.76.2.orig/statetab	2008-06-26 19:04:43.000000000 -0400
+++ initscripts-8.76.2/statetab	2008-06-26 20:08:03.000000000 -0400
+@@ -10,3 +10,8 @@
+ #   /etc/ssh
+ #   /var/spool/mail
+ #
+/etc/ssh
+/etc/sysconfig/i18n
+/etc/timezone
+/var/lib/dbus
+/var/lib/random-seed
+diff -ruHp initscripts-8.76.2.orig/sysconfig/readonly-root initscripts-8.76.2/sysconfig/readonly-root
+--- initscripts-8.76.2.orig/sysconfig/readonly-root	2008-06-26 19:04:43.000000000 -0400
+++ initscripts-8.76.2/sysconfig/readonly-root	2008-06-26 20:08:03.000000000 -0400
+@@ -2,7 +2,7 @@
+ READONLY=no
+ # Set to 'yes' to mount various temporary state as either tmpfs
+ # or on the block device labelled RW_LABEL. Implied by READONLY
+-TEMPORARY_STATE=no
+TEMPORARY_STATE=yes
+ # Place to put a tmpfs for temporary scratch writable space
+ RW_MOUNT=/var/lib/stateless/writable
+ # Label on local filesystem which can be used for temporary scratch space
+@@ -12,6 +12,6 @@ RW_OPTIONS=
+ # Label for partition with persistent data
+ STATE_LABEL=stateless-state
+ # Where to mount to the persistent data
+-STATE_MOUNT=/var/lib/stateless/state
+STATE_MOUNT=/security/state
+ # Options to use for peristent mount
+ STATE_OPTIONS=
--- a/initscripts.spec
+++ b/initscripts.spec
--- a/olpc-autologin.patch
+++ b/olpc-autologin.patch
@ -0,0 +1,27 @@
+diff -NurP a/event.d/tty1 b/event.d/tty1
+--- a/event.d/tty1	2008-05-15 12:19:26.000000000 -0400
+++ b/event.d/tty1	2008-06-10 23:17:02.000000000 -0400
+@@ -13,4 +13,4 @@
+ stop on runlevel 6
+ 
+ respawn
+-exec /sbin/mingetty tty1
+exec /sbin/mingetty --loginpause --autologin root --noclear tty1
+diff -NurP a/event.d/tty2 b/event.d/tty2
+--- a/event.d/tty2	2008-05-15 12:19:26.000000000 -0400
+++ b/event.d/tty2	2008-06-10 23:17:18.000000000 -0400
+@@ -13,4 +13,4 @@
+ stop on runlevel 6
+ 
+ respawn
+-exec /sbin/mingetty tty2
+exec /sbin/mingetty --loginpause --autologin root --noclear tty2
+diff -NurP a/event.d/ttyS0 b/event.d/ttyS0
+--- a/event.d/ttyS0	2008-06-10 23:15:58.000000000 -0400
+++ b/event.d/ttyS0	2008-06-10 23:23:57.000000000 -0400
+@@ -13,4 +13,4 @@
+ stop on runlevel 6
+ 
+ respawn
+-exec /sbin/agetty -w -n ttyS0 115200 vt100
+exec /sbin/agetty -l /bin/bash -w -n ttyS0 115200 vt100
--- a/olpc-initscripts.patch
+++ b/olpc-initscripts.patch
@ -0,0 +1,124 @@
+diff -Nru initscripts-8.76.2-orig/event.d/prefdm initscripts-8.76.2/event.d/prefdm
+--- initscripts-8.76.2-orig/event.d/prefdm	2008-05-15 11:19:26.000000000 -0500
+++ initscripts-8.76.2/event.d/prefdm	2008-06-05 23:03:53.000000000 -0500
+@@ -1,6 +1,6 @@
+-# prefdm - preferred display manager
+# prefdm - start the olpc sugar environment
+ #
+-# Starts gdm/xdm/etc by preference
+# Starts olpc sugar 
+ 
+ start on stopped rc5
+ 
+@@ -9,4 +9,4 @@
+ console output
+ respawn
+ respawn limit 10 120
+-exec /etc/X11/prefdm -nodaemon
+exec /usr/sbin/olpc-dm
+diff -Nru initscripts-8.76.2-orig/event.d/tty3 initscripts-8.76.2/event.d/tty3
+--- initscripts-8.76.2-orig/event.d/tty3	2008-05-15 11:19:26.000000000 -0500
+++ initscripts-8.76.2/event.d/tty3	1969-12-31 18:00:00.000000000 -0600
+@@ -1,16 +0,0 @@
+-# tty3 - getty
+-#
+-# This service maintains a getty on tty3 from the point the system is
+-# started until it is shut down again.
+-
+-start on stopped rc2
+-start on stopped rc3
+-start on stopped rc4
+-start on started prefdm
+-
+-stop on runlevel 0
+-stop on runlevel 1
+-stop on runlevel 6
+-
+-respawn
+-exec /sbin/mingetty tty3
+diff -Nru initscripts-8.76.2-orig/event.d/tty4 initscripts-8.76.2/event.d/tty4
+--- initscripts-8.76.2-orig/event.d/tty4	2008-05-15 11:19:26.000000000 -0500
+++ initscripts-8.76.2/event.d/tty4	1969-12-31 18:00:00.000000000 -0600
+@@ -1,16 +0,0 @@
+-# tty4 - getty
+-#
+-# This service maintains a getty on tty4 from the point the system is
+-# started until it is shut down again.
+-
+-start on stopped rc2
+-start on stopped rc3
+-start on stopped rc4
+-start on started prefdm
+-
+-stop on runlevel 0
+-stop on runlevel 1
+-stop on runlevel 6
+-
+-respawn
+-exec /sbin/mingetty tty4
+diff -Nru initscripts-8.76.2-orig/event.d/tty5 initscripts-8.76.2/event.d/tty5
+--- initscripts-8.76.2-orig/event.d/tty5	2008-05-15 11:19:26.000000000 -0500
+++ initscripts-8.76.2/event.d/tty5	1969-12-31 18:00:00.000000000 -0600
+@@ -1,16 +0,0 @@
+-# tty5 - getty
+-#
+-# This service maintains a getty on tty5 from the point the system is
+-# started until it is shut down again.
+-
+-start on stopped rc2
+-start on stopped rc3
+-start on stopped rc4
+-start on started prefdm
+-
+-stop on runlevel 0
+-stop on runlevel 1
+-stop on runlevel 6
+-
+-respawn
+-exec /sbin/mingetty tty5
+diff -Nru initscripts-8.76.2-orig/event.d/tty6 initscripts-8.76.2/event.d/tty6
+--- initscripts-8.76.2-orig/event.d/tty6	2008-05-15 11:19:26.000000000 -0500
+++ initscripts-8.76.2/event.d/tty6	1969-12-31 18:00:00.000000000 -0600
+@@ -1,16 +0,0 @@
+-# tty6 - getty
+-#
+-# This service maintains a getty on tty6 from the point the system is
+-# started until it is shut down again.
+-
+-start on stopped rc2
+-start on stopped rc3
+-start on stopped rc4
+-start on started prefdm
+-
+-stop on runlevel 0
+-stop on runlevel 1
+-stop on runlevel 6
+-
+-respawn
+-exec /sbin/mingetty tty6
+diff -Nru initscripts-8.76.2-orig/event.d/ttyS0 initscripts-8.76.2/event.d/ttyS0
+--- initscripts-8.76.2-orig/event.d/ttyS0	1969-12-31 18:00:00.000000000 -0600
+++ initscripts-8.76.2/event.d/ttyS0	2008-06-05 23:04:38.000000000 -0500
+@@ -0,0 +1,16 @@
+# ttyS0 - getty
+#
+# This service maintains a getty on ttyS0 from the point the system is
+# started until it is shut down again.
+
+start on stopped rc2
+start on stopped rc3
+start on stopped rc4
+start on started prefdm
+
+stop on runlevel 0
+stop on runlevel 1
+stop on runlevel 6
+
+respawn
+exec /sbin/agetty -w -n ttyS0 115200 vt100
+Binary files initscripts-8.76.2-orig/src/doexec and initscripts-8.76.2/src/doexec differ
+Binary files initscripts-8.76.2-orig/src/netreport and initscripts-8.76.2/src/netreport differ
+Binary files initscripts-8.76.2-orig/src/testd and initscripts-8.76.2/src/testd differ
+Binary files initscripts-8.76.2-orig/src/usernetctl and initscripts-8.76.2/src/usernetctl differ
+Binary files initscripts-8.76.2-orig/src/usernetctl.o and initscripts-8.76.2/src/usernetctl.o differ
+Binary files initscripts-8.76.2-orig/src/usleep.o and initscripts-8.76.2/src/usleep.o differ
--- a/olpc-runlevel.patch
+++ b/olpc-runlevel.patch
@ -0,0 +1,8 @@
+--- initscripts-8.76.2/inittab.upstart.orig	2008-07-23 13:47:33.000000000 -0400
+++ initscripts-8.76.2/inittab.upstart	2008-07-23 13:47:51.000000000 -0400
+@@ -23,4 +23,4 @@
+ #   5 - X11
+ #   6 - reboot (Do NOT set initdefault to this)
+ # 
+-id:3:initdefault:
+id:5:initdefault:
--- a/olpc-setolpckeys.patch
+++ b/olpc-setolpckeys.patch
@ -0,0 +1,5 @@
+diff -ruHpN initscripts-8.76.2.orig/udev/rules.d/96-olpc-keyboard.rules initscripts-8.76.2/udev/rules.d/96-olpc-keyboard.rules
+--- initscripts-8.76.2.orig/udev/rules.d/96-olpc-keyboard.rules	1969-12-31 19:00:00.000000000 -0500
+++ initscripts-8.76.2/udev/rules.d/96-olpc-keyboard.rules	2008-07-24 12:44:36.000000000 -0400
+@@ -0,0 +1 @@
+ACTION=="add", SYSFS{name}=="AT Translated Set 2 keyboard", KERNEL=="event*", RUN+="/usr/sbin/setolpckeys /dev/input/%k"
--- a/olpc-xstartup.patch
+++ b/olpc-xstartup.patch
@ -0,0 +1,14 @@
+--- initscripts-8.76.2/event.d/prefdm.orig	2008-07-23 19:34:18.000000000 -0400
+++ initscripts-8.76.2/event.d/prefdm	2008-07-23 19:35:13.000000000 -0400
+@@ -8,5 +8,10 @@
+ 
+ console output
+ respawn
+-respawn limit 10 120
+respawn limit 3 120
+ exec /usr/sbin/olpc-dm
+
+# make sure dcon is unfrozen if something goes wrong.
+post-stop script
+  echo 0 > /sys/devices/platform/dcon/freeze
+end script
--- a/rebase.sh
+++ b/rebase.sh
@ -1,29 +0,0 @@
-#!/bin/bash
-
-# We always do a rebase to new upstream's tarball for Fedora Rawhide.
-#
-# For non-Rawhide Fedora releases, we can sometimes backport specific patches,
-# if the rebase is not possible.
-#
-# This scripts automates this process.
-
-# Since we are operating in a dist-git repository where we can't fix things with
-# --force-push if something goes wrong, we need to be extra careful and exit
-# immediately if something fails.
-set -e
-
-curl https://raw.githubusercontent.com/fedora-sysv/initscripts/master/initscripts.spec -o initscripts.spec || exit 1
-spectool -g initscripts.spec
-
-# Make a local scratch build in mock first. If it fails, do not upload new tarball!
-# srpm_file="$(basename $(fedpkg srpm | grep -i "wrote" | cut -d ':' -f 2))"
-# arch="$(uname -p)"
-
-# mock -r "fedora-rawhide-${arch}" "${srpm_file}" || exit 2
-
-# Scratch build passed, the build should pass in Koji as well. Let's proceed:
-fedpkg new-sources "$(basename $(spectool -S -l initscripts.spec | gawk '{print $2;}'))" || exit 3
-git add initscripts.spec
-git commit -m "$(grep Version initscripts.spec | gawk '{print $2;}')"
-
-git show
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (initscripts-10.27.tar.gz) = 951f88158eaf7409f7d65c9875c9ba2611e6a805c17112ddbb34167a1638d87d2433c3962d20e66564669f3424dd7be1265cbe03a1a7d6b1c5413ed43d80148d
+378cbe22e62ddb6e6323bf342853b628  initscripts-8.76.2.tar.bz2
--- a/tests/Sanity-init-scripts-LSB/Makefile
+++ b/tests/Sanity-init-scripts-LSB/Makefile
@ -1,64 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Makefile of /CoreOS/initscripts/Sanity/init-scripts-LSB
-#   Description: Init scripts should meet LSB specifications
-#   Author: Yulia Kopkova <ykopkova@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2009 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program 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 General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-export TEST=/CoreOS/initscripts/Sanity/init-scripts-LSB
-export TESTVERSION=1.4
-
-BUILT_FILES=
-
-FILES=$(METADATA) runtest.sh Makefile PURPOSE
-
-.PHONY: all install download clean
-
-run: $(FILES) build
-	./runtest.sh
-
-build: $(BUILT_FILES)
-	chmod a+x runtest.sh
-
-clean:
-	rm -f *~ $(BUILT_FILES)
-
-
-include /usr/share/rhts/lib/rhts-make.include
-
-$(METADATA): Makefile
-	@echo "Owner:           Jan Scotka <jscotka@redhat.com>" > $(METADATA)
-	@echo "Name:            $(TEST)" >> $(METADATA)
-	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
-	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
-	@echo "Description:     Init scripts should meet LSB specifications" >> $(METADATA)
-	@echo "Type:            Sanity" >> $(METADATA)
-	@echo "TestTime:        5m" >> $(METADATA)
-	@echo "RunFor:          initscripts" >> $(METADATA)
-	@echo "Requires:        initscripts" >> $(METADATA)
-	@echo "Priority:        Normal" >> $(METADATA)
-	@echo "License:         GPLv2" >> $(METADATA)
-	@echo "Confidential:    no" >> $(METADATA)
-	@echo "Destructive:     no" >> $(METADATA)
-	@echo "Releases:        RedHatEnterpriseLinux6" >> $(METADATA)
-
-	rhts-lint $(METADATA)
--- a/tests/Sanity-init-scripts-LSB/PURPOSE
+++ b/tests/Sanity-init-scripts-LSB/PURPOSE
@ -1,3 +0,0 @@
-PURPOSE of /CoreOS/initscripts/Sanity/init-scripts-LSB
-Description: Init scripts should meet LSB specifications
-Author: Yulia Kopkova <ykopkova@redhat.com>
--- a/tests/Sanity-init-scripts-LSB/runtest.sh
+++ b/tests/Sanity-init-scripts-LSB/runtest.sh
@ -1,228 +0,0 @@
-#!/bin/bash
-# vim: dict=/usr/share/rhts-library/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /CoreOS/initscripts/Sanity/init-scripts-LSB
-#   Description: Init scripts should meet LSB specifications
-#   Author: Jan Scotka <jscotka@redhat.com>,  Yulia Kopkova <ykopkova@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2009 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program 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 General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include rhts environment
-. /usr/bin/rhts-environment.sh
-. /usr/share/rhts-library/rhtslib.sh
-
-PACKAGE="initscripts"
-
-
-SRV_NETCONSOLE=netconsole
-SRV_NETFS=netfs
-TRG_REMOTEFS=remote-fs.target
-SRV_NETWORK=network
-
-rlJournalStart
-    
-    rlPhaseStartSetup
-        rlAssertRpm $PACKAGE
-        rlRun "useradd testuserqa" 0 "Add test user"
-        rlFileBackup /etc/sysconfig/netconsole
-        if rlIsRHEL '<7'; then #there is no syslog in rhel7 and highier
-            rlRun "sed -i -e 's,^# SYSLOGADDR=,SYSLOGADDR=redhat.com,' /etc/sysconfig/netconsole" 0 "Set remote syslog server address /etc/sysconfig/netconsole"
-        fi
-    rlPhaseEnd
-
-
-    rlPhaseStartTest "netconsole service LSB compliance test" 
-if ls /lib*/modules/*/kernel/drivers/net/netconsole.ko*; then
-	rlRun "ls /lib*/modules/*/kernel/drivers/net/netconsole.ko*" 0
-    if rlIsRHEL '<7'; then
-
-        SERVICE=$SRV_NETCONSOLE
-        rlServiceStop $SERVICE
-        rlLog ">>>>>>>>> service start"
-        rlRun "service $SERVICE start" 0 " Service must start without problem "
-        rlRun "service $SERVICE status" 0 " Then Status command "
-        rlRun "service $SERVICE start" 0 " Already started service "
-        rlRun "service $SERVICE status" 0 " Again status command "
-
-        rlLog ">>>>>>>>> service restart"
-        rlRun "service $SERVICE restart" 0 " Restarting of service "
-        rlRun "service $SERVICE status" 0 " Status command "
-
-        rlLog ">>>>>>>>> service stop"
-        rlRun "service $SERVICE stop" 0 " Stopping service "
-        rlRun "service $SERVICE status" 3 " Status of stopped service "
-        rlRun "service $SERVICE stop" 0 " Stopping service again "
-        rlRun "service $SERVICE status" 3 " Status of stopped service "
-
-        rlLog ">>>>>>>>> insufficient rights"
-        rlRun "service $SERVICE start " 0 " Starting service for restarting under nonpriv user "
-        rlRun "su testuserqa -c 'service $SERVICE restart'" 1 "Insufficient rights, restarting resrvice under nonprivileged user must fail "
-
-        rlLog ">>>>>>>>> operations"
-        rlServiceStop $SERVICE
-        rlRun "service $SERVICE start" 0 " Service have to implement start function "
-        rlRun "service $SERVICE restart" 0 " Service have to implement restart function "
-        rlRun "service $SERVICE status" 0 " Service have to implement status function "
-        rlRun "service $SERVICE condrestart" 0 " Service have to implement condrestart function "
-        rlRun "service $SERVICE reload" 0 " Service have to implement reload function "
-        rlRun "service $SERVICE force-reload" 0 " Service have to implement force-reload function "
-
-        rlLog ">>>>>>>>> nonexist operations"
-        rlRun "service $SERVICE noexistop" 2 " Testing proper return code when nonexisting function "
-
-        rlServiceRestore $SERVICE
-    fi # rhel 6 or less
-else
-	rlLog ">>>> no netconsole kernel module appear here"
-	rlRun "ls /lib*/modules/*/kernel/drivers/net/netconsole.ko*" 1,2
-fi
-	rlLog "NIC should support polling, NETPOLL should be compliled in kernel and netconsole module should be loaded"
-	rlLog "`cat /usr/src/kernels/$(uname -r)/.config | grep -i poll`"	
-	rlLog "netconsole module: `lsmod | grep -i netconsole && echo true || echo false`"
-	rlLog "`cat /var/log/messages | grep -i netconsole | tail -n 10`"
-    rlPhaseEnd
-
-    # for RHEL6 and lower
-    if rlIsRHEL '<7'; then
-        rlPhaseStartTest "netfs service LSB compliance test" 
-    
-            SERVICE=$SRV_NETFS
-            rlServiceStop $SERVICE
-            rlLog ">>>>>>>>> service start"
-            rlRun "service $SERVICE start" 0 " Service must start without problem "
-            rlRun "service $SERVICE status" 0 " Then Status command "
-            rlRun "service $SERVICE start" 0 " Already started service "
-            rlRun "service $SERVICE status" 0 " Again status command "
-    
-            rlLog ">>>>>>>>> service restart"
-            rlRun "service $SERVICE restart" 0 " Restarting of service "
-            rlRun "service $SERVICE status" 0 " Status command "
-    
-            rlLog ">>>>>>>>> service stop"
-            rlRun "service $SERVICE stop" 0 " Stopping service "
-            rlRun "service $SERVICE status" 3 " Status of stopped service "
-            rlRun "service $SERVICE stop" 0 " Stopping service again "
-            rlRun "service $SERVICE status" 3 " Status of stopped service "
-    
-            rlLog ">>>>>>>>> insufficient rights"
-            rlRun "service $SERVICE start " 0 " Starting service for restarting under nonpriv user "
-            rlRun "su testuserqa -c 'service $SERVICE restart'" 4 "Insufficient rights, restarting resrvice under nonprivileged user must fail "
-    
-            rlLog ">>>>>>>>> operations"
-            rlServiceStop $SERVICE
-            rlRun "service $SERVICE start" 0 " Service have to implement start function "
-            rlRun "service $SERVICE restart" 0 " Service have to implement restart function "
-            rlRun "service $SERVICE status" 0 " Service have to implement status function "
-    
-            rlLog ">>>>>>>>> nonexist operations"
-            rlRun "service $SERVICE noexistop" 2 " Testing proper return code when nonexisting function "
-    
-            rlServiceRestore $SERVICE
-    
-        rlPhaseEnd
-    else
-        rlPhaseStartTest "remote-fs target LSB compliance test"
-
-            TARGET=$TRG_REMOTEFS
-            rlServiceStop $TARGET
-            rlLog ">>>>>>>>> target start"
-            rlRun "service $TARGET start" 0 " Target must start without problem "
-            rlRun "service $TARGET status" 0 " Then Status command "
-            rlRun "service $TARGET start" 0 " Already started target "
-            rlRun "service $TARGET status" 0 " Again status command "
-
-            rlLog ">>>>>>>>> target restart"
-            rlRun "service $TARGET restart" 0 " Restarting target "
-            rlRun "service $TARGET status" 0 " Status command "
-
-            rlLog ">>>>>>>>> target stop"
-            rlRun "service $TARGET stop" 0 " Stopping target "
-            rlRun "service $TARGET status" 3 " Status of stopped target "
-            rlRun "service $TARGET stop" 0 " Stopping target again "
-            rlRun "service $TARGET status" 3 " Status of stopped target "
-
-            rlLog ">>>>>>>>> insufficient rights"
-            rlRun "service $TARGET start " 0 " Starting target for restarting under nonpriv user "
-            rlRun "su testuserqa -c 'service $TARGET restart'" 1 " Insufficient rights, restarting target under nonprivileged user must fail " # returns 1 instead of 4 because of polkit
-
-            rlLog ">>>>>>>>> operations"
-            rlServiceStop $TARGET
-            rlRun "service $TARGET start" 0 " Target have to implement start function "
-            rlRun "service $TARGET restart" 0 " Target have to implement restart function "
-            rlRun "service $TARGET status" 0 " Target have to implement status function "
-
-            rlLog ">>>>>>>>> nonexist operations"
-            rlRun "service $TARGET noexistop" 2 " Testing proper return code when nonexisting function "
-
-            rlServiceRestore $TARGET
-
-        rlPhaseEnd
-    fi
-
-
-#    rlPhaseStartTest "$SRV_NETWORK service LSB compliance test" 
-#
-#        SERVICE=$SRV_NETWORK
-#        rlServiceStop $SERVICE
-#        rlLog ">>>>>>>>> service start"
-#        rlRun "service $SERVICE start" 0 " Service must start without problem "
-#        rlRun "service $SERVICE status" 0 " Then Status command "
-#        rlRun "service $SERVICE start" 1,0 " Already started service "
-#        rlRun "service $SERVICE status" 0 " Again status command "
-
-#        rlLog ">>>>>>>>> service restart"
-#        rlRun "service $SERVICE restart" 0 " Restarting of service "
-#        rlRun "service $SERVICE status" 0 " Status command "
-
-#        rlLog ">>>>>>>>> service stop"
-#        rlRun "service $SERVICE stop" 0 " Stopping service "
-#        rlRun "service $SERVICE status" 0 " Status of stopped service "
-#        rlRun "service $SERVICE stop" 0 " Stopping service again "
-#        rlRun "service $SERVICE status" 0 " Status of stopped service "
-
-#        rlLog ">>>>>>>>> insufficient rights"
-#        rlRun "service $SERVICE start " 0 " Starting service for restarting under nonpriv user "
-#        rlRun "su testuserqa -c 'service $SERVICE restart'" 4 "Insufficient rights, restarting resrvice under nonprivileged user must fail "
-
-#        rlLog ">>>>>>>>> operations"
-#        rlServiceStop $SERVICE
-#        rlRun "service $SERVICE start" 0 " Service have to implement start function "
-#        rlRun "service $SERVICE restart" 0 " Service have to implement restart function "
-#        rlRun "service $SERVICE status" 0 " Service have to implement status function "
-#        rlRun "service $SERVICE reload" 0 " Service have to implement reload function "
-#        rlRun "service $SERVICE force-reload" 0 " Service have to implement force-reload function "
-
-#        rlLog ">>>>>>>>> nonexist operations"
-#        rlRun "service $SERVICE noexistop" 2 " Testing proper return code when nonexisting function "
-
-#        rlServiceRestore $SERVICE
-#        service $SERVICE start
-    rlPhaseEnd
-
-
-    rlPhaseStartCleanup
-        rlRun "userdel -fr testuserqa" 0 "Remove test user"
-        rlFileRestore
-    rlPhaseEnd
-
-rlJournalPrintText
-rlJournalEnd
--- a/tests/standard-inventory-qcow2
+++ b/tests/standard-inventory-qcow2
@ -1,291 +0,0 @@
-#!/usr/bin/env python
-
-import argparse
-import errno
-import json
-import os
-import shutil
-import shlex
-import signal
-import socket
-import subprocess
-import sys
-import tempfile
-import time
-import distutils.util
-
-IDENTITY = """
-----BEGIN RSA PRIVATE KEY-----
-MIIEpQIBAAKCAQEA1DrTSXQRF8isQQfPfK3U+eFC4zBrjur+Iy15kbHUYUeSHf5S
-jXPYbHYqD1lHj4GJajC9okle9rykKFYZMmJKXLI6987wZ8vfucXo9/kwS6BDAJto
-ZpZSj5sWCQ1PI0Ce8CbkazlTp5NIkjRfhXGP8mkNKMEhdNjaYceO49ilnNCIxhpb
-eH5dH5hybmQQNmnzf+CGCCLBFmc4g3sFbWhI1ldyJzES5ZX3ahjJZYRUfnndoUM/
-TzdkHGqZhL1EeFAsv5iV65HuYbchch4vBAn8jDMmHh8G1ixUCL3uAlosfarZLLyo
-3HrZ8U/llq7rXa93PXHyI/3NL/2YP3OMxE8baQIDAQABAoIBAQCxuOUwkKqzsQ9W
-kdTWArfj3RhnKigYEX9qM+2m7TT9lbKtvUiiPc2R3k4QdmIvsXlCXLigyzJkCsqp
-IJiPEbJV98bbuAan1Rlv92TFK36fBgC15G5D4kQXD/ce828/BSFT2C3WALamEPdn
-v8Xx+Ixjokcrxrdeoy4VTcjB0q21J4C2wKP1wEPeMJnuTcySiWQBdAECCbeZ4Vsj
-cmRdcvL6z8fedRPtDW7oec+IPkYoyXPktVt8WsQPYkwEVN4hZVBneJPCcuhikYkp
-T3WGmPV0MxhUvCZ6hSG8D2mscZXRq3itXVlKJsUWfIHaAIgGomWrPuqC23rOYCdT
-5oSZmTvFAoGBAPs1FbbxDDd1fx1hisfXHFasV/sycT6ggP/eUXpBYCqVdxPQvqcA
-ktplm5j04dnaQJdHZ8TPlwtL+xlWhmhFhlCFPtVpU1HzIBkp6DkSmmu0gvA/i07Z
-pzo5Z+HRZFzruTQx6NjDtvWwiXVLwmZn2oiLeM9xSqPu55OpITifEWNjAoGBANhH
-XwV6IvnbUWojs7uiSGsXuJOdB1YCJ+UF6xu8CqdbimaVakemVO02+cgbE6jzpUpo
-krbDKOle4fIbUYHPeyB0NMidpDxTAPCGmiJz7BCS1fCxkzRgC+TICjmk5zpaD2md
-HCrtzIeHNVpTE26BAjOIbo4QqOHBXk/WPen1iC3DAoGBALsD3DSj46puCMJA2ebI
-2EoWaDGUbgZny2GxiwrvHL7XIx1XbHg7zxhUSLBorrNW7nsxJ6m3ugUo/bjxV4LN
-L59Gc27ByMvbqmvRbRcAKIJCkrB1Pirnkr2f+xx8nLEotGqNNYIawlzKnqr6SbGf
-Y2wAGWKmPyEoPLMLWLYkhfdtAoGANsFa/Tf+wuMTqZuAVXCwhOxsfnKy+MNy9jiZ
-XVwuFlDGqVIKpjkmJyhT9KVmRM/qePwgqMSgBvVOnszrxcGRmpXRBzlh6yPYiQyK
-2U4f5dJG97j9W7U1TaaXcCCfqdZDMKnmB7hMn8NLbqK5uLBQrltMIgt1tjIOfofv
-BNx0raECgYEApAvjwDJ75otKz/mvL3rUf/SNpieODBOLHFQqJmF+4hrSOniHC5jf
-f5GS5IuYtBQ1gudBYlSs9fX6T39d2avPsZjfvvSbULXi3OlzWD8sbTtvQPuCaZGI
-Df9PUWMYZ3HRwwdsYovSOkT53fG6guy+vElUEDkrpZYczROZ6GUcx70=
-----END RSA PRIVATE KEY-----
-"""
-
-USER_DATA = """#cloud-config
-users:
-  - default
-  - name: root
-    groups: sudo
-    shell: /bin/bash
-    ssh_authorized_keys:
-      - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDUOtNJdBEXyKxBB898rdT54ULjMGuO6v4jLXmRsdRhR5Id/lKNc9hsdioPWUePgYlqML2iSV72vKQoVhkyYkpcsjr3zvBny9+5xej3+TBLoEMAm2hmllKPmxYJDU8jQJ7wJuRrOVOnk0iSNF+FcY/yaQ0owSF02Nphx47j2KWc0IjGGlt4fl0fmHJuZBA2afN/4IYIIsEWZziDewVtaEjWV3InMRLllfdqGMllhFR+ed2hQz9PN2QcapmEvUR4UCy/mJXrke5htyFyHi8ECfyMMyYeHwbWLFQIve4CWix9qtksvKjcetnxT+WWrutdr3c9cfIj/c0v/Zg/c4zETxtp standard-test-qcow2
-ssh_pwauth: True
-chpasswd:
-  list: |
-    root:foobar
-  expire: False
-runcmd:
-  - mkfs.ext4 /dev/sdb
-  - mount /dev/sdb /usr/local 
-  - sudo mount -o remount,rw /usr
-  - mkdir /expected /output
-"""
-
-def main(argv):
-    parser = argparse.ArgumentParser(description="Inventory for a QCow2 test image")
-    parser.add_argument("--list", action="store_true", help="Verbose output")
-    parser.add_argument('--host', help="Get host variables")
-    parser.add_argument("subjects", nargs="*", default=shlex.split(os.environ.get("TEST_SUBJECTS", "")))
-    opts = parser.parse_args()
-
-    try:
-        if opts.host:
-            data = host(opts.host)
-        else:
-            data = list(opts.subjects)
-        sys.stdout.write(json.dumps(data, indent=4, separators=(',', ': ')))
-    except RuntimeError as ex:
-        sys.stderr.write("{0}: {1}\n".format(os.path.basename(sys.argv[0]), str(ex)))
-        return 1
-
-    return 0
-
-
-def list(subjects):
-    hosts = []
-    variables = {}
-    for subject in subjects:
-        if subject.endswith((".qcow2", ".qcow2c")):
-            vars = host(subject)
-            if vars:
-                hosts.append(subject)
-                variables[subject] = vars
-    return {"localhost": {"hosts": hosts, "vars": {}}, "subjects": {"hosts": hosts, "vars": {}},
-            "_meta": {"hostvars": variables}}
-
-
-def start_qemu(image, cloudinit, log, disk_directory=None, disk_size=None, portrange=(2222, 5555)):
-    for port in xrange(*portrange):
-        sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-        try:
-            sock.bind(("127.0.0.3", port))
-
-            if disk_size:
-                return subprocess.Popen(["/usr/bin/qemu-system-x86_64", "-m", "1024", image,
-                                         "-enable-kvm", "-snapshot", "-cdrom", cloudinit,
-                                         "-hdb", disk_directory,
-                                         "-net", "nic,model=virtio", "-net",
-                                         "user,hostfwd=tcp:127.0.0.3:{0}-:22".format(port),
-                                         "-device", "isa-serial,chardev=pts2", "-chardev", "file,id=pts2,path=" + log,
-                                         "-display", "none"], stdout=open(os.devnull, 'w')), port
-            else:
-                return subprocess.Popen(["/usr/bin/qemu-system-x86_64", "-m", "1024", image,
-                                         "-enable-kvm", "-snapshot", "-cdrom", cloudinit,
-                                         "-net", "nic,model=virtio", "-net",
-                                         "user,hostfwd=tcp:127.0.0.3:{0}-:22".format(port),
-                                         "-device", "isa-serial,chardev=pts2", "-chardev", "file,id=pts2,path=" + log,
-                                         "-display", "none"], stdout=open(os.devnull, 'w')), port
-        except IOError:
-            pass
-        finally:
-            sock.close()
-    else:
-        raise RuntimeError("unable to find free local port to map SSH to")
-
-
-def host(image):
-    null = open(os.devnull, 'w')
-
-    try:
-        tty = os.open("/dev/tty", os.O_WRONLY)
-        os.dup2(tty, 2)
-    except OSError:
-        tty = None
-        pass
-
-    # A directory for temporary stuff
-    directory = tempfile.mkdtemp(prefix="inventory-cloud")
-    identity = os.path.join(directory, "identity")
-    with open(identity, 'w') as f:
-        f.write(IDENTITY)
-    os.chmod(identity, 0o600)
-    metadata = os.path.join(directory, "meta-data")
-    with open(metadata, 'w') as f:
-        f.write("")
-    userdata = os.path.join(directory, "user-data")
-    with open(userdata, 'w') as f:
-        f.write(USER_DATA)
-
-    # Create additional disk
-    disk_size = None
-    disk_directory = None
-    try:
-        disk_size = os.environ.get("EXTEND_DISK_SIZE")
-        if disk_size:
-            sys.stderr.write("\nCreate additional cloud init disk DISK SIZE {}\n".format(disk_size))
-
-            disk_directory = "{}/atomic-host-disk2-{}".format(directory, disk_size)
-            subprocess.check_call(["qemu-img", "create", "-f", "qcow2", disk_directory, disk_size], stdout=null)
-
-    except KeyError:
-        sys.stderr.write("\nCouldn't create additional cloud init disk DISK SIZE\n")
-    pass
-
-    # Create our cloud init so we can log in
-    cloudinit = os.path.join(directory, "cloud-init.iso")
-    subprocess.check_call(["/usr/bin/genisoimage", "-input-charset", "utf-8",
-                           "-volid", "cidata", "-joliet", "-rock", "-quiet",
-                           "-output", cloudinit, userdata, metadata], stdout=null)
-
-    # Determine if virtual machine should be kept available for diagnosis after completion
-    try:
-        diagnose = distutils.util.strtobool(os.getenv("TEST_DEBUG", "0"))
-    except ValueError:
-        diagnose = 0
-
-    sys.stderr.write("Launching virtual machine for {0}\n".format(image))
-
-    # And launch the actual VM
-    artifacts = os.environ.get("TEST_ARTIFACTS", os.path.join(os.getcwd(), "artifacts"))
-    try:
-        os.makedirs(artifacts)
-    except OSError as exc:
-        if exc.errno != errno.EEXIST or not os.path.isdir(artifacts):
-            raise
-    log = os.path.join(artifacts, "{0}.log".format(os.path.basename(image)))
-
-    proc = None  # for failure detection
-    cpe = None  # for exception scoping
-    for tries in xrange(0, 5):
-        try:
-            proc, port = start_qemu(image, cloudinit, log, disk_directory=disk_directory, disk_size=disk_size)
-            break
-        except subprocess.CalledProcessError as cpe:
-            time.sleep(1)
-            continue
-    if proc is None:
-        raise RuntimeError("Could not launch VM for qcow2 image"
-                           " '{0}':{1}".format(image, cpe.output))
-
-    # The variables
-    variables = {"ansible_ssh_port": "{0}".format(port),
-                 "ansible_ssh_host": "127.0.0.3",
-                 "ansible_ssh_user": "root",
-                 "ansible_ssh_pass": "foobar",
-                 "ansible_ssh_private_key_file": identity,
-                 "ansible_ssh_common_args": "-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"}
-
-    # Write out a handy inventory file, for our use and for debugging
-    args = " ".join(["{0}='{1}'".format(*item) for item in variables.items()])
-    inventory = os.path.join(directory, "inventory")
-    with open(inventory, "w") as f:
-        f.write("[subjects]\nlocalhost {1}\n".format(image, args))
-
-    # Wait for ssh to come up
-    ping = ["/usr/bin/ansible", "--inventory", inventory, "localhost", "--module-name", "raw", "--args", "/bin/true"]
-
-    for tries in xrange(0, 30):
-        try:
-            (pid, ret) = os.waitpid(proc.pid, os.WNOHANG)
-            if pid != 0:
-                raise RuntimeError("qemu failed to launch qcow2 image: {0}".format(image))
-            subprocess.check_call(ping, stdout=null, stderr=null)
-            break
-        except subprocess.CalledProcessError:
-            time.sleep(3)
-    else:
-        # Kill the qemu process
-        try:
-            os.kill(proc.pid, signal.SIGTERM)
-        except OSError:
-            pass
-        raise RuntimeError("could not access launched qcow2 image: {0}".format(image))
-
-    # Process of our parent
-    ppid = os.getppid()
-
-    child = os.fork()
-    if child:
-        return variables
-
-    # Daemonize and watch the processes
-    os.chdir("/")
-    os.setsid()
-    os.umask(0)
-
-    if tty is None:
-        tty = null.fileno()
-
-    # Duplicate standard input to standard output and standard error.
-    os.dup2(null.fileno(), 0)
-    os.dup2(tty, 1)
-    os.dup2(tty, 2)
-
-    # Now wait for the parent process to go away, then kill the VM
-    while True:
-        time.sleep(3)
-        try:
-            os.kill(ppid, 0)
-            os.kill(proc.pid, 0)
-        except OSError:
-            break  # Either of the processes no longer exist
-
-    if diagnose:
-        sys.stderr.write("\n")
-        sys.stderr.write("DIAGNOSE: ssh -p {0} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null "
-                         "root@{1} # password: {2}\n".format(port, "127.0.0.3", "foobar"))
-        sys.stderr.write("DIAGNOSE: export ANSIBLE_INVENTORY={0}\n".format(inventory))
-        sys.stderr.write("DIAGNOSE: kill {0} # when finished\n".format(os.getpid()))
-
-        def _signal_handler(*args):
-            sys.stderr.write("\nDIAGNOSE ending...\n")
-
-        signal.signal(signal.SIGTERM, _signal_handler)
-        signal.pause()
-
-    # Kill the qemu process
-    try:
-        os.kill(proc.pid, signal.SIGTERM)
-    except OSError:
-        pass
-
-    shutil.rmtree(directory)
-    sys.exit(0)
-
-
-if __name__ == '__main__':
-    sys.exit(main(sys.argv))
--- a/tests/tests.yml
+++ b/tests/tests.yml
@ -1,12 +0,0 @@
---
- hosts: localhost
-  roles:
-  - role: standard-test-beakerlib
-    tags:
-    - classic
-    - container
-    - atomic
-    tests:
-    - Sanity-init-scripts-LSB
-    required_packages:
-    - initscripts
Author	SHA1	Message	Date
Fedora Release Engineering	ed1c722c02	dist-git conversion	2010-07-28 18:16:43 +00:00
Bill Nottingham	10e3fe79e9	Fix typo from bad import script. (releng #2781 )	2009-10-28 02:54:41 +00:00
C. Scott Ananian	abf189152c	Unfreeze DCON after failed X start, and fail more quickly when there are problems. Change default runlevel to 5 (replacing an uglier patch to do this in our image creation tool). Remove a redundant udev console initialization which causes the screen to flash during prettyboot (dlo trac #3569). This replaces an uglier patch to do this in our image creation tool. Set up keymap when hal sees an OLPC keyboard. This replaces an uglier patch in our image creation tool.	2008-07-24 16:59:03 +00:00
C. Scott Ananian	34f3efe9be	Changelog for 8.76.2-1.6.	2008-06-29 16:05:13 +00:00
C. Scott Ananian	c77975e870	Turn on graphical boot by default for OLPC, even if the command-line is empty. (The command-line is empty during secure boot.)	2008-06-27 21:29:32 +00:00
C. Scott Ananian	5176e143a3	OLPC-specific improvements, forward ported from the OLPC-2 fork. Split "readonly rootfs / tmpfs" parts of original olpc patch into new 'readonly' patch; plus add additional support for preserving changes to /etc/ssh, /etc/sysconfig/i18n, /etc/timezone, /var/lib/dbus/machine-id, and /var/lib/random-seed. Add "pretty boot" support: bring up localhost before rhgb-client is invoked; some additional calls to rhgb-client; make sure that we cleanly exit pretty boot if interactive boot mode is invoked.	2008-06-27 01:04:27 +00:00
Dennis Gilmore	3c0aa84114	add patch to autologin on XO	2008-06-13 19:46:54 +00:00
Dennis Gilmore	1b9b83251b	update for olpc	2008-06-06 04:09:48 +00:00
Dennis Gilmore	8305ef9c18	update olpc patch	2008-05-16 19:31:34 +00:00
Dennis Gilmore	525084d063	add a olpc patch	2008-05-16 04:29:31 +00:00
Dennis Gilmore	03d8ab955b	Initialize branch OLPC-3 for initscripts	2008-05-16 04:14:15 +00:00
Bill Nottingham	b9e7f59624	commit correct spec	2008-05-15 16:23:16 +00:00
Bill Nottingham	c4e7dfc7c8	8.76.2-1	2008-05-15 16:21:28 +00:00
Bill Nottingham	28a500a42d	8.76.1-1	2008-05-07 17:56:41 +00:00
Bill Nottingham	09b9767514	8.76-1	2008-05-02 17:58:41 +00:00
Bill Nottingham	16cb2989e8	8.75-1	2008-05-02 17:32:46 +00:00
Bill Nottingham	8126e99e0c	8.74-1	2008-04-29 15:55:38 +00:00
Bill Nottingham	650e2b69c1	8.73-1	2008-04-25 21:25:18 +00:00
Bill Nottingham	d4303c4dfa	8.72-1	2008-04-24 19:56:54 +00:00
Bill Nottingham	253eb1502d	8.71-1	2008-04-23 19:36:56 +00:00
Bill Nottingham	02b68ed1c2	fix minor bug	2008-04-15 17:17:29 +00:00
Bill Nottingham	42c4b6031d	8.70-1	2008-04-15 17:07:19 +00:00
Bill Nottingham	0d299e4c4f	8.69-1	2008-04-08 05:20:32 +00:00
Bill Nottingham	f709eec779	remove merged patch	2008-04-04 15:43:13 +00:00
Bill Nottingham	a362a24715	8.68-1	2008-04-04 15:41:49 +00:00
Dennis Gilmore	9e956d8fdd	apply patch fro sparc console	2008-03-25 14:51:53 +00:00
Bill Nottingham	3110d433ed	8.67-1	2008-03-11 21:49:40 +00:00
Bill Nottingham	14add6d412	8.66-1	2008-03-11 19:29:49 +00:00
Bill Nottingham	72a9ef1cc3	8.65-1	2008-03-11 03:37:35 +00:00
Bill Nottingham	b498eead36	Update to 8.64	2008-02-26 06:54:07 +00:00
Bill Nottingham	c125186b5c	add /sbin/pidof requirement to make upstart upgrades more clean (#434863 )	2008-02-26 04:28:52 +00:00
Bill Nottingham	99ca3929f9	8.63-1	2008-02-04 05:49:08 +00:00
Bill Nottingham	66e5739b57	8.62-1 Resolves: bug #429556	2008-01-21 22:12:46 +00:00
Bill Nottingham	1988dfce52	8.61-1 Resolves: bug #429222, bug #251415, bug #334171, bug #426372, bug #428202 Resolves: bug #427767, bug #407531, bug #351291, bug #390271	2008-01-19 03:20:48 +00:00
Bill Nottingham	7fa3f053a9	makefile update to properly grab makefile.common	2007-10-15 18:53:00 +00:00