summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDieter Plaetinck <dieter@plaetinck.be>2009-03-12 21:00:03 +0100
committerDieter Plaetinck <dieter@plaetinck.be>2009-03-12 21:00:03 +0100
commita6cc5cce7cf5d8a18f605c2764f57b512b5c8683 (patch)
treeeece919c182e7319cbc45b6ee2953d87090ba416
parent7de8cf4fe3d38f508c721fdd7c50963f40699892 (diff)
stupid typo/doc/todo fixes
-rw-r--r--TODO3
-rw-r--r--src/core/libs/lib-software.sh2
-rw-r--r--src/core/procedures/automatic2
-rw-r--r--src/core/procedures/base2
4 files changed, 5 insertions, 4 deletions
diff --git a/TODO b/TODO
index 6a67520..7094de7 100644
--- a/TODO
+++ b/TODO
@@ -1,7 +1,7 @@
See also the FIXME's and TODO's in the code.
-
CURRENT ISSUES:
+* use traps and initiate rollback when user wants to abort. see also http://www.davidpashley.com/articles/writing-robust-shell-scripts.html
* differentiate between framework and installer in src/aif.sh, some things should be in base
* check everywhere that if users cancels something, we return 1, empty string behavior etc
* dm_crypt unlock at boot is in qwerty.
@@ -11,6 +11,7 @@ CURRENT ISSUES:
* automatically configure grub for dm_crypt and lvm
* fs_params in partition editor: do we really need to show them? isn't this where we store our "own" stuff?
* move "/tmp/pacman.conf" to runtime directory and variablize everywhere
+* not all packages are shown when automatic procedure invoked pacman to install packages
* a nice way to be able to "inject" functions/logic without:
* needing to redefine phases with only 1 entry different (duplicate code is not nice, less maintainable etc)
* override worker functions which are 90% copy-pasted because the parent functionality is mostly okay, but not exactly what we want
diff --git a/src/core/libs/lib-software.sh b/src/core/libs/lib-software.sh
index 53b4a69..5969ab6 100644
--- a/src/core/libs/lib-software.sh
+++ b/src/core/libs/lib-software.sh
@@ -56,7 +56,7 @@ installpkg() {
# auto_locale(). taken from setup
# enable glibc locales from rc.conf and build initial locale DB
-target_configure_inital_locale()
+target_configure_initial_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
diff --git a/src/core/procedures/automatic b/src/core/procedures/automatic
index 5dbd03e..f088ff8 100644
--- a/src/core/procedures/automatic
+++ b/src/core/procedures/automatic
@@ -7,7 +7,7 @@
# It should be:
# phase_preparation=(configure intro sysprep select_source runtime_network runtime_repositories runtime_packages)
# phase_basics=(set_clock prepare_disks)
-# phase_system=(package_listTODO install_packages auto_fstab auto_networkTODO auto_locale configure_system mkinitcpio locales install_bootloader)
+# phase_system=(package_listTODO install_packages auto_fstab auto_networkTODO auto_locale auto_keymap_font configure_system mkinitcpio locales install_bootloader)
# phase_finish=(msg_report)
# In theory, the only manual thing should maybe be configuring the runtime network and putting the configfile in place
diff --git a/src/core/procedures/base b/src/core/procedures/base
index 379b154..602fccb 100644
--- a/src/core/procedures/base
+++ b/src/core/procedures/base
@@ -166,7 +166,7 @@ worker_auto_network ()
worker_auto_locale ()
{
- target_configure_inital_locale
+ target_configure_initial_locale
}