Harald Hoyer 1ee1e3
From 02aa795514b4f6febcedd1d0f3079c6eacdfd3f2 Mon Sep 17 00:00:00 2001
Harald Hoyer 1ee1e3
From: Harald Hoyer <harald@redhat.com>
Harald Hoyer 1ee1e3
Date: Wed, 14 Mar 2012 16:13:48 +0100
Harald Hoyer 1ee1e3
Subject: [PATCH] remove --ctty
Harald Hoyer 1ee1e3
Harald Hoyer 1ee1e3
---
Harald Hoyer 1ee1e3
 dracut.8.asc                     |    3 ---
Harald Hoyer 1ee1e3
 dracut.cmdline.7.asc             |    6 ------
Harald Hoyer 1ee1e3
 dracut.sh                        |    4 +---
Harald Hoyer 1ee1e3
 modules.d/99base/module-setup.sh |    1 -
Harald Hoyer 1ee1e3
 4 files changed, 1 insertion(+), 13 deletions(-)
Harald Hoyer 1ee1e3
Harald Hoyer 1ee1e3
diff --git a/dracut.8.asc b/dracut.8.asc
Harald Hoyer 1ee1e3
index 6ca7347..891246d 100644
Harald Hoyer 1ee1e3
--- a/dracut.8.asc
Harald Hoyer 1ee1e3
+++ b/dracut.8.asc
Harald Hoyer 1ee1e3
@@ -193,9 +193,6 @@ example:
Harald Hoyer 1ee1e3
 **--noprefix**::
Harald Hoyer 1ee1e3
     do not prefix initramfs files (default)
Harald Hoyer 1ee1e3
 
Harald Hoyer 1ee1e3
-**--ctty**::
Harald Hoyer 1ee1e3
-    if possible, try to spawn an emergency shell on a terminal with job control
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
 **-h, --help**::
Harald Hoyer 1ee1e3
     display help text and exit.
Harald Hoyer 1ee1e3
 
Harald Hoyer 1ee1e3
diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc
Harald Hoyer 1ee1e3
index 8924b89..738d464 100644
Harald Hoyer 1ee1e3
--- a/dracut.cmdline.7.asc
Harald Hoyer 1ee1e3
+++ b/dracut.cmdline.7.asc
Harald Hoyer 1ee1e3
@@ -78,12 +78,6 @@ Misc
Harald Hoyer 1ee1e3
     force loading kernel module <drivername> after all automatic loading modules
Harald Hoyer 1ee1e3
     have been loaded. This parameter can be specified multiple times.
Harald Hoyer 1ee1e3
 
Harald Hoyer 1ee1e3
-**rd.ctty=**_<terminal>_::
Harald Hoyer 1ee1e3
-    if the dracut image was generated with --ctty option, try to spawn an
Harald Hoyer 1ee1e3
-    emergency shell on the specified terminal; if rd.ctty is specified without a
Harald Hoyer 1ee1e3
-    value or not provided at all, the default is /dev/tty1. The '/dev' prefix
Harald Hoyer 1ee1e3
-    can be omitted.
Harald Hoyer 1ee1e3
-
Harald Hoyer 1ee1e3
 [[dracutkerneldebug]]
Harald Hoyer 1ee1e3
 Debug
Harald Hoyer 1ee1e3
 ~~~~~
Harald Hoyer 1ee1e3
diff --git a/dracut.sh b/dracut.sh
Harald Hoyer 1ee1e3
index 417008c..1bf8ad9 100755
Harald Hoyer 1ee1e3
--- a/dracut.sh
Harald Hoyer 1ee1e3
+++ b/dracut.sh
Harald Hoyer 1ee1e3
@@ -121,7 +121,6 @@ Creates initial ramdisk images for preloading modules
Harald Hoyer 1ee1e3
                          build.
Harald Hoyer 1ee1e3
   --keep                Keep the temporary initramfs for debugging purposes
Harald Hoyer 1ee1e3
   --sshkey [SSHKEY]     Add ssh key to initramfs (use with ssh-client module)
Harald Hoyer 1ee1e3
-  --ctty                Add control tty for emergency shells
Harald Hoyer 1ee1e3
 
Harald Hoyer 1ee1e3
 If [LIST] has multiple arguments, then you have to put these in quotes.
Harald Hoyer 1ee1e3
 For example:
Harald Hoyer 1ee1e3
@@ -241,7 +240,6 @@ while (($# > 0)); do
Harald Hoyer 1ee1e3
         --nolvmconf)   lvmconf_l="no";;
Harald Hoyer 1ee1e3
         --debug)       debug="yes";;
Harald Hoyer 1ee1e3
         --profile)     profile="yes";;
Harald Hoyer 1ee1e3
-        --ctty)        cttyhack="yes";;
Harald Hoyer 1ee1e3
         --sshkey)      read_arg sshkey   "$@" || shift;;
Harald Hoyer 1ee1e3
         -v|--verbose)  ((verbosity_mod_l++));;
Harald Hoyer 1ee1e3
         -q|--quiet)    ((verbosity_mod_l--));;
Harald Hoyer 1ee1e3
@@ -625,7 +623,7 @@ done
Harald Hoyer 1ee1e3
 export initdir dracutbasedir dracutmodules drivers \
Harald Hoyer 1ee1e3
     fw_dir drivers_dir debug no_kernel kernel_only \
Harald Hoyer 1ee1e3
     add_drivers omit_drivers mdadmconf lvmconf filesystems \
Harald Hoyer 1ee1e3
-    use_fstab fstab_lines libdir usrlibdir fscks nofscks cttyhack \
Harald Hoyer 1ee1e3
+    use_fstab fstab_lines libdir usrlibdir fscks nofscks \
Harald Hoyer 1ee1e3
     stdloglvl sysloglvl fileloglvl kmsgloglvl logfile \
Harald Hoyer 1ee1e3
     debug host_fs_types host_devs sshkey
Harald Hoyer 1ee1e3
 
Harald Hoyer 1ee1e3
diff --git a/modules.d/99base/module-setup.sh b/modules.d/99base/module-setup.sh
Harald Hoyer 1ee1e3
index 5a97770..98742f5 100755
Harald Hoyer 1ee1e3
--- a/modules.d/99base/module-setup.sh
Harald Hoyer 1ee1e3
+++ b/modules.d/99base/module-setup.sh
Harald Hoyer 1ee1e3
@@ -16,7 +16,6 @@ install() {
Harald Hoyer 1ee1e3
     dracut_install mount mknod mkdir modprobe pidof sleep chroot \
Harald Hoyer 1ee1e3
         sed ls flock cp mv dmesg rm ln rmmod mkfifo umount readlink
Harald Hoyer 1ee1e3
     dracut_install -o less
Harald Hoyer 1ee1e3
-    [[ $cttyhack = yes ]] && dracut_install -o setsid
Harald Hoyer 1ee1e3
     if [ ! -e "${initdir}/bin/sh" ]; then
Harald Hoyer 1ee1e3
         dracut_install bash
Harald Hoyer 1ee1e3
         (ln -s bash "${initdir}/bin/sh" || :)