From 5bc555a2767fd148164faf83b1f38880ce251782 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 03 2016 06:02:08 +0000 Subject: import firstboot-19.12-1.el7 --- diff --git a/.firstboot.metadata b/.firstboot.metadata index d701bee..b9b1bd2 100644 --- a/.firstboot.metadata +++ b/.firstboot.metadata @@ -1 +1 @@ -806605c1f349ab0ff3a1378ef802fecbc90ac27a SOURCES/firstboot-19.9.tar.bz2 +e54e570d0ed8d4ea4756f80f05e2957eaa836fb2 SOURCES/firstboot-19.12.tar.bz2 diff --git a/.gitignore b/.gitignore index 3713ae7..f94d44f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/firstboot-19.9.tar.bz2 +SOURCES/firstboot-19.12.tar.bz2 diff --git a/SOURCES/0001-Disable-firstboot-graphical-service-at-the-end-10913.patch b/SOURCES/0001-Disable-firstboot-graphical-service-at-the-end-10913.patch deleted file mode 100644 index ca0b058..0000000 --- a/SOURCES/0001-Disable-firstboot-graphical-service-at-the-end-10913.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 58abb4d88f2166e77f71fe1e6b59aaaafae8ca82 Mon Sep 17 00:00:00 2001 -From: Vratislav Podzimek -Date: Fri, 25 Apr 2014 12:47:47 +0200 -Subject: Disable firstboot-graphical service at the end (#1091317) - -There's no point in running the service again and again on every single boot -for it only to find out it shouldn't actually run. - -Signed-off-by: Vratislav Podzimek -Signed-off-by: Martin Kolman ---- - progs/firstboot | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/progs/firstboot b/progs/firstboot -index 3d9c5e9..ba57ca6 100755 ---- a/progs/firstboot -+++ b/progs/firstboot -@@ -119,6 +119,10 @@ if __name__ == '__main__': - if line.strip() == 'RUN_FIRSTBOOT=NO': - os.system('systemctl stop firstboot-graphical.service > /dev/null 2>&1') - os.system('systemctl stop firstboot-text.service > /dev/null 2>&1') -+ -+ # disable the service so that it doesn't run on every boot just to find -+ # out it should kill itself -+ os.system("systemctl disable firstboot-graphical.service") - sys.exit(0) - - if not opts.module_dir: -@@ -178,5 +182,9 @@ if __name__ == '__main__': - except OSError: - pass - -+ # disable the service so that it doesn't run on every boot just to find -+ # out it should kill itself -+ os.system("systemctl disable firstboot-graphical.service") -+ - if reboot_required: - os.system("/sbin/reboot") --- -1.9.3 - diff --git a/SOURCES/0002-Fix-exception-handling-952633.patch b/SOURCES/0002-Fix-exception-handling-952633.patch deleted file mode 100644 index ab10ed2..0000000 --- a/SOURCES/0002-Fix-exception-handling-952633.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 12167a02350e15ecde7a156c9425c068acba7051 Mon Sep 17 00:00:00 2001 -From: Martin Kolman -Date: Thu, 18 Sep 2014 15:57:10 +0200 -Subject: [PATCH] Fix exception handling (#952633) - -Provide python-meh and libreport with correctly formated data -and dump broken interactive console error reporting. - -Resolves: rhbz#952633 -Signed-off-by: Martin Kolman ---- - progs/firstboot | 26 ++++++++++++++++---------- - 1 file changed, 16 insertions(+), 10 deletions(-) - -diff --git a/progs/firstboot b/progs/firstboot -index ba57ca6..f690a86 100755 ---- a/progs/firstboot -+++ b/progs/firstboot -@@ -53,7 +53,11 @@ def exception_handler(type, value, tb, obj): - meh_conf = meh.Config(programName='firstboot', - programVersion='@VERSION@') - -- dump_obj = meh.dump.ExceptionDump((type, value, tb), meh_conf) -+ # python-meh expects the exception data in a named tuple -+ ExcInfo = namedtuple("ExcInfo", ["type", "value", "stack"]) -+ exc_info = ExcInfo(type, value, tb) -+ -+ dump_obj = meh.dump.ReverseExceptionDump(exc_info, meh_conf) - exn_dump = dump_obj.traceback_and_object_dump(obj) - - fd, path = tempfile.mkstemp(prefix='firstboot-tb-') -@@ -66,6 +70,17 @@ def exception_handler(type, value, tb, obj): - params = dict() - params.update(dump_obj.environment_info) - -+ # turn the python-meh package info to a key/value pairs -+ pkg_info = params.pop("pkg_info", None) -+ if pkg_info: -+ params["pkg_name"] = pkg_info.name -+ params["pkg_version"] = pkg_info.version -+ params["pkg_release"] = pkg_info.release -+ params["pkg_epoch"] = pkg_info.epoch -+ params["pkg_arch"] = pkg_info.arch -+ params["package"] = "%s-%s-%s.%s" % (pkg_info.name, pkg_info.version, -+ pkg_info.release, pkg_info.arch) -+ - params.setdefault('component', 'firstboot') - params.setdefault('package', 'firstboot-@VERSION@') - -@@ -80,15 +95,6 @@ def exception_handler(type, value, tb, obj): - - problem_data.create_dump_dir(ABRT_DIR) - -- print _('Unhandled exception in firstboot occured.') -- print _('Bugreport directory was created and once you login, ABRT should\n' -- 'let you file a bug. (Don\'t forget to check "Show all problems")') -- answer = raw_input (_('Do you want to start /usr/bin/setup so that you can\n' -- 'create your user account? [Y/n] ')) -- -- if not answer.lower() in [_('n'), _('no')]: -- os.system('/usr/bin/setup') -- - - if __name__ == '__main__': - # set up exception handling first --- -1.9.3 - diff --git a/SOURCES/0003-Replace-Finish-with-Done-on-the-next-button-1107887.patch b/SOURCES/0003-Replace-Finish-with-Done-on-the-next-button-1107887.patch deleted file mode 100644 index b1b91ce..0000000 --- a/SOURCES/0003-Replace-Finish-with-Done-on-the-next-button-1107887.patch +++ /dev/null @@ -1,57 +0,0 @@ -From f8b8191dcc340e237a23580c60a72382cb68f596 Mon Sep 17 00:00:00 2001 -From: Martin Kolman -Date: Fri, 26 Sep 2014 14:02:02 +0200 -Subject: [PATCH] Replace Finish with Done on the next button (#1107887) - -By default Firstboot displays the "Forward" label on the next-button -if there are any modules following the current module. - -Once it reaches the last module, it currently tries to decide -if it should show keep the "Forward" label or switch to the -"Finish" label due to the given screen being the last. - -Unfortunately, some multi-page modules, such as Subscription Manager -do not provide any feedback to Firstboot if the given page is the last page. - One Subscription Manager page even has a combo box that decides if the module quits -or continues to the next page and there is no feedback provided about -this. - -The lack of feedback is not an issue if such a module is not the last -one as all the labels would just be "Forward", but if the module is the -last one as the only one, Firstboot does not have enough information -to decide which label to use. - -Given the lack of any other option, just set the next button label to -"Done" for all pages on the last (or possibly only) Firstboot module. - -Resolves: rhbz#1107887 -Signed-off-by: Martin Kolman ---- - firstboot/interface.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/firstboot/interface.py b/firstboot/interface.py -index 6fda66d..60d4800 100644 ---- a/firstboot/interface.py -+++ b/firstboot/interface.py -@@ -87,7 +87,7 @@ class Interface(object): - - # If we were previously on the last page, we need to set the Next - # button's label back to normal. -- if self.nextButton.get_label() == _("_Finish"): -+ if self.nextButton.get_label() == _("_Done"): - self.nextButton.set_label("gtk-go-forward") - - self._control.currentPage = self._control.history.pop() -@@ -163,7 +163,7 @@ class Interface(object): - # ModuleSet), it's time to kill the interface. - if len(self._controlStack) == 1: - if self._control.currentPage == len(self.moduleList)-1: -- self.nextButton.set_label(_("_Finish")) -+ self.nextButton.set_label(_("_Done")) - elif self._control.currentPage == len(self.moduleList): - self.checkReboot() - self.destroy() --- -1.9.3 - diff --git a/SOURCES/0004-Handle-next-button-naming-also-if-there-is-only-one-.patch b/SOURCES/0004-Handle-next-button-naming-also-if-there-is-only-one-.patch deleted file mode 100644 index 51867a5..0000000 --- a/SOURCES/0004-Handle-next-button-naming-also-if-there-is-only-one-.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 6e6a398e253772c043590183d7c036d1449e0025 Mon Sep 17 00:00:00 2001 -From: Martin Kolman -Date: Mon, 29 Sep 2014 17:01:18 +0200 -Subject: [PATCH] Handle next button naming also if there is only one module - (#1107887) - -Due to how multi-page modules work (they return FAILURE on apply() to -prevent Firstboot from switching to the next module) the code that -changes the next button label will be never called if there is only -a single multi-page module in Firstboot. - -So check if the label change is needed even if the module returns -FAILURE. - -Related: rhbz#1107887 -Signed-off-by: Martin Kolman ---- - firstboot/interface.py | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/firstboot/interface.py b/firstboot/interface.py -index 60d4800..800c8bd 100644 ---- a/firstboot/interface.py -+++ b/firstboot/interface.py -@@ -150,8 +150,14 @@ class Interface(object): - # interface which will know the proper way to handle it. - result = module.apply(self, self.testing) - -- # If something went wrong in the module, don't advance. -+ # If something went wrong in the module, don't advance, -+ # but check if the next button should be renamed as -+ # returning failure seems to be an indication of switching -+ # to next page in multi-page modules - if result == RESULT_FAILURE: -+ if len(self._controlStack) == 1: -+ if self._control.currentPage == len(self.moduleList) - 1: -+ self.nextButton.set_label(_("_Done")) - return - - # If the apply action from the current page jumped us to another page, --- -1.9.3 - diff --git a/SOURCES/0005-Use-smaller-title-text-size-so-that-it-fits-on-the-s.patch b/SOURCES/0005-Use-smaller-title-text-size-so-that-it-fits-on-the-s.patch deleted file mode 100644 index ef42969..0000000 --- a/SOURCES/0005-Use-smaller-title-text-size-so-that-it-fits-on-the-s.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 0fbd9ec83a7868babae347b4e93d18135f664139 Mon Sep 17 00:00:00 2001 -From: Martin Kolman -Date: Tue, 9 Sep 2014 14:19:23 +0200 -Subject: [PATCH] Use smaller title text size so that it fits on the screen - (#1040583) - -I've tried to use set_line_wrap(), but it introduced weird layout -issues. Changing the text size works just as well, seems to be more -robust and even works fine on 800x600. - -Resolves: rhbz#1040583 ---- - firstboot/module.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/firstboot/module.py b/firstboot/module.py -index 1b7fadc..6c4c918 100644 ---- a/firstboot/module.py -+++ b/firstboot/module.py -@@ -166,7 +166,7 @@ class Module: - # Create the large label that goes at the top of the right side. - label = gtk.Label("") - label.set_alignment(0.0, 0.5) -- label.set_markup("%s" % _(self.title)) -+ label.set_markup("%s" % _(self.title)) - - titleBox = gtk.HBox() - --- -1.9.3 - diff --git a/SOURCES/0006-Fix-exception-handler-952633.patch b/SOURCES/0006-Fix-exception-handler-952633.patch deleted file mode 100644 index 5b5796d..0000000 --- a/SOURCES/0006-Fix-exception-handler-952633.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 42b755d222f75fcedddfd1a7373783c3d1f2c7c9 Mon Sep 17 00:00:00 2001 -From: Martin Kolman -Date: Wed, 17 Dec 2014 17:13:53 +0100 -Subject: [PATCH] Fix exception handler (#952633) - -A missing namedtuple import was preventing the exception handler from -working correctly. - -Related: rhbz#952633 -Signed-off-by: Martin Kolman ---- - progs/firstboot | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/progs/firstboot b/progs/firstboot -index f690a86..8e45f25 100755 ---- a/progs/firstboot -+++ b/progs/firstboot -@@ -27,6 +27,8 @@ import sys - import tempfile - import traceback - -+from collections import namedtuple -+ - import firstboot.frontend - import firstboot.loader - --- -1.9.3 - diff --git a/SOURCES/0007-Fix-the-Firstboot-startup-scripts-for-the-s390-11806.patch b/SOURCES/0007-Fix-the-Firstboot-startup-scripts-for-the-s390-11806.patch deleted file mode 100644 index d20bb93..0000000 --- a/SOURCES/0007-Fix-the-Firstboot-startup-scripts-for-the-s390-11806.patch +++ /dev/null @@ -1,52 +0,0 @@ -From ea6edcfa5cb9a6a4dd5739f2238a051097f82a65 Mon Sep 17 00:00:00 2001 -From: Martin Kolman -Date: Fri, 9 Jan 2015 18:06:36 +0100 -Subject: [PATCH] Fix the Firstboot startup scripts for the s390 (#1180616) - -Drop usage of /etc/sysconfig/i18n, which has been removed in RHEL-7 -and only launch Firstboot if $DESKTOP is set. - -Patch by jstodola. - -Resolves rhbz#1180616 - -Signed-off-by: Martin Kolman ---- - scripts/firstboot.csh | 5 ++++- - scripts/firstboot.sh | 6 ++++-- - 2 files changed, 8 insertions(+), 3 deletions(-) - -diff --git a/scripts/firstboot.csh b/scripts/firstboot.csh -index 07a4ab7..a4ff699 100644 ---- a/scripts/firstboot.csh -+++ b/scripts/firstboot.csh -@@ -14,6 +14,9 @@ if (( $? != 0 ) && ( -x $FIRSTBOOT_EXEC )) then - set args = "--reconfig" - endif - -- $FIRSTBOOT_EXEC $args -+ # run firstboot only if $DISPLAY is set -+ if ( $?DISPLAY == 1 ) then -+ $FIRSTBOOT_EXEC $args -+ endif - endif - endif -diff --git a/scripts/firstboot.sh b/scripts/firstboot.sh -index 5b4ec9d..dc4f0ef 100644 ---- a/scripts/firstboot.sh -+++ b/scripts/firstboot.sh -@@ -15,7 +15,9 @@ if [ -f $FIRSTBOOT_EXEC ] && [ "${RUN_FIRSTBOOT,,}" = "yes" ]; then - args="--reconfig" - fi - -- . /etc/sysconfig/i18n -- $FIRSTBOOT_EXEC $args -+ . /etc/locale.conf -+ . /etc/vconsole.conf -+ # run firstboot only if $DISPLAY is set -+ [ -n "$DISPLAY" ] && $FIRSTBOOT_EXEC $args - fi - fi --- -2.1.0 - diff --git a/SOURCES/0008-Add-a-README-1194155.patch b/SOURCES/0008-Add-a-README-1194155.patch deleted file mode 100644 index 6b4ec8b..0000000 --- a/SOURCES/0008-Add-a-README-1194155.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 6bf8a942bfd0cebbef55e17531382a0e2746eef0 Mon Sep 17 00:00:00 2001 -From: Martin Kolman -Date: Mon, 15 Jun 2015 16:48:24 +0200 -Subject: [PATCH] Add a README (#1194155) - -Add a short readme that contains instructions on how to re-enable -Firstboot and a deprecation notice. The deprecation notice includes -links to Firstboot plugin -> Anaconda/Initial Setup addon porting -resources. - -Resolves: rhbz#1194155 ---- - MANIFEST.in | 2 +- - README.txt | 20 ++++++++++++++++++++ - 2 files changed, 21 insertions(+), 1 deletion(-) - create mode 100644 README.txt - -diff --git a/MANIFEST.in b/MANIFEST.in -index 2723803..26babb5 100644 ---- a/MANIFEST.in -+++ b/MANIFEST.in -@@ -1,4 +1,4 @@ --include Makefile firstboot.spec -+include Makefile firstboot.spec README.txt - recursive-include init firstboot - recursive-include po *.po *.pot Makefile - recursive-include progs firstboot -diff --git a/README.txt b/README.txt -new file mode 100644 -index 0000000..0693910 ---- /dev/null -+++ b/README.txt -@@ -0,0 +1,20 @@ -+== How to re-enable Firstboot after first boot == -+To re-enable Firstboot, you need to do the following: -+ -+ 1. rm /etc/sysconfig/firstboot -+ 2. systemctl enable firstboot-graphical.service -+ -+NOTE: /etc/reconfigSys is now (RHEL7) ignored. -+ -+== Advisory to porting Firstboot plugins == -+ -+The legacy Firstboot tool is no longer in development and all current Firstboot users are advised to port their legacy Firstboot plugins to Anaconda addons, which don't have most of the limitations imposed by the Firstboot architecture. Also unlike Firstboot plugins, Anaconda addons can be run both of during installation (by Anaconda), and after installation (by Initial Setup). -+ -+A comprehensive Anaconda Addon Development Guide is available: -+http://rhinstaller.github.io/anaconda-addon-development-guide/ -+ -+As well as an example "Hello world" addon: -+https://github.com/rhinstaller/hello-world-anaconda-addon -+ -+Also the Kdump project recently successfully made the transition from a Firstboot plugin to an Anaconda addon and could be used as good reference example for a more advanced addon project: -+https://github.com/daveyoung/kdump-anaconda-addon --- -2.4.2 - diff --git a/SPECS/firstboot.spec b/SPECS/firstboot.spec index aefe253..16a9885 100644 --- a/SPECS/firstboot.spec +++ b/SPECS/firstboot.spec @@ -3,30 +3,13 @@ Summary: Initial system configuration utility Name: firstboot URL: http://fedoraproject.org/wiki/FirstBoot -Version: 19.9 -Release: 10%{?dist} +Version: 19.12 +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.bz2 -# disable the systemd service once Firstboot is done -Patch1: 0001-Disable-firstboot-graphical-service-at-the-end-10913.patch -# fix exception handling -Patch2: 0002-Fix-exception-handling-952633.patch -# use "Done" instead of "Forward" of "Finish" on last module -Patch3: 0003-Replace-Finish-with-Done-on-the-next-button-1107887.patch -# correctly change the next-button label even for on multi-page module -Patch4: 0004-Handle-next-button-naming-also-if-there-is-only-one-.patch -# use smaller title text size so that it fits on the screen -Patch5: 0005-Use-smaller-title-text-size-so-that-it-fits-on-the-s.patch -# fix exception handler by adding a missing import -Patch6: 0006-Fix-exception-handler-952633.patch -# fix startup scripts for the s390 -Patch7: 0007-Fix-the-Firstboot-startup-scripts-for-the-s390-11806.patch -# add a README -Patch8: 0008-Add-a-README-1194155.patch - License: GPLv2+ Group: System Environment/Base ExclusiveOS: Linux @@ -54,16 +37,6 @@ a series of steps that allows for easier configuration of the machine. %prep %setup -q -# apply patches -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 - %build %install @@ -119,6 +92,20 @@ fi %changelog +* Fri Jun 17 2016 Martin Kolman 19.12-1 +- Update the po files (#1273359) (mkolman@redhat.com) + Related: rhbz#1273359 + +* Fri Apr 15 2016 Martin Kolman 19.11-1 +- Update the po & pot files (#1273359) (mkolman@redhat.com) + Related: rhbz#1273359 + +* Mon Feb 08 2016 Martin Kolman 19.10-1 +- Switch from Transifex to Zanata (#1273359) (mkolman@redhat.com) + Related: rhbz#1273359 +- Update translations (#1273359) (mkolman@redhat.com) + Resolves: rhbz#1273359 + * Wed Jun 17 2015 Martin Kolman 19.9-10 - Make sure the README file is properly installed (#1194155) (mkolman) Resolves: rhbz#1194155