[2980] in SIPB_Linux_Development
anaconda diffs.
daemon@ATHENA.MIT.EDU (Alex Coventry)
Sat Sep 16 16:42:19 2000
Date: Sat, 16 Sep 2000 14:42:11 -0400
Message-Id: <200009161842.OAA13179@w20-575-34.mit.edu>
From: Alex Coventry <alex_c@MIT.EDU>
To: Sam Hartman <hartmans@MIT.EDU>
Cc: linux-dev@MIT.EDU
Hi, Sam.
Here are diff's for anaconda turning off the user account set up pages.
They work when called from the command line as
anaconda --reconfig [--text]
but I haven't been able to test them in an actual install.
Alex.
athena% diff -c text.py /afs/sipb/system/rhlinux/redhat-6.2/RedHat/instimage/usr/lib/anaconda/text.py
*** text.py Sat Sep 16 14:35:00 2000
--- /afs/sipb/system/rhlinux/redhat-6.2/RedHat/instimage/usr/lib/anaconda/text.py Wed Mar 8 15:09:37 2000
***************
*** 1030,1037 ****
(self.screen, todo, test), "timezone" ],
[_("Root Password"), RootPasswordWindow,
(self.screen, todo), "accounts" ],
! # [_("User Account Setup"), UsersWindow,
! # (self.screen, todo), "accounts" ],
[_("Authentication"), AuthConfigWindow, (self.screen, todo),
"authentication" ],
# [_("X Configuration"), XConfigWindow, (self.screen, todo),
--- 1030,1037 ----
(self.screen, todo, test), "timezone" ],
[_("Root Password"), RootPasswordWindow,
(self.screen, todo), "accounts" ],
! [_("User Account Setup"), UsersWindow,
! (self.screen, todo), "accounts" ],
[_("Authentication"), AuthConfigWindow, (self.screen, todo),
"authentication" ],
# [_("X Configuration"), XConfigWindow, (self.screen, todo),
***************
*** 1098,1105 ****
(self.screen, todo, test), "timezone" ],
[_("Root Password"), RootPasswordWindow,
(self.screen, todo), "accounts" ],
! # [_("User Account Setup"), UsersWindow,
! # (self.screen, todo), "accounts" ],
[_("Authentication"), AuthConfigWindow, (self.screen, todo),
"authentication" ],
[_("Package Groups"), PackageGroupWindow,
--- 1098,1105 ----
(self.screen, todo, test), "timezone" ],
[_("Root Password"), RootPasswordWindow,
(self.screen, todo), "accounts" ],
! [_("User Account Setup"), UsersWindow,
! (self.screen, todo), "accounts" ],
[_("Authentication"), AuthConfigWindow, (self.screen, todo),
"authentication" ],
[_("Package Groups"), PackageGroupWindow,
athena% diff -c iw/account.py /afs/sipb/system/rhlinux/redhat-6.2/RedHat/instimage/usr/lib/anaconda/iw/account.py
*** iw/account.py Sat Sep 16 16:24:22 2000
--- /afs/sipb/system/rhlinux/redhat-6.2/RedHat/instimage/usr/lib/anaconda/iw/account.py Wed Mar 8 15:09:42 2000
***************
*** 196,283 ****
box.pack_start (self.rootStatus, FALSE)
box.pack_start (GtkHSeparator (), FALSE, padding=3)
! ##
! ## table = GtkTable (2, 3)
! ## table.set_row_spacings(5)
! ## table.set_col_spacings(5)
! ##
! ## entrytable = GtkTable (4, 4)
! ## entrytable.set_row_spacings(5)
! ## entrytable.set_col_spacings(5)
! ## self.entrytable = entrytable
! ##
! ## self.accountName = GtkEntry (8)
! ## self.accountName.connect ("activate", forward)
! ## self.accountName.connect ("changed", self.userOkay)
! ## self.accountName.connect ("insert-text", self.filter)
! ##
! ## self.accountName.set_usize (50, -1)
! ##
! ## self.fullName = GtkEntry ()
! ## self.fullName.connect ("activate", self.addUser)
! ## self.userPass1 = GtkEntry (128)
! ## self.userPass1.connect ("activate", forward)
! ## self.userPass1.connect ("changed", self.userOkay)
! ## self.userPass2 = GtkEntry (128)
! ## self.userPass2.connect ("activate", forward)
! ## self.userPass2.connect ("changed", self.userOkay)
! ## self.userPass1.set_visibility (FALSE)
! ## self.userPass2.set_visibility (FALSE)
! ## self.userPass1.set_usize (50, -1)
! ## self.userPass2.set_usize (50, -1)
! ##
! ## label = GtkLabel (_("Account Name") + ": ")
! ## label.set_alignment (0.0, 0.5)
! ## entrytable.attach (label, 0, 1, 0, 1, FILL, 0, 10)
! ## entrytable.attach (self.accountName, 1, 2, 0, 1, FILL|EXPAND)
! ## label = GtkLabel (_("Password") + ": ")
! ## label.set_alignment (0.0, 0.5)
! ## entrytable.attach (label, 0, 1, 1, 2, FILL, 0, 10)
! ## entrytable.attach (self.userPass1, 1, 2, 1, 2, FILL|EXPAND)
! ## label = GtkLabel (_("Password (confirm)") + ": ")
! ## label.set_alignment (0.0, 0.5)
! ## entrytable.attach (label, 2, 3, 1, 2, FILL, 0, 10)
! ## entrytable.attach (self.userPass2, 3, 4, 1, 2, FILL|EXPAND)
! ## label = GtkLabel (_("Full Name") + ": ")
! ## label.set_alignment (0.0, 0.5)
! ## entrytable.attach (label, 0, 1, 2, 3, FILL, 0, 10)
! ## entrytable.attach (self.fullName, 1, 4, 2, 3, FILL|EXPAND)
! ##
! ## table.attach (entrytable, 0, 4, 0, 1,
! ## xoptions = EXPAND | FILL,
! ## yoptions = EXPAND | FILL)
! ##
! ## self.add = GtkButton (_("Add"))
! ## self.add.connect("clicked", self.addUser)
! ## self.edit = GtkButton (_("Edit"))
! ## self.edit.connect("clicked", self.editUser)
! ## delete = GtkButton (_("Delete"))
! ## delete.connect("clicked", self.deleteUser)
! ## new = GtkButton (_("New"))
! ## new.connect("clicked", self.newUser)
! ##
! ## bb = GtkHButtonBox ()
! ## bb.set_border_width (5)
! ## bb.pack_start (self.add)
! ## bb.pack_start (self.edit)
! ## bb.pack_start (delete)
! ## bb.pack_start (new)
! ##
! ## box.pack_start (table, FALSE)
! ## box.pack_start (bb, FALSE)
! ## self.userList = GtkCList (2, (_("Account Name"), _("Full Name")))
! ## for x in range (2):
! ## self.userList.set_selectable (x, FALSE)
! ##
! ## self.userList.connect("select_row", self.userSelected)
! ## box.pack_start (self.userList, TRUE)
! ##
! ## index = 0
! ## for (user, name, password) in self.todo.getUserList():
! ## self.userList.append((user, name))
! ## self.passwords[user] = password
! ## index = index + 1
! ##
! ## self.userOkay()
! ## box.set_border_width (5)
return box
--- 196,283 ----
box.pack_start (self.rootStatus, FALSE)
box.pack_start (GtkHSeparator (), FALSE, padding=3)
!
! table = GtkTable (2, 3)
! table.set_row_spacings(5)
! table.set_col_spacings(5)
!
! entrytable = GtkTable (4, 4)
! entrytable.set_row_spacings(5)
! entrytable.set_col_spacings(5)
! self.entrytable = entrytable
!
! self.accountName = GtkEntry (8)
! self.accountName.connect ("activate", forward)
! self.accountName.connect ("changed", self.userOkay)
! self.accountName.connect ("insert-text", self.filter)
!
! self.accountName.set_usize (50, -1)
!
! self.fullName = GtkEntry ()
! self.fullName.connect ("activate", self.addUser)
! self.userPass1 = GtkEntry (128)
! self.userPass1.connect ("activate", forward)
! self.userPass1.connect ("changed", self.userOkay)
! self.userPass2 = GtkEntry (128)
! self.userPass2.connect ("activate", forward)
! self.userPass2.connect ("changed", self.userOkay)
! self.userPass1.set_visibility (FALSE)
! self.userPass2.set_visibility (FALSE)
! self.userPass1.set_usize (50, -1)
! self.userPass2.set_usize (50, -1)
!
! label = GtkLabel (_("Account Name") + ": ")
! label.set_alignment (0.0, 0.5)
! entrytable.attach (label, 0, 1, 0, 1, FILL, 0, 10)
! entrytable.attach (self.accountName, 1, 2, 0, 1, FILL|EXPAND)
! label = GtkLabel (_("Password") + ": ")
! label.set_alignment (0.0, 0.5)
! entrytable.attach (label, 0, 1, 1, 2, FILL, 0, 10)
! entrytable.attach (self.userPass1, 1, 2, 1, 2, FILL|EXPAND)
! label = GtkLabel (_("Password (confirm)") + ": ")
! label.set_alignment (0.0, 0.5)
! entrytable.attach (label, 2, 3, 1, 2, FILL, 0, 10)
! entrytable.attach (self.userPass2, 3, 4, 1, 2, FILL|EXPAND)
! label = GtkLabel (_("Full Name") + ": ")
! label.set_alignment (0.0, 0.5)
! entrytable.attach (label, 0, 1, 2, 3, FILL, 0, 10)
! entrytable.attach (self.fullName, 1, 4, 2, 3, FILL|EXPAND)
!
! table.attach (entrytable, 0, 4, 0, 1,
! xoptions = EXPAND | FILL,
! yoptions = EXPAND | FILL)
!
! self.add = GtkButton (_("Add"))
! self.add.connect("clicked", self.addUser)
! self.edit = GtkButton (_("Edit"))
! self.edit.connect("clicked", self.editUser)
! delete = GtkButton (_("Delete"))
! delete.connect("clicked", self.deleteUser)
! new = GtkButton (_("New"))
! new.connect("clicked", self.newUser)
!
! bb = GtkHButtonBox ()
! bb.set_border_width (5)
! bb.pack_start (self.add)
! bb.pack_start (self.edit)
! bb.pack_start (delete)
! bb.pack_start (new)
!
! box.pack_start (table, FALSE)
! box.pack_start (bb, FALSE)
! self.userList = GtkCList (2, (_("Account Name"), _("Full Name")))
! for x in range (2):
! self.userList.set_selectable (x, FALSE)
!
! self.userList.connect("select_row", self.userSelected)
! box.pack_start (self.userList, TRUE)
!
! index = 0
! for (user, name, password) in self.todo.getUserList():
! self.userList.append((user, name))
! self.passwords[user] = password
! index = index + 1
!
! self.userOkay()
! box.set_border_width (5)
return box
