From f0dafe4a9faac3233a5b17b1156df4d7a19990c1 Mon Sep 17 00:00:00 2001
From: Christophe Fergeau <cfergeau@mandriva.com>
Date: Sat, 31 Oct 2009 16:08:20 +0000
Subject: don't mount /dev/pts since this causes huge slowdowns

When using the obsolete --attach-to-session plymouth option, /dev/pts
has to be mounted. But for some reason, nash interacts badly with
mounted /dev/pts and freezes for dozen of seconds when running a builtin
command. Remote --attach-to-session from plymouth which lets us get rid
of /dev/pts mounting.
---
 lib/MDV/Draklive/Initrd.pm | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'lib/MDV')

diff --git a/lib/MDV/Draklive/Initrd.pm b/lib/MDV/Draklive/Initrd.pm
index 335a39f..79e8ca3 100644
--- a/lib/MDV/Draklive/Initrd.pm
+++ b/lib/MDV/Draklive/Initrd.pm
@@ -213,10 +213,7 @@ sub create_initrd_scriptlet {
                           "nash-mount -t proc /proc /proc",
                           #- required for cdrom labels
                           "nash-mount -t sysfs /sys /sys",
-			  #- required for plymouthd
-			  "mkdir /dev/pts",
-			  "nash-mount -t devpts -o gid=5,mode=620 /dev/pts /dev/pts",
-			  "/bin/plymouthd --attach-to-session",
+			  "/bin/plymouthd",
 			  "plymouth --show-splash",
                           (map { join(" ", "probe-modules", list_modules::filename2modname($_), grep { $_ } $live->{system}{module_options}{$_}) } @modules),
                           "probe-modules --$media->{storage}",
@@ -235,8 +232,7 @@ sub create_initrd_scriptlet {
                           "umount /sys",
                           "sh -c 'umount /proc/bus/usb 2>/dev/null'",
                           "umount /proc",
-			  "umount /dev/pts",
-                          "pivot_root $target $target$initrdroot",
+			  "pivot_root $target $target$initrdroot",
                           if_($live->{mount}{root}, "sh -c 'rmdir $initrdroot$live->{prefix}{live}{mnt}$live->{mount}{root}'"),
                           (map { $loop_types{$_->{type}}{pivot_clean}->($live, $_, $initrdroot) } grep { $loop_types{$_->{type}}{pivot_clean} } @{$live->{mount}{dirs} || []}),
                           "sh -c 'cd $initrdroot$live->{prefix}{live}{mnt}; for i in `ls -1`; do [ -d \$i ] || continue; mkdir -p $live->{prefix}{live}{mnt}/\$i; mount -n --move \$i $live->{prefix}{live}{mnt}/\$i; rmdir \$i; done'",
-- 
cgit v1.2.1