summaryrefslogtreecommitdiffstats
path: root/lib/network/connection/ethernet.pm
diff options
context:
space:
mode:
Diffstat (limited to 'lib/network/connection/ethernet.pm')
-rw-r--r--lib/network/connection/ethernet.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/network/connection/ethernet.pm b/lib/network/connection/ethernet.pm
index 6d4d25b..61e5ca6 100644
--- a/lib/network/connection/ethernet.pm
+++ b/lib/network/connection/ethernet.pm
@@ -189,7 +189,7 @@ sub check_address_settings {
# find out what connection we are conflicting with
my $conflict_device = $conflict->{DEVICE};
- $self->{address}{error}{message} = N("%s is already used by connection that starts on boot (%s). To use this address with this connection, first disable all other devices which use it, or configure them not to start on boot", $self->{address}{ip_address}, $conflict_device);
+ $self->{address}{error}{message} = N("%s is already used by a connection that starts on boot (%s). To use this address with this connection, first disable all other devices which use it, or configure them not to start at boot", $self->{address}{ip_address}, $conflict_device);
$self->{address}{error}{field} = \$self->{address}{ip_address};
return 0;
}
@@ -220,7 +220,7 @@ sub get_hostname_settings {
help => N("This will allow the server to attribute a name for this machine. If the server does not provides a valid host name, it will be generated automatically.")},
),
{ label => N("Host name"), val => \$self->{address}{hostname}, disabled => $auto_hostname,
- help => N("You should define the hostname of this machine, which will identify this PC. Note that this hostname will be shared among all network connections. If left blank, 'localhost.localdomain' will be used.")},
+ help => N("You should define a hostname for this machine, which will identify this PC. Note that this hostname will be shared among all network connections. If left blank, 'localhost.localdomain' will be used.")},
];
}
17e032.tar'>drakx-138dbc4500e0463b1e430def67cb822c6917e032.tar
drakx-138dbc4500e0463b1e430def67cb822c6917e032.tar.gz
drakx-138dbc4500e0463b1e430def67cb822c6917e032.tar.bz2
drakx-138dbc4500e0463b1e430def67cb822c6917e032.tar.xz
drakx-138dbc4500e0463b1e430def67cb822c6917e032.zip
write down mkinitrd_helper
Diffstat (limited to 'mdk-stage1/Makefile')
-rw-r--r--mdk-stage1/Makefile11
1 files changed, 11 insertions, 0 deletions
diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile
index d6135bc8b..95be78f45 100644
--- a/mdk-stage1/Makefile
+++ b/mdk-stage1/Makefile
@@ -187,6 +187,17 @@ clean:
done
rm -f *.o .depend *.rdz *.img $(BINS)
+
+tar-mkinitrd_helper: clean
+ $(MAKE) -C mkinitrd_helper clean
+ rm -rf mkinitrd_helper-subdir
+ mkdir mkinitrd_helper-subdir
+ cd mkinitrd_helper-subdir ; cp -a ../dietlibc ../insmod-busybox ../mkinitrd_helper ../Makefile.common ../insmod.h ../log.h . ; \
+ cp ../Makefile.mkinitrd_helper Makefile
+ tar cfj mkinitrd_helper.tar.bz2 mkinitrd_helper-subdir --exclude CVS
+ rm -rf mkinitrd_helper-subdir
+
+
.depend:
$(CPP) $(CFLAGS) -DHAVE_CONFIG_H -M $(ALLSRC) > .depend