diff options
| author | Martin Sivak <msivak@redhat.com> | 2012-12-19 15:47:02 +0100 |
|---|---|---|
| committer | Martin Sivak <msivak@redhat.com> | 2012-12-19 15:47:02 +0100 |
| commit | ddb8f008496ec60e2065a11c16e90d015dd3659d (patch) | |
| tree | 84e50b9742558b56e2ce5a11899c5fecf78cd591 /scripts | |
| parent | af5fdacaf47c0c1c6976bf7b747ee9fdfdd7c0a9 (diff) | |
| download | firstboot2-ddb8f008496ec60e2065a11c16e90d015dd3659d.tar.gz firstboot2-ddb8f008496ec60e2065a11c16e90d015dd3659d.tar.xz firstboot2-ddb8f008496ec60e2065a11c16e90d015dd3659d.zip | |
Finish the renames, update spec file and add required data files
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/inital-setup.csh | 12 | ||||
| -rw-r--r-- | scripts/inital-setup.sh | 10 |
2 files changed, 11 insertions, 11 deletions
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 |