diff options
| -rwxr-xr-x | move/etc-monitorer.pl | 1 | ||||
| -rw-r--r-- | move/move.pm | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/move/etc-monitorer.pl b/move/etc-monitorer.pl index 2f79b7a49..231b9f772 100755 --- a/move/etc-monitorer.pl +++ b/move/etc-monitorer.pl @@ -10,6 +10,7 @@ foreach my $dir (@ARGV) { my @etcfiles = glob_("$dir/*"); foreach (@etcfiles) { if ($_ eq '/etc/sudoers' #- /etc/sudoers can't be a link + || $_ eq '/etc/mtab' #- same for /etc/mtab || !-f || -l && readlink =~ m|^/|) { #- we want to trap relative symlinks only next; diff --git a/move/move.pm b/move/move.pm index d08b585c2..29b19a1c9 100644 --- a/move/move.pm +++ b/move/move.pm @@ -120,7 +120,7 @@ sub init { mkdir "/etc/$_" foreach qw(X11); touch '/etc/modules.conf'; touch '/etc/modprobe.conf'; - symlinkf "/proc/mounts", "/etc/mtab"; + cp_f('/proc/mounts', '/etc/mtab'); #- these files need be writable but we need a sensible first contents cp_f("/image/etc/$_", '/etc') foreach qw(passwd passwd- group sudoers fstab); @@ -528,7 +528,7 @@ after_autoconf: require timezone; timezone::write($o->{timezone}); - $o->{useSupermount} = 1; + $o->{useSupermount} = 'magicdev'; fs::set_removable_mntpoints($o->{all_hds}); fs::set_all_default_options($o->{all_hds}, %$o, lang::fs_options($o->{locale})); @@ -663,7 +663,7 @@ sub install2::startMove { eval { swap::swapon($_->{device}) }; } elsif ($_->{mntpoint} && !$_->{isMounted} && !$::noauto) { mkdir_p($_->{mntpoint}); - run_program::run('mount', $_->{mntpoint}); + run_program::run('mount', $_->{mntpoint}) if $_->{options} !~ /noauto/; } } |