From ba59d8bd1a5276c67d67ceb042cf086020c98a17 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 23 May 2012 18:28:03 +0000 Subject: no need to create /dev/zero and the like, udev already did it quite a lot more remain as we either lack prope udev rules or rely on older style entries or are needed in drakx-in-chroot mode --- perl-install/any.pm | 1 - perl-install/authentication.pm | 2 +- perl-install/fs/mount.pm | 2 -- perl-install/install/NEWS | 1 + perl-install/install/commands.pm | 2 +- perl-install/install/install2.pm | 3 +-- 6 files changed, 4 insertions(+), 7 deletions(-) (limited to 'perl-install') diff --git a/perl-install/any.pm b/perl-install/any.pm index 787706332..c95ab95fc 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -1399,7 +1399,6 @@ You can use userdrake to add a user to this group.") sub monitor_full_edid() { return if $::noauto; - devices::make('zero'); my ($vbe, $edid); { # prevent warnings in install's logs: diff --git a/perl-install/authentication.pm b/perl-install/authentication.pm index 02a88737c..9fc00a78e 100644 --- a/perl-install/authentication.pm +++ b/perl-install/authentication.pm @@ -797,7 +797,7 @@ sub enable_shadow() { sub salt { my ($nb) = @_; require devices; - open(my $F, devices::make("urandom")) or die "missing urandom"; + open(my $F, "/dev/urandom") or die "missing urandom"; my $s; read $F, $s, $nb; $s = pack("b8" x $nb, unpack "b6" x $nb, $s); $s =~ tr|\0-\x3f|0-9a-zA-Z./|; diff --git a/perl-install/fs/mount.pm b/perl-install/fs/mount.pm index 4365c0caa..0bff5f06c 100644 --- a/perl-install/fs/mount.pm +++ b/perl-install/fs/mount.pm @@ -160,8 +160,6 @@ sub part { set_loop($part); $options = join(',', grep { !/^(encryption=|encrypted$|loop$)/ } split(',', $options)); #- we take care of this, don't let it mount see it } elsif (isLoopback($part)) { - #- mount will take care, but we must help it - devices::make("loop$_") foreach 0 .. 7; $options = join(',', uniq('loop', split(',', $options))); #- ensure the loop options is used } elsif ($part->{options} =~ /encrypted/) { log::l("skip mounting $part->{device} since we do not have the encrypt_key"); diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 43a16efb8..0fd3e5ed2 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,4 @@ +- do not create /dev/ entries created by udev - kill last remanents of kernel-2.4.x support - package group selection: o remember minimal install values when clicking "previous" diff --git a/perl-install/install/commands.pm b/perl-install/install/commands.pm index 154a9cfb1..f89002a27 100644 --- a/perl-install/install/commands.pm +++ b/perl-install/install/commands.pm @@ -276,7 +276,7 @@ sub hexdump { sub more { @ARGV = @_; require devices; - my $tty = devices::make('tty'); + my $tty = '/dev/tty'; my $n = 0; open(my $IN, $tty) or die "cannot open $tty\n"; local $_; diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm index 05d3c8a14..065c88515 100644 --- a/perl-install/install/install2.pm +++ b/perl-install/install/install2.pm @@ -347,8 +347,7 @@ sub pre_init_brltty() { sub init_brltty() { symlink "/tmp/stage2/$_", $_ foreach "/etc/brltty"; - devices::make($_) foreach $o->{brltty}{device} ? $o->{brltty}{device} : qw(ttyS0 ttyS1); - devices::make("vcsa"); + devices::make($_) foreach $o->{brltty}{device}; run_program::run("brltty"); } -- cgit v1.2.1