From 98983cc9a040fb8c3e10f301c2242d25b4be90bb Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Mon, 4 Jun 2012 16:59:19 +0200 Subject: [PATCH] Refactoring: Massive code deduplication in hooks directory (Part 3) All remaining hooks files just differed syntactially, but not semantically. They were merged into one file sporting the most readable syntax variant. --- hooks/centos-4/30-disable-gettys | 59 +-------------------------- hooks/centos-5/30-disable-gettys | 59 +-------------------------- hooks/common/30-disable-gettys | 58 ++++++++++++++++++++++++++ hooks/debian/30-disable-gettys | 59 +-------------------------- hooks/fedora-core-6/30-disable-gettys | 59 +-------------------------- hooks/gentoo/30-disable-gettys | 59 +-------------------------- 6 files changed, 63 insertions(+), 290 deletions(-) mode change 100755 => 120000 hooks/centos-4/30-disable-gettys mode change 100755 => 120000 hooks/centos-5/30-disable-gettys create mode 100755 hooks/common/30-disable-gettys mode change 100755 => 120000 hooks/debian/30-disable-gettys mode change 100755 => 120000 hooks/fedora-core-6/30-disable-gettys mode change 100755 => 120000 hooks/gentoo/30-disable-gettys diff --git a/hooks/centos-4/30-disable-gettys b/hooks/centos-4/30-disable-gettys deleted file mode 100755 index bdc2fbb..0000000 --- a/hooks/centos-4/30-disable-gettys +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/sh -# -# This script comments out all virtual terminals which aren't on the -# first console - that must remain so that 'xm console ...' works -# correctly. -# -# Steve -# -- -# http://www.steve.org.uk/ - - -prefix=$1 - - -# -# Source our common functions -# -if [ -e /usr/lib/xen-tools/common.sh ]; then - . /usr/lib/xen-tools/common.sh -else - . ./hooks/common.sh -fi - - -# -# Log our start -# -logMessage Script $0 starting - - -# -# Do the transformation. -# -sed -i -e 's/^\([2-6].*:respawn*\)/#\1/' -e 's/^T/#\t/' -e 's/tty1$/hvc0/' ${prefix}/etc/inittab - - -# -# Are we using an alternative serial device? -# -if [ ! -z "${serial_device}" ]; then - - serial_device=`basename ${serial_device}` - - # Let the user know. - logMessage "Replacing default serial device (tty1) with ${serial_device}" - - # replace existing device. - sed -i -e s/tty1/${serial_device}/ ${prefix}/etc/inittab - - # make sure that it is allowed to login. - echo $serial_device >> ${prefix}/etc/securetty -fi - - -# -# Log our finish -# -logMessage Script $0 finished diff --git a/hooks/centos-4/30-disable-gettys b/hooks/centos-4/30-disable-gettys new file mode 120000 index 0000000..114c431 --- /dev/null +++ b/hooks/centos-4/30-disable-gettys @@ -0,0 +1 @@ +../common/30-disable-gettys \ No newline at end of file diff --git a/hooks/centos-5/30-disable-gettys b/hooks/centos-5/30-disable-gettys deleted file mode 100755 index bdc2fbb..0000000 --- a/hooks/centos-5/30-disable-gettys +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/sh -# -# This script comments out all virtual terminals which aren't on the -# first console - that must remain so that 'xm console ...' works -# correctly. -# -# Steve -# -- -# http://www.steve.org.uk/ - - -prefix=$1 - - -# -# Source our common functions -# -if [ -e /usr/lib/xen-tools/common.sh ]; then - . /usr/lib/xen-tools/common.sh -else - . ./hooks/common.sh -fi - - -# -# Log our start -# -logMessage Script $0 starting - - -# -# Do the transformation. -# -sed -i -e 's/^\([2-6].*:respawn*\)/#\1/' -e 's/^T/#\t/' -e 's/tty1$/hvc0/' ${prefix}/etc/inittab - - -# -# Are we using an alternative serial device? -# -if [ ! -z "${serial_device}" ]; then - - serial_device=`basename ${serial_device}` - - # Let the user know. - logMessage "Replacing default serial device (tty1) with ${serial_device}" - - # replace existing device. - sed -i -e s/tty1/${serial_device}/ ${prefix}/etc/inittab - - # make sure that it is allowed to login. - echo $serial_device >> ${prefix}/etc/securetty -fi - - -# -# Log our finish -# -logMessage Script $0 finished diff --git a/hooks/centos-5/30-disable-gettys b/hooks/centos-5/30-disable-gettys new file mode 120000 index 0000000..114c431 --- /dev/null +++ b/hooks/centos-5/30-disable-gettys @@ -0,0 +1 @@ +../common/30-disable-gettys \ No newline at end of file diff --git a/hooks/common/30-disable-gettys b/hooks/common/30-disable-gettys new file mode 100755 index 0000000..208bdb9 --- /dev/null +++ b/hooks/common/30-disable-gettys @@ -0,0 +1,58 @@ +#!/bin/sh +# +# This script comments out all virtual terminals which aren't on the +# first console - that must remain so that 'xm console ...' works +# correctly. +# +# Steve +# -- +# http://www.steve.org.uk/ + + +prefix=$1 + + +# +# Source our common functions +# +if [ -e /usr/lib/xen-tools/common.sh ]; then + . /usr/lib/xen-tools/common.sh +else + . ./hooks/common.sh +fi + + +# +# Log our start +# +logMessage Script $0 starting + + +# +# Do the transformation. +# +sed -i -e 's/^\([2-6].*:respawn*\)/#\1/' -e 's/^T/#\t/' -e 's/tty1$/hvc0/' ${prefix}/etc/inittab + + +# +# Are we using an alternative serial device? +# +if [ ! -z "${serial_device}" ]; then + + serial_device=`basename $serial_device` + + # Let the user know. + logMessage "Replacing default serial device (tty1) with ${serial_device}" + + # replace existing device. + sed -i -e s/tty1/${serial_device}/ ${prefix}/etc/inittab + + # make sure that it is allowed to login. + echo $serial_device >> ${prefix}/etc/securetty +fi + + +# +# Log our finish +# +logMessage Script $0 finished diff --git a/hooks/debian/30-disable-gettys b/hooks/debian/30-disable-gettys deleted file mode 100755 index bdc2fbb..0000000 --- a/hooks/debian/30-disable-gettys +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/sh -# -# This script comments out all virtual terminals which aren't on the -# first console - that must remain so that 'xm console ...' works -# correctly. -# -# Steve -# -- -# http://www.steve.org.uk/ - - -prefix=$1 - - -# -# Source our common functions -# -if [ -e /usr/lib/xen-tools/common.sh ]; then - . /usr/lib/xen-tools/common.sh -else - . ./hooks/common.sh -fi - - -# -# Log our start -# -logMessage Script $0 starting - - -# -# Do the transformation. -# -sed -i -e 's/^\([2-6].*:respawn*\)/#\1/' -e 's/^T/#\t/' -e 's/tty1$/hvc0/' ${prefix}/etc/inittab - - -# -# Are we using an alternative serial device? -# -if [ ! -z "${serial_device}" ]; then - - serial_device=`basename ${serial_device}` - - # Let the user know. - logMessage "Replacing default serial device (tty1) with ${serial_device}" - - # replace existing device. - sed -i -e s/tty1/${serial_device}/ ${prefix}/etc/inittab - - # make sure that it is allowed to login. - echo $serial_device >> ${prefix}/etc/securetty -fi - - -# -# Log our finish -# -logMessage Script $0 finished diff --git a/hooks/debian/30-disable-gettys b/hooks/debian/30-disable-gettys new file mode 120000 index 0000000..114c431 --- /dev/null +++ b/hooks/debian/30-disable-gettys @@ -0,0 +1 @@ +../common/30-disable-gettys \ No newline at end of file diff --git a/hooks/fedora-core-6/30-disable-gettys b/hooks/fedora-core-6/30-disable-gettys deleted file mode 100755 index 208bdb9..0000000 --- a/hooks/fedora-core-6/30-disable-gettys +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/sh -# -# This script comments out all virtual terminals which aren't on the -# first console - that must remain so that 'xm console ...' works -# correctly. -# -# Steve -# -- -# http://www.steve.org.uk/ - - -prefix=$1 - - -# -# Source our common functions -# -if [ -e /usr/lib/xen-tools/common.sh ]; then - . /usr/lib/xen-tools/common.sh -else - . ./hooks/common.sh -fi - - -# -# Log our start -# -logMessage Script $0 starting - - -# -# Do the transformation. -# -sed -i -e 's/^\([2-6].*:respawn*\)/#\1/' -e 's/^T/#\t/' -e 's/tty1$/hvc0/' ${prefix}/etc/inittab - - -# -# Are we using an alternative serial device? -# -if [ ! -z "${serial_device}" ]; then - - serial_device=`basename $serial_device` - - # Let the user know. - logMessage "Replacing default serial device (tty1) with ${serial_device}" - - # replace existing device. - sed -i -e s/tty1/${serial_device}/ ${prefix}/etc/inittab - - # make sure that it is allowed to login. - echo $serial_device >> ${prefix}/etc/securetty -fi - - -# -# Log our finish -# -logMessage Script $0 finished diff --git a/hooks/fedora-core-6/30-disable-gettys b/hooks/fedora-core-6/30-disable-gettys new file mode 120000 index 0000000..114c431 --- /dev/null +++ b/hooks/fedora-core-6/30-disable-gettys @@ -0,0 +1 @@ +../common/30-disable-gettys \ No newline at end of file diff --git a/hooks/gentoo/30-disable-gettys b/hooks/gentoo/30-disable-gettys deleted file mode 100755 index 208bdb9..0000000 --- a/hooks/gentoo/30-disable-gettys +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/sh -# -# This script comments out all virtual terminals which aren't on the -# first console - that must remain so that 'xm console ...' works -# correctly. -# -# Steve -# -- -# http://www.steve.org.uk/ - - -prefix=$1 - - -# -# Source our common functions -# -if [ -e /usr/lib/xen-tools/common.sh ]; then - . /usr/lib/xen-tools/common.sh -else - . ./hooks/common.sh -fi - - -# -# Log our start -# -logMessage Script $0 starting - - -# -# Do the transformation. -# -sed -i -e 's/^\([2-6].*:respawn*\)/#\1/' -e 's/^T/#\t/' -e 's/tty1$/hvc0/' ${prefix}/etc/inittab - - -# -# Are we using an alternative serial device? -# -if [ ! -z "${serial_device}" ]; then - - serial_device=`basename $serial_device` - - # Let the user know. - logMessage "Replacing default serial device (tty1) with ${serial_device}" - - # replace existing device. - sed -i -e s/tty1/${serial_device}/ ${prefix}/etc/inittab - - # make sure that it is allowed to login. - echo $serial_device >> ${prefix}/etc/securetty -fi - - -# -# Log our finish -# -logMessage Script $0 finished diff --git a/hooks/gentoo/30-disable-gettys b/hooks/gentoo/30-disable-gettys new file mode 120000 index 0000000..114c431 --- /dev/null +++ b/hooks/gentoo/30-disable-gettys @@ -0,0 +1 @@ +../common/30-disable-gettys \ No newline at end of file