Common subdirectories: sysinst.orig/CVS and sysinst/CVS
Common subdirectories: sysinst.orig/arch and sysinst/arch
diff -c sysinst.orig/msg.mi.de sysinst/msg.mi.de
*** sysinst.orig/msg.mi.de	Sat Jan  1 17:00:10 2005
--- sysinst/msg.mi.de	Sat Jan  1 22:25:59 2005
***************
*** 606,611 ****
--- 606,614 ----
  message net_ip
  {IPv4 Adresse}
  
+ message net_ip_2nd
+ {Server IPv4 number}
+ 
  message net_mask
  {IPv4 Netzmaske}
  
***************
*** 634,639 ****
--- 637,656 ----
  Verbindunstyp:		%s 
  }
  
+ message netok_slip
+ {The following are the values you entered.  Are they OK?
+ 
+ DNS Domain:		%s
+ Host Name:		%s
+ Primary Interface:	%s
+ Host IP:		%s
+ Server IP:		%s
+ Netmask:		%s
+ IPv4 Nameserver:	%s
+ IPv4 Gateway:		%s
+ Media type:		%s
+ }
+ 
  message netokv6
  {
  IPv6 Autokonfiguration:	%s 
***************
*** 643,648 ****
--- 660,669 ----
  message netok_ok
  {Sind diese OK?}
  
+ message slattach {
+ Enter slattach flags
+ }
+ 
  message netagain
  {Bitte geben Sie die Informationen über Ihr Netzwerk erneut an. Diese werden
  auch als Vorgabe beibehalten.
diff -c sysinst.orig/msg.mi.en sysinst/msg.mi.en
*** sysinst.orig/msg.mi.en	Sat Jan  1 17:00:10 2005
--- sysinst/msg.mi.en	Sat Jan  1 17:25:24 2005
***************
*** 583,588 ****
--- 583,591 ----
  message net_ip
  {Your IPv4 number}
  
+ message net_ip_2nd
+ {Server IPv4 number}
+ 
  message net_mask
  {IPv4 Netmask}
  
***************
*** 611,616 ****
--- 614,633 ----
  Media type:		%s 
  }
  
+ message netok_slip
+ {The following are the values you entered.  Are they OK?
+ 
+ DNS Domain:		%s 
+ Host Name:		%s 
+ Primary Interface:	%s 
+ Host IP:		%s 
+ Server IP:		%s 
+ Netmask:		%s 
+ IPv4 Nameserver:	%s 
+ IPv4 Gateway:		%s 
+ Media type:		%s 
+ }
+ 
  message netokv6
  {IPv6 autoconf:		%s 
  IPv6 Nameserver:	%s 
***************
*** 953,958 ****
--- 970,979 ----
  Press <return> to continue.
  }
  
+ message slattach {
+ Enter slattach flags
+ }
+ 
  message Pick_an_option {Pick an option to turn on or off.}
  message Scripting {Scripting}
  message Logging {Logging}
diff -c sysinst.orig/msg.mi.fr sysinst/msg.mi.fr
*** sysinst.orig/msg.mi.fr	Sat Jan  1 17:00:10 2005
--- sysinst/msg.mi.fr	Sat Jan  1 22:29:30 2005
***************
*** 598,603 ****
--- 598,606 ----
  message net_ip
  {Votre adresse IPv4}
  
+ message net_ip_2nd
+ {Server IPv4 number}
+ 
  message net_mask
  {Votre masque de réseau (IPv4)}
  
***************
*** 625,630 ****
--- 628,647 ----
  Type de réseau (media):		 %s 
  }
  
+ message netok_slip
+ {The following are the values you entered.  Are they OK?
+ 
+ DNS Domain:		%s
+ Host Name:		%s
+ Primary Interface:	%s
+ Host IP			%s
+ Server IP:		%s
+ Netmask:		%s
+ IPv4 Nameserver:	%s
+ IPv4 Gateway:		%s
+ Media type:		%s
+ }
+ 
  message netokv6
  {Autoconfiguration IPv6:		 %s 
  Adresse du serveur de noms IPv6: %s 
***************
*** 633,638 ****
--- 650,659 ----
  message netok_ok
  {Les valeurs sont-elles correctes ?}
  
+ message slattach {
+ Enter slattach flags
+ }
+ 
  message netagain
  {Veuillez indiquer à nouveau les informations sur votre réseau.
  }
diff -c sysinst.orig/msg.mi.pl sysinst/msg.mi.pl
*** sysinst.orig/msg.mi.pl	Sat Jan  1 17:00:10 2005
--- sysinst/msg.mi.pl	Sat Jan  1 22:33:50 2005
***************
*** 572,577 ****
--- 572,580 ----
  message net_ip
  {Twoj adres IPv4}
  
+ message net_ip_2nd
+ {Server IPv4 number}
+ 
  message net_mask
  {Maska podsieci IPv4}
  
***************
*** 600,605 ****
--- 603,621 ----
  Medium sieciowe:	%s
  }
  
+ message netok_slip
+ {The following are the values you entered.  Are they OK?
+ 
+ DNS Domain:		%s
+ Host Name:		%s
+ Primary Interface:	%s
+ Host IP:		%s
+ Server IP:		%s
+ Netmask:		%s
+ IPv4 Nameserver:	%s
+ IPv4 Gateway:		%s
+ Media type:		%s
+ }
  message netokv6
  {Autkonfiguracja IPv6:	%s 
  Serwer nazw IPv6:	%s 
***************
*** 608,613 ****
--- 624,633 ----
  message netok_ok
  {Czy sa poprawne?}
  
+ message slattach {
+ Enter slattach flags
+ }
+ 
  message netagain
  {Wprowadz jeszcze raz informacje o twojej sieci. Twoje ostatnie odpowiedzi
  beda domyslnymi wartosciami.
diff -c sysinst.orig/net.c sysinst/net.c
*** sysinst.orig/net.c	Sat Jan  1 17:00:10 2005
--- sysinst/net.c	Sat Jan  1 21:52:13 2005
***************
*** 59,64 ****
--- 59,67 ----
  #include "menu_defs.h"
  #include "txtwalk.h"
  
+ #include <sys/wait.h>
+ #include <sys/resource.h>
+ 
  int network_up = 0;
  /* Access to network information */
  static char *net_devices;
***************
*** 67,76 ****
--- 70,81 ----
  static char net_domain[STRSIZE];
  static char net_host[STRSIZE];
  static char net_ip[STRSIZE];
+ static char net_ip_2nd[STRSIZE];
  static char net_mask[STRSIZE];
  static char net_namesvr[STRSIZE];
  static char net_defroute[STRSIZE];
  static char net_media[STRSIZE];
+ static char sl_flags[STRSIZE];
  static int net_dhcpconf;
  #define DHCPCONF_IPADDR         0x01
  #define DHCPCONF_NAMESVR        0x02
***************
*** 213,219 ****
  #endif
  	"nsip",			/* netns */
  	"ppp",			/* net */
! 	"sl",			/* net */
  	"strip",		/* net */
  	"tun",			/* net */
  	/* XXX others? */
--- 218,224 ----
  #endif
  	"nsip",			/* netns */
  	"ppp",			/* net */
! /*	"sl",		*/	/* net */
  	"strip",		/* net */
  	"tun",			/* net */
  	/* XXX others? */
***************
*** 463,468 ****
--- 468,479 ----
  	const char *prompt;
  	int  octet0;
  	int  pass, dhcp_config;
+ 
+  	int  slip;
+  	int  pid, status;
+  	char **ap, *slcmd[10], *in_buf;
+  	char buffer[STRSIZE];
+ 
  	int l;
  	char dhcp_host[STRSIZE];
  #ifdef INET6
***************
*** 512,560 ****
  	}
  	free(defname);
  
! 	/* Preload any defaults we can find */
! 	get_ifinterface_info();
! 	pass = net_mask[0] == '\0' ? 0 : 1;
! 
! 	/* domain and host */
! 	msg_display(MSG_netinfo);
  
! 	/* ethernet medium */
! 	if (net_media[0] != '\0')
! 		msg_prompt_add(MSG_net_media, net_media, net_media,
! 		    sizeof net_media);
! 
! 	/* try a dhcp configuration */
! 	dhcp_config = config_dhcp(net_dev);
! 	if (dhcp_config) {
! 		/* Get newly configured data off interface. */
  		get_ifinterface_info();
  
! 		net_dhcpconf |= DHCPCONF_IPADDR;
! 
! 		/* run route show and extract data */
! 		get_command_out(net_defroute, sizeof(net_defroute), AF_INET,
! 		    "/sbin/route -n show -inet 2>/dev/null", "default");
! 
! 		/* pull nameserver info out of /etc/resolv.conf */
! 		get_command_out(net_namesvr, sizeof(net_namesvr), AF_INET,
! 		    "cat /etc/resolv.conf 2> /dev/null", "nameserver");
! 		if (net_namesvr[0] != '\0')
! 			net_dhcpconf |= DHCPCONF_NAMESVR;
  
! 		/* pull domainname out of leases file */
! 		get_dhcp_value(net_domain, sizeof(net_domain), "domain-name");
! 		if (net_domain[0] != '\0')
! 			net_dhcpconf |= DHCPCONF_DOMAIN;
! 
! 		/* pull hostname out of leases file */
! 		dhcp_host[0] = 0;
! 		get_dhcp_value(dhcp_host, sizeof(net_host), "hostname");
! 		if (dhcp_host[0] != '\0') {
! 			net_dhcpconf |= DHCPCONF_HOST;
! 			strlcpy(net_host, dhcp_host, sizeof net_host);
  		}
! 	}
  
  	msg_prompt_add(MSG_net_domain, net_domain, net_domain,
  	    sizeof net_domain);
--- 523,579 ----
  	}
  	free(defname);
  
! 	/* We have got SLIP interface */
! 	if (strncmp(net_dev, "sl", 2) == 0)
! 		slip = 1;
! 	else
! 		slip = 0;
  
! 	/* Preload any defaults we can find */
! 	if (!slip) {
  		get_ifinterface_info();
+ 		pass = net_mask[0] == '\0' ? 0 : 1;
  
! 		/* domain and host */
! 		msg_display(MSG_netinfo);
  
! 		/* ethernet medium */
! 		if (net_media[0] != '\0')
! 			msg_prompt_add(MSG_net_media, net_media, net_media,
! 		    	sizeof net_media);
! 
! 		/* try a dhcp configuration */
! 		dhcp_config = config_dhcp(net_dev);
! 		if (dhcp_config) {
! 			/* Get newly configured data off interface. */
! 			get_ifinterface_info();
! 
! 			net_dhcpconf |= DHCPCONF_IPADDR;
! 
! 			/* run route show and extract data */
! 			get_command_out(net_defroute, sizeof(net_defroute), AF_INET,
! 		    	"/sbin/route -n show -inet 2>/dev/null", "default");
! 
! 			/* pull nameserver info out of /etc/resolv.conf */
! 			get_command_out(net_namesvr, sizeof(net_namesvr), AF_INET,
! 		    	"cat /etc/resolv.conf 2> /dev/null", "nameserver");
! 			if (net_namesvr[0] != '\0')
! 				net_dhcpconf |= DHCPCONF_NAMESVR;
! 
! 			/* pull domainname out of leases file */
! 			get_dhcp_value(net_domain, sizeof(net_domain), "domain-name");
! 			if (net_domain[0] != '\0')
! 				net_dhcpconf |= DHCPCONF_DOMAIN;
! 
! 			/* pull hostname out of leases file */
! 			dhcp_host[0] = 0;
! 			get_dhcp_value(dhcp_host, sizeof(net_host), "hostname");
! 			if (dhcp_host[0] != '\0') {
! 				net_dhcpconf |= DHCPCONF_HOST;
! 				strlcpy(net_host, dhcp_host, sizeof net_host);
! 			}
  		}
! 	} else dhcp_config = 0;
  
  	msg_prompt_add(MSG_net_domain, net_domain, net_domain,
  	    sizeof net_domain);
***************
*** 563,582 ****
  	if (!dhcp_config) {
  		/* Manually configure IPv4 */
  		msg_prompt_add(MSG_net_ip, net_ip, net_ip, sizeof net_ip);
! 		octet0 = atoi(net_ip);
! 		if (!pass) {
! 			if (0 <= octet0 && octet0 <= 127)
! 				strlcpy(net_mask, "0xff000000",
! 				    sizeof(net_mask));
! 			else if (128 <= octet0 && octet0 <= 191)
! 				strlcpy(net_mask, "0xffff0000",
! 				    sizeof(net_mask));
! 			else if (192 <= octet0 && octet0 <= 223)
! 				strlcpy(net_mask, "0xffffff00",
! 				    sizeof(net_mask));
! 		}
! 		msg_prompt_add(MSG_net_mask, net_mask, net_mask,
! 		    sizeof net_mask);
  		msg_prompt_add(MSG_net_defroute, net_defroute, net_defroute,
  		    sizeof net_defroute);
  	}
--- 582,607 ----
  	if (!dhcp_config) {
  		/* Manually configure IPv4 */
  		msg_prompt_add(MSG_net_ip, net_ip, net_ip, sizeof net_ip);
! 		if (!slip) {
! 			octet0 = atoi(net_ip);
! 			if (!pass) {
! 				if (0 <= octet0 && octet0 <= 127)
! 					strlcpy(net_mask, "0xff000000",
! 				    	sizeof(net_mask));
! 				else if (128 <= octet0 && octet0 <= 191)
! 					strlcpy(net_mask, "0xffff0000",
! 				    	sizeof(net_mask));
! 				else if (192 <= octet0 && octet0 <= 223)
! 					strlcpy(net_mask, "0xffffff00",
! 				    	sizeof(net_mask));
! 			}
! 		} else
! 			msg_prompt_add(MSG_net_ip_2nd, net_ip_2nd, net_ip_2nd, STRSIZE);
! 		/* We don't want netmasks for SLIP,
! 		just in case of ... */
! 		if (!slip)
! 			msg_prompt_add(MSG_net_mask, net_mask, net_mask,
! 		    	sizeof net_mask);
  		msg_prompt_add(MSG_net_defroute, net_defroute, net_defroute,
  		    sizeof net_defroute);
  	}
***************
*** 603,614 ****
  #endif
  
  	/* confirm the setting */
! 	msg_display(MSG_netok, net_domain, net_host, net_dev,
! 		     *net_ip == '\0' ? "<none>" : net_ip,
! 		     *net_mask == '\0' ? "<none>" : net_mask,
! 		     *net_namesvr == '\0' ? "<none>" : net_namesvr,
! 		     *net_defroute == '\0' ? "<none>" : net_defroute,
! 		     *net_media == '\0' ? "<default>" : net_media);
  #ifdef INET6
  	msg_display_add(MSG_netokv6,
  		     !is_v6kernel() ? "<not supported>" :
--- 628,648 ----
  #endif
  
  	/* confirm the setting */
! 	if (slip)
! 		msg_display(MSG_netok_slip, net_domain, net_host, net_dev,
! 			*net_ip == '\0' ? "<none>" : net_ip,
! 			*net_ip_2nd == '\0' ? "<none>" : net_ip_2nd,
! 			*net_mask == '\0' ? "<none>" : net_mask,
! 			*net_namesvr == '\0' ? "<none>" : net_namesvr,
! 			*net_defroute == '\0' ? "<none>" : net_defroute,
! 			*net_media == '\0' ? "<default>" : net_media);
! 	else
! 		msg_display(MSG_netok, net_domain, net_host, net_dev,
! 			*net_ip == '\0' ? "<none>" : net_ip,
! 			*net_mask == '\0' ? "<none>" : net_mask,
! 			*net_namesvr == '\0' ? "<none>" : net_namesvr,
! 			*net_defroute == '\0' ? "<none>" : net_defroute,
! 			*net_media == '\0' ? "<default>" : net_media);
  #ifdef INET6
  	msg_display_add(MSG_netokv6,
  		     !is_v6kernel() ? "<not supported>" :
***************
*** 681,687 ****
  		*net_media = '\0';
  	}
  
! 	if (*net_media != '\0')
  		run_program(0, "/sbin/ifconfig %s media %s",
  		    net_dev, net_media);
  
--- 715,721 ----
  		*net_media = '\0';
  	}
  
! 	if (!slip && *net_media != '\0')
  		run_program(0, "/sbin/ifconfig %s media %s",
  		    net_dev, net_media);
  
***************
*** 696,707 ****
  #endif
  
  	if (net_ip[0] != '\0') {
! 		if (net_mask[0] != '\0') {
! 			run_program(0, "/sbin/ifconfig %s inet %s netmask %s",
! 			    net_dev, net_ip, net_mask);
  		} else {
! 			run_program(0, "/sbin/ifconfig %s inet %s",
! 			    net_dev, net_ip);
  		}
  	}
  
--- 730,762 ----
  #endif
  
  	if (net_ip[0] != '\0') {
! 		if (slip) {
! 			/* Set SLIP interface UP */
! 			run_program(0, "/sbin/ifconfig %s inet %s %s up", net_dev, net_ip, net_ip_2nd);
! 			strcpy(sl_flags, "-s 115200 -l /dev/tty00");
! 			msg_prompt_add(MSG_slattach, sl_flags, sl_flags, 255);
! 
! 			pid = fork();
! 			if (pid == 0) {
! 				strcpy(buffer, "/sbin/slattach ");
! 				strcat(buffer, sl_flags);
! 				in_buf = buffer;
! 
! 				for (ap = slcmd; (*ap = strsep(&in_buf, " ")) != NULL;)
! 				if (**ap != '\0')
! 					++ap;
! 
! 				execvp(slcmd[0], slcmd);
! 			} else
! 				wait4(pid, &status, WNOHANG, 0);
  		} else {
! 			if (net_mask[0] != '\0') {
! 				run_program(0, "/sbin/ifconfig %s inet %s netmask %s",
! 				    net_dev, net_ip, net_mask);
! 			} else {
! 				run_program(0, "/sbin/ifconfig %s inet %s",
! 			    	net_dev, net_ip);
! 			}
  		}
  	}