diff options
| author | Dieter Plaetinck <dieter@plaetinck.be> | 2008-12-09 16:06:21 +0100 |
|---|---|---|
| committer | Dieter Plaetinck <dieter@plaetinck.be> | 2008-12-09 16:06:21 +0100 |
| commit | 6edf983eef653bb64cbd6370e806eb069cc1219a (patch) | |
| tree | 2585687569ca3ff8e76b84d71f2a464f65cfea6f | |
| parent | 4127b76d852cb7a9058e67bda2764e7d38064f2e (diff) | |
moving some code around to make some stuff prettier
| -rwxr-xr-x | src/aif.sh | 4 | ||||
| -rw-r--r-- | src/core/procedures/base | 7 | ||||
| -rw-r--r-- | src/core/procedures/interactive | 2 | ||||
| -rw-r--r-- | unofficial/modules/dieter/procedures/automatic | 1 |
4 files changed, 11 insertions, 3 deletions
@@ -249,8 +249,6 @@ stop_installer () ###### perform actual logic ###### echo "Welcome to $TITLE" -log "################## START OF INSTALLATION ##################" -[ -z "$1" ] && usage && exit 1 mount -o remount,rw / &>/dev/null @@ -315,6 +313,8 @@ load_procedure "$module" "$procedure" PACMAN=pacman PACMAN_TARGET="pacman --root $var_TARGET_DIR --config /tmp/pacman.conf" +log "################## START OF INSTALLATION ##################" + start_process stop_installer diff --git a/src/core/procedures/base b/src/core/procedures/base index c163a0e..374f5ff 100644 --- a/src/core/procedures/base +++ b/src/core/procedures/base @@ -10,6 +10,7 @@ var_UI_TYPE="cli" # set to cli or dia for dialog phase_preparation=(\ configure \ intro \ + sysprep \ select_source \ runtime_network \ runtime_packages) @@ -45,6 +46,12 @@ worker_intro () } +worker_sysprep () +{ + mount -o remount,rw / &>/dev/null +} + + worker_configure () { var_UI_TYPE=${arg_ui_type:-cli} diff --git a/src/core/procedures/interactive b/src/core/procedures/interactive index c01c0fa..3abbfa9 100644 --- a/src/core/procedures/interactive +++ b/src/core/procedures/interactive @@ -36,8 +36,8 @@ start_process () ## begin execution ## execute worker configure - execute worker intro + execute worken sysprep # menu item tracker- autoselect the next item NEXTITEM="1" diff --git a/unofficial/modules/dieter/procedures/automatic b/unofficial/modules/dieter/procedures/automatic index 9a093fa..3420232 100644 --- a/unofficial/modules/dieter/procedures/automatic +++ b/unofficial/modules/dieter/procedures/automatic @@ -7,6 +7,7 @@ var_RUNTIME_PACKAGES="svn" phase_preparation=(\ configure \ intro \ + sysprep \ msg_manual \ runtime_network \ runtime_svn \ |