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