From ddb8f008496ec60e2065a11c16e90d015dd3659d Mon Sep 17 00:00:00 2001 From: Martin Sivak Date: Wed, 19 Dec 2012 15:47:02 +0100 Subject: Finish the renames, update spec file and add required data files --- inital-setup.spec | 54 ++++++++++++++++---------------- inital_setup/gui/hubs/inital_setup.glade | 2 +- scripts/inital-setup.csh | 12 +++---- scripts/inital-setup.sh | 10 +++--- systemd/inital-setup-graphical.service | 6 ++-- systemd/inital-setup-text.service | 8 ++--- 6 files changed, 46 insertions(+), 46 deletions(-) diff --git a/inital-setup.spec b/inital-setup.spec index 3b9a93a..efafe6e 100644 --- a/inital-setup.spec +++ b/inital-setup.spec @@ -1,9 +1,9 @@ %{!?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 +Name: inital-setup URL: http://fedoraproject.org/wiki/FirstBoot -Version: 19.0 +Version: 0.1 Release: 1%{?dist} # This is a Red Hat maintained package which is specific to # our distribution. Thus the source is only available from @@ -13,7 +13,6 @@ 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 @@ -34,54 +33,55 @@ a series of steps that allows for easier configuration of the machine. %prep %setup -q +# remove upstream egg-info +rm -rf *.egg-info + %build %{__python} setup.py build %install -%{__python} setup.py --skip-build install +%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT +rm -rf ${buildroot}%{python_sitelib}/setuptools/tests %find_lang %{name} -%clean -rm -rf %{buildroot} - %post -if [ $1 -ne 2 -a ! -f /etc/sysconfig/firstboot ]; then +if [ $1 -ne 2 -a ! -f /etc/sysconfig/inital-setup ]; then platform="$(arch)" if [ "$platform" = "s390" -o "$platform" = "s390x" ]; then - echo "RUN_FIRSTBOOT=YES" > /etc/sysconfig/firstboot + echo "RUN_INITAL_SETUP=YES" > /etc/sysconfig/inital-setup else - %systemd_post firstboot-graphical.service + %systemd_post inital-setup-graphical.service fi fi %preun if [ $1 = 0 ]; then - rm -rf /usr/share/firstboot2/*.pyc - rm -rf /usr/share/firstboot2/modules/*.pyc + rm -rf /usr/share/inital-setup/*.pyc + rm -rf /usr/share/inital-setup/modules/*.pyc fi -%systemd_preun firstboot-graphical.service +%systemd_preun inital-setup-graphical.service %postun -%systemd_postun_with_restart firstboot-graphical.service +%systemd_postun_with_restart inital-setup-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 +%dir %{_datadir}/inital-setup/ +%dir %{_datadir}/inital-setup/modules/ +%dir %{_datadir}/inital-setup/themes/ +%dir %{_datadir}/inital-setup/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 +%{_sbindir}/inital-setup +%{_datadir}/inital-setup/modules/create_user.py* +%{_datadir}/inital-setup/modules/date.py* +%{_datadir}/inital-setup/modules/eula.py* +%{_datadir}/inital-setup/modules/welcome.py* +%{_datadir}/inital-setup/themes/default/* +/lib/systemd/system/inital-setup-graphical.service %ifarch s390 s390x %dir %{_sysconfdir}/profile.d -%{_sysconfdir}/profile.d/firstboot.sh -%{_sysconfdir}/profile.d/firstboot.csh +%{_sysconfdir}/profile.d/inital-setup.sh +%{_sysconfdir}/profile.d/inital-setup.csh %endif diff --git a/inital_setup/gui/hubs/inital_setup.glade b/inital_setup/gui/hubs/inital_setup.glade index fb7358a..75ff936 100644 --- a/inital_setup/gui/hubs/inital_setup.glade +++ b/inital_setup/gui/hubs/inital_setup.glade @@ -9,7 +9,7 @@ False False DISTRIBUTION SETUP - FIRSTBOOT + INITAL SETUP False diff --git a/scripts/inital-setup.csh b/scripts/inital-setup.csh index 07a4ab7..85f7534 100644 --- a/scripts/inital-setup.csh +++ b/scripts/inital-setup.csh @@ -1,11 +1,11 @@ -# firstboot.csh +# inital-setup.csh -set FIRSTBOOT_EXEC = /usr/sbin/firstboot -set FIRSTBOOT_CONF = /etc/sysconfig/firstboot +set IS_EXEC = /usr/sbin/inital-setup +set IS_CONF = /etc/sysconfig/inital-setup # check if we should run firstboot -grep -i "RUN_FIRSTBOOT=NO" $FIRSTBOOT_CONF >/dev/null -if (( $? != 0 ) && ( -x $FIRSTBOOT_EXEC )) then +grep -i "RUN_INITAL_SETUP=NO" $IS_CONF >/dev/null +if (( $? != 0 ) && ( -x $IS_EXEC )) then # check if we're not on 3270 terminal and root if (( `/sbin/consoletype` == "pty" ) && ( `/usr/bin/id -u` == 0 )) then set args = "" @@ -14,6 +14,6 @@ if (( $? != 0 ) && ( -x $FIRSTBOOT_EXEC )) then set args = "--reconfig" endif - $FIRSTBOOT_EXEC $args + $IS_EXEC $args endif endif diff --git a/scripts/inital-setup.sh b/scripts/inital-setup.sh index 5b4ec9d..bf5d774 100644 --- a/scripts/inital-setup.sh +++ b/scripts/inital-setup.sh @@ -1,13 +1,13 @@ # firstboot.sh -FIRSTBOOT_EXEC=/usr/sbin/firstboot -FIRSTBOOT_CONF=/etc/sysconfig/firstboot +IS_EXEC=/usr/sbin/inital-setup +IS_CONF=/etc/sysconfig/inital-setup # source the config file -[ -f $FIRSTBOOT_CONF ] && . $FIRSTBOOT_CONF +[ -f $IS_CONF ] && . $IS_CONF # check if we should run firstboot -if [ -f $FIRSTBOOT_EXEC ] && [ "${RUN_FIRSTBOOT,,}" = "yes" ]; then +if [ -f $IS_EXEC ] && [ "${RUN_INITAL_SETUP,,}" = "yes" ]; then # check if we're not on 3270 terminal and root if [ $(/sbin/consoletype) = "pty" ] && [ $EUID -eq 0 ]; then args="" @@ -16,6 +16,6 @@ if [ -f $FIRSTBOOT_EXEC ] && [ "${RUN_FIRSTBOOT,,}" = "yes" ]; then fi . /etc/sysconfig/i18n - $FIRSTBOOT_EXEC $args + $IS_EXEC $args fi fi diff --git a/systemd/inital-setup-graphical.service b/systemd/inital-setup-graphical.service index e0548c8..4171a6c 100644 --- a/systemd/inital-setup-graphical.service +++ b/systemd/inital-setup-graphical.service @@ -1,5 +1,5 @@ [Unit] -Description=firstboot configuration program (graphical mode) +Description=Inital Setup configuration program (graphical mode) After=livesys.service plymouth-quit.service Before=display-manager.service getty@tty1.service Conflicts=plymouth-quit.service @@ -7,8 +7,8 @@ Conflicts=plymouth-quit.service [Service] Type=oneshot ExecStartPre=-/bin/plymouth quit -ExecStart=/usr/sbin/firstboot -ExecStartPost=/bin/systemctl disable firstboot-graphical.service +ExecStart=/usr/sbin/inital-setup +ExecStartPost=/bin/systemctl disable inital-setup-graphical.service TimeoutSec=0 RemainAfterExit=yes SysVStartPriority=99 diff --git a/systemd/inital-setup-text.service b/systemd/inital-setup-text.service index e0548c8..d6d5de6 100644 --- a/systemd/inital-setup-text.service +++ b/systemd/inital-setup-text.service @@ -1,5 +1,5 @@ [Unit] -Description=firstboot configuration program (graphical mode) +Description=Inital Setup configuration program (text mode) After=livesys.service plymouth-quit.service Before=display-manager.service getty@tty1.service Conflicts=plymouth-quit.service @@ -7,11 +7,11 @@ Conflicts=plymouth-quit.service [Service] Type=oneshot ExecStartPre=-/bin/plymouth quit -ExecStart=/usr/sbin/firstboot -ExecStartPost=/bin/systemctl disable firstboot-graphical.service +ExecStart=/usr/sbin/inital-setup +ExecStartPost=/bin/systemctl disable inital-setup-text.service TimeoutSec=0 RemainAfterExit=yes SysVStartPriority=99 [Install] -WantedBy=graphical.target +WantedBy=graphical.target #TODO -- cgit