summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDieter Plaetinck <dieter@plaetinck.be>2008-11-10 18:37:52 +0100
committerDieter Plaetinck <dieter@plaetinck.be>2008-11-10 18:37:52 +0100
commit0a5edb1d93e3a03f8ed01ad2069dbba361806241 (patch)
tree3ac426a83ee160a07cdc2a1762043cfa3e5c629d
parent1e4fbe97da9a2e1e9b14c0a1f88f85af59387bf0 (diff)
// for files when configuring system fix
-rw-r--r--TODO3
-rw-r--r--src/core/libs/lib-ui-interactive.sh2
-rw-r--r--src/core/procedures/base2
3 files changed, 3 insertions, 4 deletions
diff --git a/TODO b/TODO
index 45a71d6..239d386 100644
--- a/TODO
+++ b/TODO
@@ -2,7 +2,7 @@ See also the FIXME's and TODO's in the code.
PRE-ALPHA PHASE: get it sort of reasonably working
-* core/interactive bug: -> configure system -> fstab (/mnt//etc/fstab) does only contain pts,shm and floppy/dvd/cdrom. not hd's? ->this breaks the boot procedure!
+* core/interactive bug: -> configure system -> fstab (/mnt/etc/fstab) does only contain pts,shm and floppy/dvd/cdrom. not hd's? ->this breaks the boot procedure!
@@ -23,7 +23,6 @@ Specifically:
- 1) windows entry looks okay
- 0-1-3 again! (3)windows looks okay again), 0-1 use uuid's which are correct
* core/interactive: keymap setting not kept? (note: next time check rc.conf values during configure system)
-* core/interactive: /mnt//etc/fstab -> // ?
* core/interactive: try out different installation methods
* core/base: implement as specified in README
* core/quickinst: figure out what needs to be done and do it.
diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh
index 0d42e42..e711b74 100644
--- a/src/core/libs/lib-ui-interactive.sh
+++ b/src/core/libs/lib-ui-interactive.sh
@@ -59,7 +59,7 @@ interactive_configure_system()
chroot ${var_TARGET_DIR} passwd root && break
done
else #regular file
- $EDITOR ${var_TARGET_DIR}/${FILE}
+ $EDITOR ${var_TARGET_DIR}${FILE}
fi
done
diff --git a/src/core/procedures/base b/src/core/procedures/base
index 9fdbd7a..09c8bd8 100644
--- a/src/core/procedures/base
+++ b/src/core/procedures/base
@@ -1,7 +1,7 @@
#!/bin/bash
var_DEFAULTFS="/boot:32:ext2:+ swap:256:swap /:7500:ext3 /home:*:ext3"
-var_TARGET_DIR="/mnt"
+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_UI_TYPE="cli" # set to cli or dia for dialog