From 78decbdb515f78864ad8144779cd453caacd7e90 Mon Sep 17 00:00:00 2001 From: Sören Tempel Date: Tue, 31 Mar 2015 17:14:55 +0200 Subject: services: Refactor agetty-tty? services --- services/agetty-generic/run | 7 ++++++- services/agetty-tty1/conf | 7 +++++++ services/agetty-tty1/run | 12 +----------- services/agetty-tty2/conf | 1 + services/agetty-tty2/run | 2 +- services/agetty-tty3/conf | 1 + services/agetty-tty3/run | 2 +- services/agetty-tty4/conf | 1 + services/agetty-tty4/run | 2 +- services/agetty-tty5/conf | 1 + services/agetty-tty5/run | 2 +- services/agetty-tty6/conf | 1 + services/agetty-tty6/run | 2 +- 13 files changed, 24 insertions(+), 17 deletions(-) create mode 100644 services/agetty-tty1/conf mode change 100755 => 120000 services/agetty-tty1/run create mode 120000 services/agetty-tty2/conf create mode 120000 services/agetty-tty3/conf create mode 120000 services/agetty-tty4/conf create mode 120000 services/agetty-tty5/conf create mode 120000 services/agetty-tty6/conf (limited to 'services') diff --git a/services/agetty-generic/run b/services/agetty-generic/run index 9a34297..f6e625c 100755 --- a/services/agetty-generic/run +++ b/services/agetty-generic/run @@ -1,4 +1,7 @@ #!/bin/sh + +[ -r conf ] && . conf + tty=${PWD##*-} if [ -x /sbin/getty ]; then # busybox @@ -7,4 +10,6 @@ elif [ -x /sbin/agetty ]; then # util-linux GETTY=agetty fi -exec setsid $GETTY $tty 38400 linux + +exec setsid ${GETTY}${GETTY_ARGS:+ $GETTY_ARGS} \ + "${tty}" "${baud_rate}" "${term_name}" diff --git a/services/agetty-tty1/conf b/services/agetty-tty1/conf new file mode 100644 index 0000000..977d7ef --- /dev/null +++ b/services/agetty-tty1/conf @@ -0,0 +1,7 @@ +if [ -x /sbin/getty ]; then + # util-linux specific settings + GETTY_ARGS="--no-clear" +fi + +baud_rate=38400 +term_name=linux diff --git a/services/agetty-tty1/run b/services/agetty-tty1/run deleted file mode 100755 index dc01b10..0000000 --- a/services/agetty-tty1/run +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -tty=${PWD##*-} -if [ -x /sbin/getty ]; then - # busybox - GETTY=getty -elif [ -x /sbin/agetty ]; then - # util-linux - GETTY=agetty - GETTY_ARGS="--noclear" -fi -exec setsid $GETTY $GETTY_ARGS $tty 38400 linux diff --git a/services/agetty-tty1/run b/services/agetty-tty1/run new file mode 120000 index 0000000..26e72f0 --- /dev/null +++ b/services/agetty-tty1/run @@ -0,0 +1 @@ +../agetty-generic/run \ No newline at end of file diff --git a/services/agetty-tty2/conf b/services/agetty-tty2/conf new file mode 120000 index 0000000..7c3c642 --- /dev/null +++ b/services/agetty-tty2/conf @@ -0,0 +1 @@ +../agetty-tty1/conf \ No newline at end of file diff --git a/services/agetty-tty2/run b/services/agetty-tty2/run index 2ebc95f..26e72f0 120000 --- a/services/agetty-tty2/run +++ b/services/agetty-tty2/run @@ -1 +1 @@ -/etc/sv/agetty-generic/run \ No newline at end of file +../agetty-generic/run \ No newline at end of file diff --git a/services/agetty-tty3/conf b/services/agetty-tty3/conf new file mode 120000 index 0000000..7c3c642 --- /dev/null +++ b/services/agetty-tty3/conf @@ -0,0 +1 @@ +../agetty-tty1/conf \ No newline at end of file diff --git a/services/agetty-tty3/run b/services/agetty-tty3/run index 2ebc95f..26e72f0 120000 --- a/services/agetty-tty3/run +++ b/services/agetty-tty3/run @@ -1 +1 @@ -/etc/sv/agetty-generic/run \ No newline at end of file +../agetty-generic/run \ No newline at end of file diff --git a/services/agetty-tty4/conf b/services/agetty-tty4/conf new file mode 120000 index 0000000..7c3c642 --- /dev/null +++ b/services/agetty-tty4/conf @@ -0,0 +1 @@ +../agetty-tty1/conf \ No newline at end of file diff --git a/services/agetty-tty4/run b/services/agetty-tty4/run index 2ebc95f..26e72f0 120000 --- a/services/agetty-tty4/run +++ b/services/agetty-tty4/run @@ -1 +1 @@ -/etc/sv/agetty-generic/run \ No newline at end of file +../agetty-generic/run \ No newline at end of file diff --git a/services/agetty-tty5/conf b/services/agetty-tty5/conf new file mode 120000 index 0000000..7c3c642 --- /dev/null +++ b/services/agetty-tty5/conf @@ -0,0 +1 @@ +../agetty-tty1/conf \ No newline at end of file diff --git a/services/agetty-tty5/run b/services/agetty-tty5/run index 2ebc95f..26e72f0 120000 --- a/services/agetty-tty5/run +++ b/services/agetty-tty5/run @@ -1 +1 @@ -/etc/sv/agetty-generic/run \ No newline at end of file +../agetty-generic/run \ No newline at end of file diff --git a/services/agetty-tty6/conf b/services/agetty-tty6/conf new file mode 120000 index 0000000..7c3c642 --- /dev/null +++ b/services/agetty-tty6/conf @@ -0,0 +1 @@ +../agetty-tty1/conf \ No newline at end of file diff --git a/services/agetty-tty6/run b/services/agetty-tty6/run index 2ebc95f..26e72f0 120000 --- a/services/agetty-tty6/run +++ b/services/agetty-tty6/run @@ -1 +1 @@ -/etc/sv/agetty-generic/run \ No newline at end of file +../agetty-generic/run \ No newline at end of file -- cgit 1.4.1