Merge commit 'origin/master' into next

[people/pmueller/ipfire-2.x.git] / src / install+setup / libsmooth / libsmooth.h

diff --git a/src/install+setup/libsmooth/libsmooth.h b/src/install+setup/libsmooth/libsmooth.h
index c19f5bdacf7d21de024d2baa9267b536d7404549..fb381936374091c5ba136a6efe3546a119cb8c74 100644 (file)
--- a/src/install+setup/libsmooth/libsmooth.h
+++ b/src/install+setup/libsmooth/libsmooth.h
@@ -43,8 +43,8 @@
 #define DHCP 3
 #define NETCHANGE_TOTAL 4
 
-#define KNOWN_NICS   "/var/ipfire/ethernet/known_nics"
 #define SCANNED_NICS "/var/ipfire/ethernet/scanned_nics"
+#define SYSDIR "/sys/class/net"
 
 #define _GREEN_CARD_ 0
 #define _RED_CARD_ 1
@@ -62,6 +62,7 @@ struct nic
        char driver[80];
        char description[256];
        char macaddr[20];
+       char nic[20];
 };
 
 struct knic
@@ -78,6 +79,8 @@ void reboot(void);
 void stripnl(char *s);
 int mysystem(char *command);
 void errorbox(char *message);
+int statuswindowscroll(int width, int height, char *title, char *text, ...);
+int disclaimerbox(char *message);
 void statuswindow(int width, int height, char *title, char *text, ...);
 int runcommandwithprogress(int width, int height, char *title, char *command,
        int lines, char *text, ...);
@@ -94,6 +97,9 @@ int gettype(char *type);
 int setnetaddress(struct keyvalue *kv, char *colour);
 void networkdialogcallbacktype(newtComponent cm, void *data);
 int interfacecheck(struct keyvalue *kv, char *colour);
+int rename_nics(void);
+int init_knics(void);
+int create_udev(void);
 int scan_network_cards(void);
 int nicmenu(int colour);
 int clear_card_entry(int cards);