summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Fergeau <cfergeau@mandriva.com>2009-10-31 16:08:20 +0000
committerChristophe Fergeau <cfergeau@mandriva.com>2009-10-31 16:08:20 +0000
commitf0dafe4a9faac3233a5b17b1156df4d7a19990c1 (patch)
tree135c09fd8f78724f26ac4cf94d57a8ad1f3d3fc4
parent69df32971a829d103c559255f4106d57f0ed4a3b (diff)
downloaddrakiso-f0dafe4a9faac3233a5b17b1156df4d7a19990c1.tar
drakiso-f0dafe4a9faac3233a5b17b1156df4d7a19990c1.tar.gz
drakiso-f0dafe4a9faac3233a5b17b1156df4d7a19990c1.tar.bz2
drakiso-f0dafe4a9faac3233a5b17b1156df4d7a19990c1.tar.xz
drakiso-f0dafe4a9faac3233a5b17b1156df4d7a19990c1.zip
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.
-rw-r--r--lib/MDV/Draklive/Initrd.pm8
1 files changed, 2 insertions, 6 deletions
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'",