diff options
author | Dieter Plaetinck <dieter@plaetinck.be> | 2008-11-16 19:06:21 +0100 |
---|---|---|
committer | Dieter Plaetinck <dieter@plaetinck.be> | 2008-11-16 19:06:21 +0100 |
commit | aef60a91f36974b2b054cd6f6296615a2553bf4c (patch) | |
tree | 5e38e127482fdf1de41924ec25668ad14407d85f /src/core | |
parent | d8b38a0768f6e71dec55d4d70d4dca74327a7420 (diff) |
updated HOWTO for install using packages, got rid of patch-install-cd script + renamed fifa into aif everywhere
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/libs/lib-blockdevices-filesystems.sh | 4 | ||||
-rw-r--r-- | src/core/libs/lib-misc.sh | 6 | ||||
-rw-r--r-- | src/core/libs/lib-software.sh | 4 | ||||
-rw-r--r-- | src/core/libs/lib-ui-interactive.sh | 14 | ||||
-rw-r--r-- | src/core/libs/lib-ui.sh | 2 | ||||
-rw-r--r-- | src/core/procedures/base | 2 | ||||
-rw-r--r-- | src/core/procedures/interactive | 2 |
7 files changed, 17 insertions, 17 deletions
diff --git a/src/core/libs/lib-blockdevices-filesystems.sh b/src/core/libs/lib-blockdevices-filesystems.sh index 7c3e17d..ef3bb36 100644 --- a/src/core/libs/lib-blockdevices-filesystems.sh +++ b/src/core/libs/lib-blockdevices-filesystems.sh @@ -1,7 +1,7 @@ #!/bin/sh -TMP_DEV_MAP=/home/arch/fifa/runtime/dev.map -TMP_FSTAB=/home/arch/fifa/runtime/.fstab +TMP_DEV_MAP=/home/arch/aif/runtime/dev.map +TMP_FSTAB=/home/arch/aif/runtime/.fstab # procedural code from quickinst functionized and fixed. # there were functions like this in the setup script too, with some subtle differences. see below diff --git a/src/core/libs/lib-misc.sh b/src/core/libs/lib-misc.sh index b85e151..f4ae997 100644 --- a/src/core/libs/lib-misc.sh +++ b/src/core/libs/lib-misc.sh @@ -14,7 +14,7 @@ run_background () debug "run_background called. identifier: $1, command: $2, logfile: $3" ( \ - touch /home/arch/fifa/runtime/$1-running + touch /home/arch/aif/runtime/$1-running debug "run_background starting $1: $2 >>$3 2>&1" [ -f $3 ] && echo -e "\n\n\n" >>$3 echo "STARTING $1 . Executing $2 >>$3 2>&1\n" >> $3; @@ -23,7 +23,7 @@ run_background () read $var_exit <<< $? #TODO: bash complains about 'not a valid identifier' or something iirc -> maybe fixed now.. debug "run_background done with $1: exitcode (\$$1_exitcode): "${!var_exit}" .Logfile $3" #TODO ${!var_exit} doesn't show anything --> maybe fixed now echo >> $3 - rm -f /home/arch/fifa/runtime/$1-running + rm -f /home/arch/aif/runtime/$1-running ) & sleep 2 @@ -36,7 +36,7 @@ wait_for () { [ -z "$1" ] && die_error "wait_for needs an identifier to known on which command to wait!" - while [ -f /home/arch/fifa/runtime/$1-running ] + while [ -f /home/arch/aif/runtime/$1-running ] do #TODO: follow_progress dialog mode = nonblocking (so check and sleep is good), cli mode (tail -f )= blocking? (so check is probably not needed as it will be done) sleep 1 diff --git a/src/core/libs/lib-software.sh b/src/core/libs/lib-software.sh index b9f0fb7..1785e85 100644 --- a/src/core/libs/lib-software.sh +++ b/src/core/libs/lib-software.sh @@ -1,7 +1,7 @@ #!/bin/sh -TMP_MKINITCPIO_LOG=/home/arch/fifa/runtime/mkinitcpio.log -TMP_PACMAN_LOG=/home/arch/fifa/runtime/pacman.log +TMP_MKINITCPIO_LOG=/home/arch/aif/runtime/mkinitcpio.log +TMP_PACMAN_LOG=/home/arch/aif/runtime/pacman.log # run_mkinitcpio() taken from setup. adapted a lot # runs mkinitcpio on the target system, displays output diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh index b42b5b5..e0c536c 100644 --- a/src/core/libs/lib-ui-interactive.sh +++ b/src/core/libs/lib-ui-interactive.sh @@ -227,7 +227,7 @@ interactive_autoprepare() interactive_mountpoints() { while [ "$PARTFINISH" != "DONE" ]; do : >$TMP_FSTAB - : >/home/arch/fifa/runtime/.parts #TODO: use a variable instead of a file, we don't need to use a file for this + : >/home/arch/aif/runtime/.parts #TODO: use a variable instead of a file, we don't need to use a file for this # Determine which filesystems are available FSOPTS="ext2 ext2 ext3 ext3" @@ -245,7 +245,7 @@ interactive_mountpoints() { if [ "$PART" != "NONE" ]; then DOMKFS="no" ask_yesno "Would you like to create a filesystem on $PART?\n\n(This will overwrite existing data!)" && DOMKFS="yes" - echo "$PART:swap:swap:$DOMKFS" >>/home/arch/fifa/runtime/.parts + echo "$PART:swap:swap:$DOMKFS" >>/home/arch/aif/runtime/.parts fi _dia_DIALOG --menu "Select the partition to mount as /" 21 50 13 $PARTS 2>$ANSWER || return 1 @@ -257,7 +257,7 @@ interactive_mountpoints() { FSTYPE=$(cat $ANSWER) DOMKFS="no" ask_yesno "Would you like to create a filesystem on $PART?\n\n(This will overwrite existing data!)" && DOMKFS="yes" - echo "$PART:$FSTYPE:/:$DOMKFS" >>/home/arch/fifa/runtime/.parts + echo "$PART:$FSTYPE:/:$DOMKFS" >>/home/arch/aif/runtime/.parts # # Additional partitions @@ -273,23 +273,23 @@ interactive_mountpoints() { while [ "${MP}" = "" ]; do _dia_DIALOG --inputbox "Enter the mountpoint for $PART" 8 65 "/boot" 2>$ANSWER || return 1 MP=$(cat $ANSWER) - if grep ":$MP:" /home/arch/fifa/runtime/.parts; then + if grep ":$MP:" /home/arch/aif/runtime/.parts; then notify "ERROR: You have defined 2 identical mountpoints! Please select another mountpoint." MP="" fi done DOMKFS="no" ask_yesno "Would you like to create a filesystem on $PART?\n\n(This will overwrite existing data!)" && DOMKFS="yes" - echo "$PART:$FSTYPE:$MP:$DOMKFS" >>/home/arch/fifa/runtime/.parts + echo "$PART:$FSTYPE:$MP:$DOMKFS" >>/home/arch/aif/runtime/.parts _dia_DIALOG --menu "Select any additional partitions to mount under your new root" 21 50 13 $PARTS DONE _ 2>$ANSWER || return 1 PART=$(cat $ANSWER) done - ask_yesno "Would you like to create and mount the filesytems like this?\n\nSyntax\n------\nDEVICE:TYPE:MOUNTPOINT:FORMAT\n\n$(for i in $(cat /home/arch/fifa/runtime/.parts); do echo "$i\n";done)" && PARTFINISH="DONE" + ask_yesno "Would you like to create and mount the filesytems like this?\n\nSyntax\n------\nDEVICE:TYPE:MOUNTPOINT:FORMAT\n\n$(for i in $(cat /home/arch/aif/runtime/.parts); do echo "$i\n";done)" && PARTFINISH="DONE" done target_umountall - fix_filesystems /home/arch/fifa/runtime/.parts && notify "Partitions were successfully mounted." && return 0 + fix_filesystems /home/arch/aif/runtime/.parts && notify "Partitions were successfully mounted." && return 0 show_warning "Failure while doing filesystems" "Something went wrong. Check your logs" return 1 diff --git a/src/core/libs/lib-ui.sh b/src/core/libs/lib-ui.sh index 40b5046..d8f3f8f 100644 --- a/src/core/libs/lib-ui.sh +++ b/src/core/libs/lib-ui.sh @@ -3,7 +3,7 @@ # Taken from setup. we store dialog output in a file. TODO: can't we do this with variables? -ANSWER="/home/arch/fifa/runtime/.dialog-answer" +ANSWER="/home/arch/aif/runtime/.dialog-answer" DIA_MENU_TEXT="Use the UP and DOWN arrows to navigate menus. Use TAB to switch between buttons and ENTER to select." diff --git a/src/core/procedures/base b/src/core/procedures/base index eab8c0e..7af1452 100644 --- a/src/core/procedures/base +++ b/src/core/procedures/base @@ -3,7 +3,7 @@ var_DEFAULTFS="/boot:32:ext2:+ swap:256:swap /:7500:ext3 /home:*:ext3" var_TARGET_DIR="/mnt" # When overriding this, do _not_ add a trailing /. It's not needed and maybe you could even break something var_RUNTIME_PACKAGES= -var_PKG_FILE=/home/arch/fifa/runtime/package-list +var_PKG_FILE=/home/arch/aif/runtime/package-list var_UI_TYPE="cli" # set to cli or dia for dialog ###### Phases ( can be overridden by more specific procedures) ###### diff --git a/src/core/procedures/interactive b/src/core/procedures/interactive index f83283e..a430662 100644 --- a/src/core/procedures/interactive +++ b/src/core/procedures/interactive @@ -2,7 +2,7 @@ depend_procedure core base # esp for auto_{network,locale,fstab} workers -# This is a port of the original /arch/setup script. It doesn't use fifa phases but uses it's own menu-based flow (phase) control +# This is a port of the original /arch/setup script. It doesn't use aif phases but uses it's own menu-based flow (phase) control var_TARGET_DIR="/mnt" |