Re: sysinst with dhcp: host-name option

On Thu, 22 Mar 2007 20:44:19 +0000 David Laight wrote:

> Someone with the odd round-tuit to spare could look at making sysinst
> ask the user for network setup at the end of a non-network install.
> Most of it is just plumbing existing functions into different places.

Below is my attempt to resolve this. After unpacking the sets sysinst will ask
if user want to install network configuration in /etc. If network has already
been configured before, sysinst also asks whether user want to store this
configuration.

mntnetconfig0 message is translated to polish only.


diff -burp src/distrib/utils/sysinst.ORIG/msg.mi.de src/distrib/utils/sysinst/msg.mi.de
--- src/distrib/utils/sysinst.ORIG/msg.mi.de	2007-03-26 05:04:15.000000000 +0300
+++ src/distrib/utils/sysinst/msg.mi.de	2007-03-26 05:03:46.000000000 +0300
@@ -757,6 +757,9 @@ abbrechen.
 }
 .endif
 
+message mntnetconfig0
+{XXXDo you want to install network configuration in /etc? }
+
 message mntnetconfig
 {Möchten Sie die aktuellen Netzwerkeinstellungen für den allgemeinen
 Gebrauch in /etc speichern?}
diff -burp src/distrib/utils/sysinst.ORIG/msg.mi.en src/distrib/utils/sysinst/msg.mi.en
--- src/distrib/utils/sysinst.ORIG/msg.mi.en	2007-03-26 05:04:15.000000000 +0300
+++ src/distrib/utils/sysinst/msg.mi.en	2007-03-26 05:03:46.000000000 +0300
@@ -703,6 +703,9 @@ If the set's has no more disks, select "
 Select "Abort fetch" to return to the install media selection menu.
 }
 
+message mntnetconfig0
+{Do you want to install network configuration in /etc? }
+
 message mntnetconfig
 {Is the network information you entered accurate for this machine
 in regular operation and do you want it installed in /etc? }
diff -burp src/distrib/utils/sysinst.ORIG/msg.mi.es src/distrib/utils/sysinst/msg.mi.es
--- src/distrib/utils/sysinst.ORIG/msg.mi.es	2007-03-26 05:04:15.000000000 +0300
+++ src/distrib/utils/sysinst/msg.mi.es	2007-03-26 05:03:46.000000000 +0300
@@ -724,6 +724,9 @@ para instalarlo. Seleccione "Abortar lec
 de selección de medios de instalación.
 }
 
+message mntnetconfig0
+{XXXDo you want to install network configuration in /etc? }
+
 message mntnetconfig
 {La información de red que ha introducido, ¿es la adecuada para el
 funcionamiento normal de esta máquina y desea instalarla en /etc? }
diff -burp src/distrib/utils/sysinst.ORIG/msg.mi.fr src/distrib/utils/sysinst/msg.mi.fr
--- src/distrib/utils/sysinst.ORIG/msg.mi.fr	2007-03-26 05:04:15.000000000 +0300
+++ src/distrib/utils/sysinst/msg.mi.fr	2007-03-26 05:03:46.000000000 +0300
@@ -769,6 +769,9 @@ Sélectionnez "Annuler la récupération" p
 de sélection du média d'installation.
 }
 
+message mntnetconfig0
+{XXXDo you want to install network configuration in /etc? }
+
 message mntnetconfig
 {
 Souhaitez-vous conserver les réglages réseaux après le redémarrage
diff -burp src/distrib/utils/sysinst.ORIG/msg.mi.pl src/distrib/utils/sysinst/msg.mi.pl
--- src/distrib/utils/sysinst.ORIG/msg.mi.pl	2007-03-26 05:04:15.000000000 +0300
+++ src/distrib/utils/sysinst/msg.mi.pl	2007-03-26 05:03:46.000000000 +0300
@@ -697,6 +697,9 @@ aby rozpoczac proces jego instalacji. Wy
 zeby wybrac inne zrodlo oprogramowania.
 }
 
+message mntnetconfig0
+{Czy chcesz zapisac configuracje sieciowa w /etc? }
+
 message mntnetconfig
 {Czy informacje o sieci, ktore podales sa prawidlowe dla tej maszyny
 w reguralnej pracy i czy chcesz aby je zapisac w /etc? }
diff -burp src/distrib/utils/sysinst.ORIG/net.c src/distrib/utils/sysinst/net.c
--- src/distrib/utils/sysinst.ORIG/net.c	2007-03-26 05:04:15.000000000 +0300
+++ src/distrib/utils/sysinst/net.c	2007-03-26 05:11:40.000000000 +0300
@@ -1015,10 +1015,20 @@ mnt_net_config(void)
 	char ifconfig_fn[STRSIZE];
 	FILE *ifconf = NULL;
 
-	if (!network_up)
+	process_menu(MENU_yesno, deconst(MSG_mntnetconfig0));
+	if (!yesno)
 		return;
+	
+	if (network_up) {
 	process_menu(MENU_yesno, deconst(MSG_mntnetconfig));
-	if (!yesno)
+		if (!yesno) {
+			network_up = 0;
+			config_network();
+		}
+	} else
+		config_network();
+
+	if (!network_up)
 		return;
 
 	/* Write hostname to /etc/rc.conf */


-- 
Mikolaj Golub