diff options
| -rw-r--r-- | perl-install/Makefile | 1 | ||||
| -rw-r--r-- | perl-install/c/stuff.xs.pm | 2 | ||||
| -rw-r--r-- | perl-install/fs.pm | 7 | ||||
| -rw-r--r-- | perl-install/install_any.pm | 4 |
4 files changed, 8 insertions, 6 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile index 801007cda..434a06bcb 100644 --- a/perl-install/Makefile +++ b/perl-install/Makefile @@ -71,6 +71,7 @@ get_needed_files: $(DIRS) perl -Mlang -I. -e 'print "$$_\n" foreach lang::console_font_files()' >> /tmp/list install -d $(DEST)/etc + install -d $(DEST)/etc/sysconfig/network-scripts install -d $(DEST)/lib install -d $(DEST)/bin install -d $(DEST)/usr/bin diff --git a/perl-install/c/stuff.xs.pm b/perl-install/c/stuff.xs.pm index 87ee1c98e..395b97173 100644 --- a/perl-install/c/stuff.xs.pm +++ b/perl-install/c/stuff.xs.pm @@ -797,7 +797,7 @@ rpmRunTransactions(trans, callbackOpen, callbackClose, callbackMessage, force) } if (rpmRunTransactions(trans, rpmRunTransactions_callback, NULL, NULL, &probs, 0, force ? ~0 : ~RPMPROB_FILTER_DISKSPACE)) { int i; - printf("rpmRunTransactions finished, errors occured %d\n", probs->numProblems); fflush(stdout); + /* printf("rpmRunTransactions finished, errors occured %d\n", probs->numProblems); fflush(stdout); */ EXTEND(SP, probs->numProblems); for (i = 0; i < probs->numProblems; i++) { PUSHs(sv_2mortal(newSVpv(rpmProblemString(probs->probs[i]), 0))); diff --git a/perl-install/fs.pm b/perl-install/fs.pm index 2bf151c32..a873dac19 100644 --- a/perl-install/fs.pm +++ b/perl-install/fs.pm @@ -14,6 +14,7 @@ use detect_devices; use commands; use modules; use raid; +use fsedit use loopback; 1; @@ -61,9 +62,11 @@ sub check_mounted($) { } sub get_mntpoints_from_fstab { - my ($fstab, $prefix) = @_; + my ($fstab, $prefix, $uniq) = @_; foreach (read_fstab("$prefix/etc/fstab")) { + next if $uniq && fsedit::mntpoint2part($_->{mntpoint}, $fstab); + foreach my $p (@$fstab) { $p->{device} eq $_->{device} or next; $_->{type} ne 'auto' && $_->{type} ne type2fs($p->{type}) and @@ -371,7 +374,6 @@ sub write_fstab($;$$) { my @new = grep { $_ ne 'none' } map { @$_[0,1] } @to_add; my %new; @new{@new} = undef; - require fsedit; unshift @to_add, grep { my $b = !exists $new{$_->[0]} && !exists $new{$_->[1]}; @@ -386,7 +388,6 @@ sub write_fstab($;$$) { isNfs($_) and $dir = '', $options = $_->{options} || 'ro,nosuid,rsize=8192,wsize=8192'; isFat($_) and $options = $_->{options} || "user,exec,umask=0"; - require fsedit; isReiserfs($_) && $_ == fsedit::get_root($fstab, 'boot') and add_options($options, "notail"); my $dev = isLoopback($_) ? diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 7fccfb7a2..dc658be44 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -631,7 +631,7 @@ sub suggest_mount_points { $part->{mntpoint} = $mnt; #- try to find other mount points via fstab - fs::get_mntpoints_from_fstab(\@parts, $d) if $mnt eq '/'; + fs::get_mntpoints_from_fstab(\@parts, $d, $uniq) if $mnt eq '/'; } #- $_->{mntpoint} || fsedit::suggest_part($_, $hds) foreach @parts; @@ -649,7 +649,7 @@ sub use_root_part { my ($fstab, $part, $prefix) = @_; { my $handle = any::inspect($part, $prefix) or die; - fs::get_mntpoints_from_fstab($fstab, $handle->{dir}); + fs::get_mntpoints_from_fstab($fstab, $handle->{dir}, 'uniq'); } map { $_->{mntpoint} = 'swap_upgrade' } grep { isSwap($_) } @$fstab; #- use all available swap. |