|
|
|
@ -3409,10 +3409,11 @@ sub setup{
|
|
|
|
|
# Перенесем udev-правила, если в системе более одной сетевой карты
|
|
|
|
|
#----------------------------------------------------------------------
|
|
|
|
|
{
|
|
|
|
|
my $rule = "/etc/udev/rules.d/70-persistent-net.rules";
|
|
|
|
|
if($data{net_eth1} && -e $rule){
|
|
|
|
|
my $rule = "/etc/udev/rules.d";
|
|
|
|
|
if($data{net_eth1} && -e "$rule/70-persistent-net.rules"){
|
|
|
|
|
printmes(" ".gettext('Copy udev net rules')); printmes("...");
|
|
|
|
|
system "$data{path} cp -a $rule $data{'chroot'}$data{scratch_ws}$rule";
|
|
|
|
|
system "$data{path} mkdir -p $data{'chroot'}$data{scratch_ws}$rule";
|
|
|
|
|
system "$data{path} cp -a $rule/70-persistent-net.rules $data{'chroot'}$data{scratch_ws}$rule";
|
|
|
|
|
printmes(" ".gettext('done').".\n");
|
|
|
|
|
} }
|
|
|
|
|
|
|
|
|
@ -3420,12 +3421,24 @@ sub setup{
|
|
|
|
|
# Перенесем настройки wicd
|
|
|
|
|
#----------------------------------------------------------------------
|
|
|
|
|
{
|
|
|
|
|
my $ms = "/etc/wicd/manager-settings.conf";
|
|
|
|
|
my $ws = "/etc/wicd/wireless-settings.conf";
|
|
|
|
|
if(-e $ms || -e $ws){
|
|
|
|
|
my $wicd = "/etc/wicd";
|
|
|
|
|
if(-e "$wicd/manager-settings.conf" || -e "$wicd/wireless-settings.conf"){
|
|
|
|
|
printmes(" ".gettext('Copy wicd manager settings')); printmes("...");
|
|
|
|
|
if(-e $ms){system "$data{path} cp $ms $data{'chroot'}$data{scratch_ws}$ms";}
|
|
|
|
|
if(-e $ws){system "$data{path} cp $ws $data{'chroot'}$data{scratch_ws}$ws";}
|
|
|
|
|
system "$data{path} mkdir -p $data{'chroot'}$data{scratch_ws}$wicd";
|
|
|
|
|
if(-e $ms){system "$data{path} cp $wicd/manager-settings.conf $data{'chroot'}$data{scratch_ws}$wicd";}
|
|
|
|
|
if(-e $ws){system "$data{path} cp $wicd/wireless-settings.conf $data{'chroot'}$data{scratch_ws}$wicd";}
|
|
|
|
|
printmes(" ".gettext('done').".\n");
|
|
|
|
|
} }
|
|
|
|
|
|
|
|
|
|
#----------------------------------------------------------------------
|
|
|
|
|
# Перенесем статистику preload
|
|
|
|
|
#----------------------------------------------------------------------
|
|
|
|
|
{
|
|
|
|
|
my $state = "/var/lib/preload";
|
|
|
|
|
if(-e $state){
|
|
|
|
|
printmes(" ".gettext('Copy preload state')); printmes("...");
|
|
|
|
|
system "$data{path} mkdir -p $data{'chroot'}$data{scratch_ws}$state";
|
|
|
|
|
system "$data{path} cp -a $state/preload.state $data{'chroot'}$data{scratch_ws}$state";
|
|
|
|
|
printmes(" ".gettext('done').".\n");
|
|
|
|
|
} }
|
|
|
|
|
|
|
|
|
|