*** empty log message ***

2 files changed, 19 insertions, 18 deletions

diff --git a/make_boot_img b/make_boot_img
index 2a309d8bb..1eb721e96 100755
--- a/make_boot_img
+++ b/make_boot_img
@@ -52,6 +52,7 @@ sub initrd {
     my $tmp = "$ENV{HOME}/tmp/initrd";
     my $tar = "$instdir/install1_$type.$arch.tar.bz2";
     -e $tar or $tar = "$instdir/install1.$arch.tar.bz2";
+    -e $tar or $tar = "$instdir/install1.tar.bz2";
 
     __ "$sudo umount $tmp $mnt 2>/dev/null";
     _ "dd if=/dev/zero of=$tmp bs=1k count=2000";
diff --git a/perl-install/network.pm b/perl-install/network.pm
index 323861a41..51d094e46 100644
--- a/perl-install/network.pm
+++ b/perl-install/network.pm
@@ -306,24 +306,24 @@ You may also enter the IP address of the gateway if you have one"),
 }
 
 
-  sub configureNetwork2 {
-      my ($in, $prefix, $netc, $intf) = @_;
-      my $etc = "$prefix/etc";
-
-      write_conf("$etc/sysconfig/network", $netc);
-      write_resolv_conf("$etc/resolv.conf", $netc);
-      write_interface_conf("$etc/sysconfig/network-scripts/ifcfg-$_->{DEVICE}", $_) foreach @{$intf};
-      add2hosts("$etc/hosts", $netc->{HOSTNAME}, map { $_->{IPADDR} } @{$intf});
-      sethostname($netc) unless $::testing;
-      addDefaultRoute($netc) unless $::testing;
-
-      $in->pkg_install("dhcpcd") if grep { $_->{BOOTPROTO} =~ /^(dhcp)$/ } @{$intf};
-      # Handle also pump (this is still in initscripts no?)
-      $in->pkg_install("pump") if grep { $_->{BOOTPROTO} =~ /^(pump|bootp)$/ } @{$intf};
-      #-res_init();		#- reinit the resolver so DNS changes take affect
-
-      any::miscellaneousNetwork($in, $prefix);
-  }
+sub configureNetwork2 {
+    my ($in, $prefix, $netc, $intf) = @_;
+    my $etc = "$prefix/etc";
+
+    write_conf("$etc/sysconfig/network", $netc);
+    write_resolv_conf("$etc/resolv.conf", $netc);
+    write_interface_conf("$etc/sysconfig/network-scripts/ifcfg-$_->{DEVICE}", $_) foreach @{$intf};
+    add2hosts("$etc/hosts", $netc->{HOSTNAME}, map { $_->{IPADDR} } @{$intf});
+    sethostname($netc) unless $::testing;
+    addDefaultRoute($netc) unless $::testing;
+
+    $in->pkg_install("dhcpcd") if grep { $_->{BOOTPROTO} =~ /^(dhcp)$/ } @{$intf};
+    # Handle also pump (this is still in initscripts no?)
+    $in->pkg_install("pump") if grep { $_->{BOOTPROTO} =~ /^(pump|bootp)$/ } @{$intf};
+    #-res_init();		#- reinit the resolver so DNS changes take affect
+
+    any::miscellaneousNetwork($in, $prefix);
+}
 
 
 sub configureNetworkIntf {