diff options
| author | Dieter Plaetinck <dieter@plaetinck.be> | 2008-11-02 23:04:21 +0100 |
|---|---|---|
| committer | Dieter Plaetinck <dieter@plaetinck.be> | 2008-11-02 23:04:21 +0100 |
| commit | 51c3e18910565ece5fdfeeec5d3673fb19035938 (patch) | |
| tree | ad804e122ecfcceea461bcf63f4ca0dff2548896 | |
| parent | 3b7d5576116b84b0062d995f00190d95481b0cfb (diff) | |
sort of fixed/decoupled auto_{fstab,network,locale}, run_mkinitcpio
| -rw-r--r-- | src/core/libs/lib-blockdevices-filesystems.sh | 17 | ||||
| -rw-r--r-- | src/core/libs/lib-software.sh | 4 | ||||
| -rw-r--r-- | src/core/procedures/base | 11 |
3 files changed, 20 insertions, 12 deletions
diff --git a/src/core/libs/lib-blockdevices-filesystems.sh b/src/core/libs/lib-blockdevices-filesystems.sh index a3bc099..8641dc4 100644 --- a/src/core/libs/lib-blockdevices-filesystems.sh +++ b/src/core/libs/lib-blockdevices-filesystems.sh @@ -272,14 +272,13 @@ _mkfs() { # comments out old fields and inserts new ones # according to partitioning/formatting stage # -auto_fstab() +target_configure_fstab() { - if [ "$S_MKFS" = "1" -o "$S_MKFSAUTO" = "1" ]; then - if [ -f /tmp/.fstab ]; then - # comment out stray /dev entries - sed -i 's/^\/dev/#\/dev/g' $var_TARGET_DIR/etc/fstab - # append entries from new configuration - sort /tmp/.fstab >>$var_TARGET_DIR/etc/fstab - fi - fi + if [ -f /home/arch/fifa/runtime/.fstab ] + then + # comment out stray /dev entries + sed -i 's/^\/dev/#\/dev/g' $var_TARGET_DIR/etc/fstab + # append entries from new configuration + sort /home/arch/fifa/runtime/.fstab >>$var_TARGET_DIR/etc/fstab + fi } diff --git a/src/core/libs/lib-software.sh b/src/core/libs/lib-software.sh index 95bc07a..52de1e8 100644 --- a/src/core/libs/lib-software.sh +++ b/src/core/libs/lib-software.sh @@ -47,11 +47,11 @@ installpkg() { # auto_locale(). taken from setup # enable glibc locales from rc.conf and build initial locale DB -auto_locale() +target_configure_inital_locale() { for i in $(grep "^LOCALE" ${var_TARGET_DIR}/etc/rc.conf | sed -e 's/.*="//g' -e's/\..*//g'); do sed -i -e "s/^#$i/$i/g" ${var_TARGET_DIR}/etc/locale.gen done - DIALOG --infobox "Generating glibc base locales..." 4 40 + notify "Generating glibc base locales..." 4 40 chroot ${var_TARGET_DIR} locale-gen >/dev/null } diff --git a/src/core/procedures/base b/src/core/procedures/base index 215af0a..e5a42c2 100644 --- a/src/core/procedures/base +++ b/src/core/procedures/base @@ -105,17 +105,22 @@ worker_install_packages () worker_auto_fstab () { + if [ "$S_MKFS" = "1" -o "$S_MKFSAUTO" = "1" ]; then + target_configure_fstab + fi } worker_auto_network () { + [ "$S_DHCP" = 1 ] && target_configure_network dhcp "$PROXY_HTTP" "$PROXY_FTP" + [ "$S_DHCP" != 1 ] && target_configure_network fixed "$PROXY_HTTP" "$PROXY_FTP" } worker_auto_locale () { - + target_configure_inital_locale } @@ -128,11 +133,15 @@ worker_configure_system () worker_mkinitcpio () { + #TODO:check that this is the right command when projects.archlinux.org is back up + run_mkinitcpio } worker_locales () { + #TODO:what to do here? didn't we already do them? + true } |