From fec77ff6e27c77e0efe182b734e49ef6288cf258 Mon Sep 17 00:00:00 2001 From: Martin Sivak Date: Wed, 19 Dec 2012 15:43:22 +0100 Subject: Use the updated API to get firstboot enabled spokes --- COPYING | 339 +++++++++++++++++++++++++++++++ firstboot/Makefile | 66 ------ firstboot/gui/__init__.py | 0 firstboot/gui/__main__.py | 37 ---- firstboot/gui/gui.py | 37 ---- firstboot/gui/hubs/__init__.py | 1 - firstboot/gui/hubs/firstboot.glade | 112 ---------- firstboot/gui/hubs/firstboot.py | 47 ----- firstboot/gui/spokes/__init__.py | 0 inital-setup.spec | 90 ++++++++ inital_setup/Makefile | 66 ++++++ inital_setup/gui/__init__.py | 0 inital_setup/gui/__main__.py | 37 ++++ inital_setup/gui/gui.py | 37 ++++ inital_setup/gui/hubs/__init__.py | 1 + inital_setup/gui/hubs/inital_setup.glade | 112 ++++++++++ inital_setup/gui/hubs/inital_setup.py | 48 +++++ inital_setup/gui/spokes/__init__.py | 0 scripts/inital-setup.csh | 19 ++ scripts/inital-setup.sh | 21 ++ setup.py | 62 ++++++ systemd/inital-setup-graphical.service | 17 ++ systemd/inital-setup-text.service | 17 ++ 23 files changed, 866 insertions(+), 300 deletions(-) create mode 100644 COPYING delete mode 100644 firstboot/Makefile delete mode 100644 firstboot/gui/__init__.py delete mode 100644 firstboot/gui/__main__.py delete mode 100644 firstboot/gui/gui.py delete mode 100644 firstboot/gui/hubs/__init__.py delete mode 100644 firstboot/gui/hubs/firstboot.glade delete mode 100644 firstboot/gui/hubs/firstboot.py delete mode 100644 firstboot/gui/spokes/__init__.py create mode 100644 inital-setup.spec create mode 100644 inital_setup/Makefile create mode 100644 inital_setup/gui/__init__.py create mode 100644 inital_setup/gui/__main__.py create mode 100644 inital_setup/gui/gui.py create mode 100644 inital_setup/gui/hubs/__init__.py create mode 100644 inital_setup/gui/hubs/inital_setup.glade create mode 100644 inital_setup/gui/hubs/inital_setup.py create mode 100644 inital_setup/gui/spokes/__init__.py create mode 100644 scripts/inital-setup.csh create mode 100644 scripts/inital-setup.sh create mode 100644 setup.py create mode 100644 systemd/inital-setup-graphical.service create mode 100644 systemd/inital-setup-text.service diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..a43ea21 --- /dev/null +++ b/COPYING @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 675 Mass Ave, Cambridge, MA 02139, USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + Appendix: How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) 19yy + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/firstboot/Makefile b/firstboot/Makefile deleted file mode 100644 index c3919fc..0000000 --- a/firstboot/Makefile +++ /dev/null @@ -1,66 +0,0 @@ -# Makefile.am for anaconda -# -# Copyright (C) 2009 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published -# by the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see . -# -# Author: Martin Sivak - -ANACONDA_PATH=${HOME}/Work/anaconda/firstboot - -# GUI TESTING -rungui: - ANACONDA_DATA=${ANACONDA_PATH}/data \ - ANACONDA_WIDGETS_OVERRIDES=${ANACONDA_PATH}/widgets/python \ - ANACONDA_WIDGETS_DATA=${ANACONDA_PATH}/widgets/data \ - ANACONDA_INSTALL_CLASSES=${ANACONDA_PATH}/pyanaconda/installclasses \ - PYTHONPATH=.:${ANACONDA_PATH}/pyanaconda/isys/.libs:${ANACONDA_PATH}/widgets/python/:${ANACONDA_PATH}/widgets/src/.libs/:${ANACONDA_PATH} \ - LD_LIBRARY_PATH=${ANACONDA_PATH}/widgets/src/.libs \ - UIPATH=gui/:${ANACONDA_PATH}/pyanaconda/ui/gui/ \ - GI_TYPELIB_PATH=${ANACONDA_PATH}/widgets/src/ \ - GLADE_CATALOG_SEARCH_PATH=${ANACONDA_PATH}/widgets/glade \ - GLADE_MODULE_SEARCH_PATH=${ANACONDA_PATH}/widgets/src/.libs \ - python -m gui - -runtui: - ANACONDA_DATA=${ANACONDA_PATH}/data \ - ANACONDA_INSTALL_CLASSES=${ANACONDA_PATH}/pyanaconda/installclasses \ - PYTHONPATH=.:${ANACONDA_PATH}:${ANACONDA_PATH}/pyanaconda/isys/.libs \ - python -m tui - -runglade: - ANACONDA_DATA=${ANACONDA_PATH}/data \ - ANACONDA_WIDGETS_OVERRIDES=${ANACONDA_PATH}/widgets/python \ - ANACONDA_WIDGETS_DATA=${ANACONDA_PATH}/widgets/data \ - ANACONDA_INSTALL_CLASSES=${ANACONDA_PATH}/pyanaconda/installclasses \ - PYTHONPATH=.:${ANACONDA_PATH}:${ANACONDA_PATH}/pyanaconda/isys/.libs:${ANACONDA_PATH}/widgets/python/:${ANACONDA_PATH}/widgets/src/.libs/ \ - LD_LIBRARY_PATH=${ANACONDA_PATH}/widgets/src/.libs \ - UIPATH=${ANACONDA_PATH}/pyanaconda/ui/gui/ \ - GI_TYPELIB_PATH=${ANACONDA_PATH}/widgets/src/ \ - GLADE_CATALOG_SEARCH_PATH=${ANACONDA_PATH}/widgets/glade \ - GLADE_MODULE_SEARCH_PATH=${ANACONDA_PATH}/widgets/src/.libs \ - glade ${GLADE_FILE} - -runpy: - ANACONDA_DATA=${ANACONDA_PATH}/data \ - ANACONDA_WIDGETS_OVERRIDES=${ANACONDA_PATH}/widgets/python \ - ANACONDA_WIDGETS_DATA=${ANACONDA_PATH}/widgets/data \ - ANACONDA_INSTALL_CLASSES=${ANACONDA_PATH}/pyanaconda/installclasses \ - PYTHONPATH=.:${ANACONDA_PATH}:${ANACONDA_PATH}/pyanaconda/isys/.libs:${ANACONDA_PATH}/widgets/python/:${ANACONDA_PATH}/widgets/src/.libs/ \ - LD_LIBRARY_PATH=${ANACONDA_PATH}/widgets/src/.libs \ - UIPATH=gui/:${ANACONDA_PATH}/pyanaconda/ui/gui/ \ - GI_TYPELIB_PATH=${ANACONDA_PATH}/widgets/src/ \ - GLADE_CATALOG_SEARCH_PATH=${ANACONDA_PATH}/widgets/glade \ - GLADE_MODULE_SEARCH_PATH=${ANACONDA_PATH}/widgets/src/.libs \ - ipython diff --git a/firstboot/gui/__init__.py b/firstboot/gui/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/firstboot/gui/__main__.py b/firstboot/gui/__main__.py deleted file mode 100644 index a6485b9..0000000 --- a/firstboot/gui/__main__.py +++ /dev/null @@ -1,37 +0,0 @@ -import os -from pyanaconda.addons import collect_addon_paths - -addon_paths = ["addons"] - - -addon_module_paths = collect_addon_paths(addon_paths) -print addon_module_paths - -# Too bad anaconda does not have modularized logging -from pyanaconda import anaconda_log -anaconda_log.init() - -# Prepare data object -from pyanaconda import kickstart -data = kickstart.AnacondaKSHandler(addon_module_paths["ks"]) - - -# Import gui specifics -import gui - -# Add to search paths -gui.FirstbootGraphicalUserInterface.update_paths(addon_module_paths) - -# We need this so we can tell GI to look for overrides objects -# also in anaconda source directories -import os -import gi.overrides -for p in os.environ.get("ANACONDA_WIDGETS_OVERRIDES", "").split(":"): - gi.overrides.__path__.insert(0, p) - - -g = gui.FirstbootGraphicalUserInterface(None, None, None) - -g.setup(data) - -g.run() diff --git a/firstboot/gui/gui.py b/firstboot/gui/gui.py deleted file mode 100644 index e830a9f..0000000 --- a/firstboot/gui/gui.py +++ /dev/null @@ -1,37 +0,0 @@ -from pyanaconda.ui.gui import QuitDialog, GUIObject, GraphicalUserInterface -#from .product import productName, productVersion -from .hubs import FirstbootHub -from pyanaconda.ui.gui.spokes import StandaloneSpoke -import pyanaconda.ui.gui.spokes -from pyanaconda.ui.common import collect, FirstbootSpokeMixIn -import os.path - -productName = "Fedora" -productVersion = "rawhide" -isFinal = False - -class FirstbootQuitDialog(QuitDialog): - MESSAGE = "Are you sure you want to quit the configuration process?\nYou might end up with unusable system if you do." - -class FirstbootGraphicalUserInterface(GraphicalUserInterface): - """This is the main Gtk based firstboot interface. It inherits from - anaconda to make the look & feel as similar as possible. - """ - - TITLE = "%(productName)s %(productVersion)s SETUP" - - def __init__(self, storage, payload, instclass): - GraphicalUserInterface.__init__(self, storage, payload, instclass, - productName, productVersion, isFinal, - quitDialog = FirstbootQuitDialog) - - def _list_hubs(self): - return [FirstbootHub] - - basemask = "firstboot.gui" - basepath = os.path.dirname(__file__) - paths = GraphicalUserInterface.paths + { - "spokes": [(basemask + ".spokes.%s", os.path.join(basepath, "spokes"))], - "categories": [(basemask + ".categories.%s", os.path.join(basepath, "categories"))], - } - diff --git a/firstboot/gui/hubs/__init__.py b/firstboot/gui/hubs/__init__.py deleted file mode 100644 index d20b6cc..0000000 --- a/firstboot/gui/hubs/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from firstboot import FirstbootHub diff --git a/firstboot/gui/hubs/firstboot.glade b/firstboot/gui/hubs/firstboot.glade deleted file mode 100644 index fb7358a..0000000 --- a/firstboot/gui/hubs/firstboot.glade +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - filler - False - filler - False - False - DISTRIBUTION SETUP - FIRSTBOOT - - - False - vertical - - - False - - - - - - False - False - 0 - - - - - False - 0 - 0.5 - - - False - vertical - 6 - - - True - True - never - - - - - - True - True - 1 - - - - - - - True - True - 1 - - - - - True - False - 6 - 6 - 6 - - - _QUIT - True - True - True - start - True - True - - - False - True - 0 - - - - - _FINISH CONFIGURATION - True - True - True - end - True - - - False - True - 1 - - - - - False - True - 2 - - - - - - diff --git a/firstboot/gui/hubs/firstboot.py b/firstboot/gui/hubs/firstboot.py deleted file mode 100644 index 762eab8..0000000 --- a/firstboot/gui/hubs/firstboot.py +++ /dev/null @@ -1,47 +0,0 @@ -from pyanaconda.ui.gui.hubs.summary import SummaryHub -from pyanaconda.ui.common import collect -import os - -def collect_spokes(mask_paths): - """Return a list of all spoke subclasses that should appear for a given - category. Look for them in files imported as module_path % basename(f) - - :param mask_paths: list of mask, path tuples to search for classes - :type mask_paths: list of (mask, path) - - :return: list of Spoke classes belonging to category - :rtype: list of Spoke classes - - """ - spokes = [] - for mask, path in mask_paths: - spokes.extend(collect(mask, path, - lambda obj: hasattr(obj, "firstboot"))) - - print spokes - return spokes - - -class FirstbootHub(SummaryHub): - uiFile = "hubs/firstboot.glade" - - def _collectCategoriesAndSpokes(self): - """collects categories and spokes to be displayed on this Hub - - :return: dictionary mapping category class to list of spoke classes - :rtype: dictionary[category class] -> [ list of spoke classes ] - """ - - ret = {} - - # Collect all the categories this hub displays, then collect all the - # spokes belonging to all those categories. - spokes = [spoke for spoke in collect_spokes(self.paths["spokes"]) \ - if hasattr(spoke, "firstboot") and spoke.firstboot()] - - for spoke in spokes: - ret.setdefault(spoke.category, []) - ret[spoke.category].append(spoke) - - return ret - diff --git a/firstboot/gui/spokes/__init__.py b/firstboot/gui/spokes/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/inital-setup.spec b/inital-setup.spec new file mode 100644 index 0000000..3b9a93a --- /dev/null +++ b/inital-setup.spec @@ -0,0 +1,90 @@ +%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} + +Summary: Initial system configuration utility +Name: firstboot2 +URL: http://fedoraproject.org/wiki/FirstBoot +Version: 19.0 +Release: 1%{?dist} +# This is a Red Hat maintained package which is specific to +# our distribution. Thus the source is only available from +# within this srpm. +Source0: %{name}-%{version}.tar.gz + +License: GPLv2+ +Group: System Environment/Base +ExclusiveOS: Linux +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: gettext +BuildRequires: python-devel, python-setuptools-devel +BuildRequires: systemd-units +Requires: gtk3, python, python-gi +Requires: anaconda +Requires(post): systemd-units systemd-sysv chkconfig +Requires(preun): systemd-units +Requires(postun): systemd-units +Requires: firstboot(windowmanager) +Requires: libreport-python + +%define debug_package %{nil} + +%description +The firstboot utility runs after installation. It guides the user through +a series of steps that allows for easier configuration of the machine. + +%prep +%setup -q + +%build +%{__python} setup.py build + +%install +%{__python} setup.py --skip-build install +%find_lang %{name} + +%clean +rm -rf %{buildroot} + +%post +if [ $1 -ne 2 -a ! -f /etc/sysconfig/firstboot ]; then + platform="$(arch)" + if [ "$platform" = "s390" -o "$platform" = "s390x" ]; then + echo "RUN_FIRSTBOOT=YES" > /etc/sysconfig/firstboot + else + %systemd_post firstboot-graphical.service + fi +fi + +%preun +if [ $1 = 0 ]; then + rm -rf /usr/share/firstboot2/*.pyc + rm -rf /usr/share/firstboot2/modules/*.pyc +fi +%systemd_preun firstboot-graphical.service + +%postun +%systemd_postun_with_restart firstboot-graphical.service + +%files -f %{name}.lang +%defattr(-,root,root,-) +%dir %{_datadir}/firstboot/ +%dir %{_datadir}/firstboot/modules/ +%dir %{_datadir}/firstboot/themes/ +%dir %{_datadir}/firstboot/themes/default +%{python_sitelib}/* +%{_sbindir}/firstboot +%{_datadir}/firstboot/modules/create_user.py* +%{_datadir}/firstboot/modules/date.py* +%{_datadir}/firstboot/modules/eula.py* +%{_datadir}/firstboot/modules/welcome.py* +%{_datadir}/firstboot/themes/default/* +/lib/systemd/system/firstboot-graphical.service +%ifarch s390 s390x +%dir %{_sysconfdir}/profile.d +%{_sysconfdir}/profile.d/firstboot.sh +%{_sysconfdir}/profile.d/firstboot.csh +%endif + + +%changelog +* Tue Nov 06 2012 Martin Sivak 19.0-1 +- Inital release diff --git a/inital_setup/Makefile b/inital_setup/Makefile new file mode 100644 index 0000000..c3919fc --- /dev/null +++ b/inital_setup/Makefile @@ -0,0 +1,66 @@ +# Makefile.am for anaconda +# +# Copyright (C) 2009 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published +# by the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see . +# +# Author: Martin Sivak + +ANACONDA_PATH=${HOME}/Work/anaconda/firstboot + +# GUI TESTING +rungui: + ANACONDA_DATA=${ANACONDA_PATH}/data \ + ANACONDA_WIDGETS_OVERRIDES=${ANACONDA_PATH}/widgets/python \ + ANACONDA_WIDGETS_DATA=${ANACONDA_PATH}/widgets/data \ + ANACONDA_INSTALL_CLASSES=${ANACONDA_PATH}/pyanaconda/installclasses \ + PYTHONPATH=.:${ANACONDA_PATH}/pyanaconda/isys/.libs:${ANACONDA_PATH}/widgets/python/:${ANACONDA_PATH}/widgets/src/.libs/:${ANACONDA_PATH} \ + LD_LIBRARY_PATH=${ANACONDA_PATH}/widgets/src/.libs \ + UIPATH=gui/:${ANACONDA_PATH}/pyanaconda/ui/gui/ \ + GI_TYPELIB_PATH=${ANACONDA_PATH}/widgets/src/ \ + GLADE_CATALOG_SEARCH_PATH=${ANACONDA_PATH}/widgets/glade \ + GLADE_MODULE_SEARCH_PATH=${ANACONDA_PATH}/widgets/src/.libs \ + python -m gui + +runtui: + ANACONDA_DATA=${ANACONDA_PATH}/data \ + ANACONDA_INSTALL_CLASSES=${ANACONDA_PATH}/pyanaconda/installclasses \ + PYTHONPATH=.:${ANACONDA_PATH}:${ANACONDA_PATH}/pyanaconda/isys/.libs \ + python -m tui + +runglade: + ANACONDA_DATA=${ANACONDA_PATH}/data \ + ANACONDA_WIDGETS_OVERRIDES=${ANACONDA_PATH}/widgets/python \ + ANACONDA_WIDGETS_DATA=${ANACONDA_PATH}/widgets/data \ + ANACONDA_INSTALL_CLASSES=${ANACONDA_PATH}/pyanaconda/installclasses \ + PYTHONPATH=.:${ANACONDA_PATH}:${ANACONDA_PATH}/pyanaconda/isys/.libs:${ANACONDA_PATH}/widgets/python/:${ANACONDA_PATH}/widgets/src/.libs/ \ + LD_LIBRARY_PATH=${ANACONDA_PATH}/widgets/src/.libs \ + UIPATH=${ANACONDA_PATH}/pyanaconda/ui/gui/ \ + GI_TYPELIB_PATH=${ANACONDA_PATH}/widgets/src/ \ + GLADE_CATALOG_SEARCH_PATH=${ANACONDA_PATH}/widgets/glade \ + GLADE_MODULE_SEARCH_PATH=${ANACONDA_PATH}/widgets/src/.libs \ + glade ${GLADE_FILE} + +runpy: + ANACONDA_DATA=${ANACONDA_PATH}/data \ + ANACONDA_WIDGETS_OVERRIDES=${ANACONDA_PATH}/widgets/python \ + ANACONDA_WIDGETS_DATA=${ANACONDA_PATH}/widgets/data \ + ANACONDA_INSTALL_CLASSES=${ANACONDA_PATH}/pyanaconda/installclasses \ + PYTHONPATH=.:${ANACONDA_PATH}:${ANACONDA_PATH}/pyanaconda/isys/.libs:${ANACONDA_PATH}/widgets/python/:${ANACONDA_PATH}/widgets/src/.libs/ \ + LD_LIBRARY_PATH=${ANACONDA_PATH}/widgets/src/.libs \ + UIPATH=gui/:${ANACONDA_PATH}/pyanaconda/ui/gui/ \ + GI_TYPELIB_PATH=${ANACONDA_PATH}/widgets/src/ \ + GLADE_CATALOG_SEARCH_PATH=${ANACONDA_PATH}/widgets/glade \ + GLADE_MODULE_SEARCH_PATH=${ANACONDA_PATH}/widgets/src/.libs \ + ipython diff --git a/inital_setup/gui/__init__.py b/inital_setup/gui/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/inital_setup/gui/__main__.py b/inital_setup/gui/__main__.py new file mode 100644 index 0000000..a6485b9 --- /dev/null +++ b/inital_setup/gui/__main__.py @@ -0,0 +1,37 @@ +import os +from pyanaconda.addons import collect_addon_paths + +addon_paths = ["addons"] + + +addon_module_paths = collect_addon_paths(addon_paths) +print addon_module_paths + +# Too bad anaconda does not have modularized logging +from pyanaconda import anaconda_log +anaconda_log.init() + +# Prepare data object +from pyanaconda import kickstart +data = kickstart.AnacondaKSHandler(addon_module_paths["ks"]) + + +# Import gui specifics +import gui + +# Add to search paths +gui.FirstbootGraphicalUserInterface.update_paths(addon_module_paths) + +# We need this so we can tell GI to look for overrides objects +# also in anaconda source directories +import os +import gi.overrides +for p in os.environ.get("ANACONDA_WIDGETS_OVERRIDES", "").split(":"): + gi.overrides.__path__.insert(0, p) + + +g = gui.FirstbootGraphicalUserInterface(None, None, None) + +g.setup(data) + +g.run() diff --git a/inital_setup/gui/gui.py b/inital_setup/gui/gui.py new file mode 100644 index 0000000..e830a9f --- /dev/null +++ b/inital_setup/gui/gui.py @@ -0,0 +1,37 @@ +from pyanaconda.ui.gui import QuitDialog, GUIObject, GraphicalUserInterface +#from .product import productName, productVersion +from .hubs import FirstbootHub +from pyanaconda.ui.gui.spokes import StandaloneSpoke +import pyanaconda.ui.gui.spokes +from pyanaconda.ui.common import collect, FirstbootSpokeMixIn +import os.path + +productName = "Fedora" +productVersion = "rawhide" +isFinal = False + +class FirstbootQuitDialog(QuitDialog): + MESSAGE = "Are you sure you want to quit the configuration process?\nYou might end up with unusable system if you do." + +class FirstbootGraphicalUserInterface(GraphicalUserInterface): + """This is the main Gtk based firstboot interface. It inherits from + anaconda to make the look & feel as similar as possible. + """ + + TITLE = "%(productName)s %(productVersion)s SETUP" + + def __init__(self, storage, payload, instclass): + GraphicalUserInterface.__init__(self, storage, payload, instclass, + productName, productVersion, isFinal, + quitDialog = FirstbootQuitDialog) + + def _list_hubs(self): + return [FirstbootHub] + + basemask = "firstboot.gui" + basepath = os.path.dirname(__file__) + paths = GraphicalUserInterface.paths + { + "spokes": [(basemask + ".spokes.%s", os.path.join(basepath, "spokes"))], + "categories": [(basemask + ".categories.%s", os.path.join(basepath, "categories"))], + } + diff --git a/inital_setup/gui/hubs/__init__.py b/inital_setup/gui/hubs/__init__.py new file mode 100644 index 0000000..d20b6cc --- /dev/null +++ b/inital_setup/gui/hubs/__init__.py @@ -0,0 +1 @@ +from firstboot import FirstbootHub diff --git a/inital_setup/gui/hubs/inital_setup.glade b/inital_setup/gui/hubs/inital_setup.glade new file mode 100644 index 0000000..fb7358a --- /dev/null +++ b/inital_setup/gui/hubs/inital_setup.glade @@ -0,0 +1,112 @@ + + + + + + filler + False + filler + False + False + DISTRIBUTION SETUP + FIRSTBOOT + + + False + vertical + + + False + + + + + + False + False + 0 + + + + + False + 0 + 0.5 + + + False + vertical + 6 + + + True + True + never + + + + + + True + True + 1 + + + + + + + True + True + 1 + + + + + True + False + 6 + 6 + 6 + + + _QUIT + True + True + True + start + True + True + + + False + True + 0 + + + + + _FINISH CONFIGURATION + True + True + True + end + True + + + False + True + 1 + + + + + False + True + 2 + + + + + + diff --git a/inital_setup/gui/hubs/inital_setup.py b/inital_setup/gui/hubs/inital_setup.py new file mode 100644 index 0000000..27124b9 --- /dev/null +++ b/inital_setup/gui/hubs/inital_setup.py @@ -0,0 +1,48 @@ +from pyanaconda.ui.gui.hubs import Hub +from pyanaconda.ui.gui.spokes import Spoke +from pyanaconda.ui.common import collect +import os + +def collect_spokes(mask_paths): + """Return a list of all spoke subclasses that should appear for a given + category. Look for them in files imported as module_path % basename(f) + + :param mask_paths: list of mask, path tuples to search for classes + :type mask_paths: list of (mask, path) + + :return: list of Spoke classes belonging to category + :rtype: list of Spoke classes + + """ + spokes = [] + for mask, path in mask_paths: + spokes.extend(collect(mask, path, + lambda obj: issubclass(obj, Spoke) and obj.should_run("firstboot", None))) + + print spokes + return spokes + + +class FirstbootHub(SummaryHub): + uiFile = "hubs/firstboot.glade" + + def _collectCategoriesAndSpokes(self): + """collects categories and spokes to be displayed on this Hub + + :return: dictionary mapping category class to list of spoke classes + :rtype: dictionary[category class] -> [ list of spoke classes ] + """ + + ret = {} + + # Collect all the categories this hub displays, then collect all the + # spokes belonging to all those categories. + spokes = [spoke for spoke in collect_spokes(self.paths["spokes"]) \ + if spoke.should_run("firstboot", self.data)] + + for spoke in spokes: + ret.setdefault(spoke.category, []) + ret[spoke.category].append(spoke) + + return ret + diff --git a/inital_setup/gui/spokes/__init__.py b/inital_setup/gui/spokes/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/scripts/inital-setup.csh b/scripts/inital-setup.csh new file mode 100644 index 0000000..07a4ab7 --- /dev/null +++ b/scripts/inital-setup.csh @@ -0,0 +1,19 @@ +# firstboot.csh + +set FIRSTBOOT_EXEC = /usr/sbin/firstboot +set FIRSTBOOT_CONF = /etc/sysconfig/firstboot + +# check if we should run firstboot +grep -i "RUN_FIRSTBOOT=NO" $FIRSTBOOT_CONF >/dev/null +if (( $? != 0 ) && ( -x $FIRSTBOOT_EXEC )) then + # check if we're not on 3270 terminal and root + if (( `/sbin/consoletype` == "pty" ) && ( `/usr/bin/id -u` == 0 )) then + set args = "" + grep -i "reconfig" /proc/cmdline >/dev/null + if (( $? == 0 ) || ( -e /etc/reconfigSys )) then + set args = "--reconfig" + endif + + $FIRSTBOOT_EXEC $args + endif +endif diff --git a/scripts/inital-setup.sh b/scripts/inital-setup.sh new file mode 100644 index 0000000..5b4ec9d --- /dev/null +++ b/scripts/inital-setup.sh @@ -0,0 +1,21 @@ +# firstboot.sh + +FIRSTBOOT_EXEC=/usr/sbin/firstboot +FIRSTBOOT_CONF=/etc/sysconfig/firstboot + +# source the config file +[ -f $FIRSTBOOT_CONF ] && . $FIRSTBOOT_CONF + +# check if we should run firstboot +if [ -f $FIRSTBOOT_EXEC ] && [ "${RUN_FIRSTBOOT,,}" = "yes" ]; then + # check if we're not on 3270 terminal and root + if [ $(/sbin/consoletype) = "pty" ] && [ $EUID -eq 0 ]; then + args="" + if grep -i "reconfig" /proc/cmdline >/dev/null || [ -f /etc/reconfigSys ]; then + args="--reconfig" + fi + + . /etc/sysconfig/i18n + $FIRSTBOOT_EXEC $args + fi +fi diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..86ddd4d --- /dev/null +++ b/setup.py @@ -0,0 +1,62 @@ +#!/usr/bin/python +# Setup file for Python DI +# +# Copyright (C) 2012 Red Hat, Inc. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see +# . +# +# Red Hat Author(s): Martin Sivak +# + +import os +from setuptools import setup + +# Utility function to read the README file. +# Used for the long_description. It's nice, because now 1) we have a top level +# README file and 2) it's easier to type in the README file than to put a raw +# string in below ... +def read(fname): + return open(os.path.join(os.path.dirname(__file__), fname)).read() + +from glob import * +import os + +data_files = [('/lib/systemd/system', glob('systemd/*.service'))] + +# add the firstboot start script for s390 architectures +if os.uname()[4].startswith('s390'): + data_files.append(('/etc/profile.d', ['scripts/inital-setup.sh'])) + data_files.append(('/etc/profile.d', ['scripts/inital-setup.csh'])) + +setup( + name = "inital-setup", + version = "0.1", + author = "Martin Sivak", + author_email = "msivak@redhat.com", + description='Post-installation configuration utility', + url='http://fedoraproject.org/wiki/FirstBoot', + license = "GPLv2+", + keywords = "firstboot inital setup", + packages = ['inital_setup'], + setup_requires= ['nose>=1.0'], + test_suite = "inital_setup", + long_description=read('README'), + classifiers=[ + "Development Status :: 3 - Alpha", + "Intended Audience :: Developers", + "Topic :: Software Development :: Testing", + "License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)", + ], +) diff --git a/systemd/inital-setup-graphical.service b/systemd/inital-setup-graphical.service new file mode 100644 index 0000000..e0548c8 --- /dev/null +++ b/systemd/inital-setup-graphical.service @@ -0,0 +1,17 @@ +[Unit] +Description=firstboot configuration program (graphical mode) +After=livesys.service plymouth-quit.service +Before=display-manager.service getty@tty1.service +Conflicts=plymouth-quit.service + +[Service] +Type=oneshot +ExecStartPre=-/bin/plymouth quit +ExecStart=/usr/sbin/firstboot +ExecStartPost=/bin/systemctl disable firstboot-graphical.service +TimeoutSec=0 +RemainAfterExit=yes +SysVStartPriority=99 + +[Install] +WantedBy=graphical.target diff --git a/systemd/inital-setup-text.service b/systemd/inital-setup-text.service new file mode 100644 index 0000000..e0548c8 --- /dev/null +++ b/systemd/inital-setup-text.service @@ -0,0 +1,17 @@ +[Unit] +Description=firstboot configuration program (graphical mode) +After=livesys.service plymouth-quit.service +Before=display-manager.service getty@tty1.service +Conflicts=plymouth-quit.service + +[Service] +Type=oneshot +ExecStartPre=-/bin/plymouth quit +ExecStart=/usr/sbin/firstboot +ExecStartPost=/bin/systemctl disable firstboot-graphical.service +TimeoutSec=0 +RemainAfterExit=yes +SysVStartPriority=99 + +[Install] +WantedBy=graphical.target -- cgit