diff --git a/dialog/di_dialog.py b/dialog/di_dialog.py index 4e6c574..28939fc 100644 --- a/dialog/di_dialog.py +++ b/dialog/di_dialog.py @@ -44,7 +44,8 @@ class SerialNumber(Dialog): self.width=width def set_data(self): - s,value=Dialog.dialog.inputbox(self.text,self.height,self.width,title='serial number',clear=1) + s,value=Dialog.dialog.inputbox(text=self.text,height=self.height,width=self.width, + init=getattr(ri_data.SerialNumber,'value'),title='serial number',clear=1) if s == 0: ri_data.SerialNumber.value=value return s @@ -298,8 +299,10 @@ class Network(Dialog): if count < 0 or count > len(list) - 1: break + elif s == 0 and ri_data.Network.configuration == 'dynamic': + s = self.set_network('hostname') else: - self.set_network('hostname') + return s return s class Group(Dialog): @@ -406,3 +409,6 @@ class Prepar_installation(Dialog): return s else: return s + +#N=Network(20,50) +#N.set_data() diff --git a/dialog/di_main.py b/dialog/di_main.py index 89a1e13..7c20a36 100644 --- a/dialog/di_main.py +++ b/dialog/di_main.py @@ -17,7 +17,7 @@ di_dialog.Prepar_installation(40,100) list=['welcome','raid','mountpoint','serialnumber','network','group','service','information'] if len(di_dialog.Raid.raid_raw_init()) < 3: - del list[1] + del list[1] count=0 while True :