sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master cauldron by Karsten Behrmann (e4a1b5119c1c4f6b6b2a411b187afaef70b64509)
- From: Karsten Behrmann <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master cauldron by Karsten Behrmann (e4a1b5119c1c4f6b6b2a411b187afaef70b64509)
- Date: Sat, 23 Feb 2008 05:01:13 -0600
GIT changes to master cauldron by Karsten Behrmann
<BearPerson AT sourcemage.org>:
iso/usr/bin/539 | 137
+++++++++++++++++++++++
iso/usr/sbin/smgl-chroot | 17 ++
iso/usr/share/doc/smgl.install/help/editors | 3
iso/usr/share/doc/smgl.install/help/index | 7 +
iso/usr/share/doc/smgl.install/steps/disk-format | 16 +-
iso/usr/share/doc/smgl.install/steps/disk-mount | 18 +--
iso/usr/share/doc/smgl.install/steps/edit-confs | 13 +-
iso/usr/share/doc/smgl.install/steps/grub | 30 ++---
iso/usr/share/doc/smgl.install/steps/lilo | 20 +--
iso/usr/share/doc/smgl.install/steps/reboot | 7 -
iso/usr/share/doc/smgl.install/steps/user-setup | 30 ++---
iso/usr/share/doc/smgl.install/welcome | 3
iso/usr/share/smgl.install/bashrc | 26 ++--
iso/usr/share/smgl.install/commands | 7 -
iso/usr/share/smgl.install/keymap | 135
----------------------
iso/usr/share/smgl.install/order | 3
iso/usr/share/smgl.install/smgl-chroot | 55 ---------
17 files changed, 249 insertions(+), 278 deletions(-)
New commits:
commit e4a1b5119c1c4f6b6b2a411b187afaef70b64509
Author: Karsten Behrmann <karsten AT BearBook.local>
Commit: Karsten Behrmann <BearPerson AT sourcemage.org>
Some more work on installer, reorganize some
commit 305113dbcca8a314da91d58eea2f12b7572ac3f5
Author: Karsten Behrmann <karsten AT BearBook.local>
Commit: Karsten Behrmann <BearPerson AT sourcemage.org>
work more on documentation
diff --git a/iso/usr/bin/539 b/iso/usr/bin/539
new file mode 100755
index 0000000..8bec86f
--- /dev/null
+++ b/iso/usr/bin/539
@@ -0,0 +1,137 @@
+#!/bin/bash
+
+PREFIX=/usr/share/keymaps
+CHOICES=
+MAX=
+INPUT=
+RESULT=1
+
+function prompt() {
+ echo ""
+ printf "\tPlease enter a number (0 to go back): "
+ read INPUT
+ if [[ -n $INPUT ]]
+ then
+ if [[ $INPUT -lt 0 || $INPUT -gt $MAX ]]
+ then
+ echo "Error: You must enter a number corresponding to one"
+ echo "of the choices in the list above!"
+ return 1
+ fi
+ else
+ return 0
+ fi
+}
+
+function make_list {
+ local list
+
+ #LIST=$(find $PREFIX/$LISTDIR/* -maxdepth 0 -type d -not -name include)
+ list=( $(find $PREFIX/* -maxdepth 0 -type d -not -name include) )
+ MAX=${#list[*]}
+ if [[ $MAX = 0 ]]
+ then
+ #LIST=$(find $PREFIX/$LISTDIR/* -type f -name *.map.gz)
+ list=( $(find $PREFIX/* -type f -name *.map.gz) )
+ MAX=${#list[*]}
+ fi
+ for ((i=0; i < $MAX; i++))
+ do
+ CHOICES[$i]=${list[i]##*/}
+ done
+}
+
+function print_dirs {
+ echo ""
+ for ((i=0; i < $MAX; i++))
+ do
+ printf "\t\t\t[%2d] %s\n" "$(($i + 1))" "${CHOICES[i]}"
+ done | more
+}
+
+function print_files {
+ echo ""
+ for ((i=0; i < $MAX; i++))
+ do
+ #printf "[%2d] %s" "$i" "${CHOICES[i]%.map.gz}"
+ #printf "%2d %s" "$i" "${CHOICES[i]%.map.gz}"
+ printf "[%2d] %s\n" "$(($i + 1))" "${CHOICES[i]}"
+ done | column | more
+}
+
+function print_list {
+ if [[ $MAX -gt 20 ]]
+ then
+ print_files
+ else
+ print_dirs
+ fi
+}
+
+function go_list {
+ local rc=1
+
+ make_list
+ print_list
+ while [[ $rc = 1 ]]
+ do
+ prompt
+ rc="$?"
+ done
+ if [[ $INPUT = 0 ]]
+ then
+ if [[ $PREFIX != "/usr/share/keymaps" ]]
+ then
+ PREFIX=${PREFIX%/[^/]*}
+ fi
+ else
+ (( INPUT -= 1 ))
+ INPUT=${CHOICES[INPUT]}
+ if [[ $INPUT == *.map.gz ]]
+ then
+ PREFIX="$PREFIX/$INPUT"
+ if [[ $(loadkeys $PREFIX) ]]
+ then
+ # TODO: figure out what the user needs to enter in sysconfig/keymap
+ echo "${prefix%.*map.*}" >/tmp/selected-keymap
+ RESULT=0
+ else
+ RESULT=2
+ fi
+ else
+ PREFIX="$PREFIX/$INPUT"
+ fi
+ fi
+}
+
+echo ""
+cat <<EOF
+Keymap selection menu.
+First, choose your keyboard's hardware type from the list below. Some
hardware
+types will also have a subtype, which will be presented in another menu.
+After you are done choosing your hardware type (and subtype), choose your
+preferred keymapping from the menu you are presented with. You may enter 0
+to go back to a previous menu.
+EOF
+
+while [[ $RESULT = "1" ]]
+do
+ go_list
+ #clear
+done
+
+if [[ $RESULT = "0" ]]
+then
+ exit 0
+else
+ exit 1
+fi
+
+#ls | sed 's/.map.gz$//' | nl -w 2 -s ' ' -nln | column | more
+
+#entries=( dummy $(echo * | sed -n 's/.k\?map\(.gz\)\?$//p') ); for((i=1;
+#i<${#entries[*]}; i++)) ;do printf "%2d %s" "$i" "${entries[i]}"; done |
+#column | more
+
+
+# vim:tabstop=2:softtabstop=2:shiftwidth=2:expandtab:ai
diff --git a/iso/usr/sbin/smgl-chroot b/iso/usr/sbin/smgl-chroot
new file mode 100755
index 0000000..717fcd9
--- /dev/null
+++ b/iso/usr/sbin/smgl-chroot
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# Note: don't use --rbind: It creates several mounts, and we wouldn't be able
+# to figure out easily what to umount.
+mount --bind /dev /mnt/root/dev &&
+mount --bind /dev/pts /mnt/root/dev/pts &&
+mount --bind /proc /mnt/root/proc &&
+export PS1="[inside chroot, type [1mexit[m to return to installer]\n\u
\w\$ " &&
+chroot /mnt/root "$@"
+rc=$?
+umount /mnt/root/proc
+umount /mnt/root/dev/pts
+umount /mnt/root/dev
+
+exit $rc
+
+# vim:sw=2:ts=2:softtabstop=2:expandtab:ai
diff --git a/iso/usr/share/doc/smgl.install/help/editors
b/iso/usr/share/doc/smgl.install/help/editors
new file mode 100644
index 0000000..c1415fc
--- /dev/null
+++ b/iso/usr/share/doc/smgl.install/help/editors
@@ -0,0 +1,3 @@
+Editors available on this iso:
+ [1mnano[m - a quite easy-to-use, small editor
+ [1melvis[m - a small vi clone
diff --git a/iso/usr/share/doc/smgl.install/help/index
b/iso/usr/share/doc/smgl.install/help/index
new file mode 100644
index 0000000..eda899f
--- /dev/null
+++ b/iso/usr/share/doc/smgl.install/help/index
@@ -0,0 +1,7 @@
+back return to the previous step
+help print a list of commands (this list)
+jump <step> jump directly to <step>
+next go to the next step
+steps print a listing of all possible steps
+todo show what needs to be done for the current step
+welcome show some help information (seen at the welcome
screen)
diff --git a/iso/usr/share/doc/smgl.install/steps/disk-format
b/iso/usr/share/doc/smgl.install/steps/disk-format
index bc378ba..7c8c4fd 100644
--- a/iso/usr/share/doc/smgl.install/steps/disk-format
+++ b/iso/usr/share/doc/smgl.install/steps/disk-format
@@ -4,20 +4,18 @@ of example commands for the different types of filesystems
supported on this
ISO. The partitions given are examples. Be sure to format all the partitions
you need.
-mke2fs /dev/hda1
-mkfs.ext3 /dev/hda1
-mkreiserfs /dev/hda1
-mkfs.jfs /dev/hda1
-mkfs.xfs /dev/hda1
+[1mmke2fs /dev/hda1[m
+[1mmkfs.ext3 /dev/hda1[m
+[1mmkreiserfs /dev/hda1[m
+[1mmkfs.jfs /dev/hda1[m
+[1mmkfs.xfs /dev/hda1[m
# swap:
-mkswap /dev/hda2
+[1mmkswap /dev/hda2[m
The reiser4 tools are provided on the ISO. However, the ISO kernel does not
yet support reiser4, so although you can create reiser4 filesystems and
check ones already created, you cannot yet mount them. Only make a reiser4
-filesystem if you really know what you are doing.
-
-mkfs.reiser4
+filesystem if you really know what you are doing. ([1mmkfs.reiser4[m)
Type [1mnext[m to go to the next step.
diff --git a/iso/usr/share/doc/smgl.install/steps/disk-mount
b/iso/usr/share/doc/smgl.install/steps/disk-mount
index a92b10d..c529f5a 100644
--- a/iso/usr/share/doc/smgl.install/steps/disk-mount
+++ b/iso/usr/share/doc/smgl.install/steps/disk-mount
@@ -3,21 +3,21 @@ Now, you need to mount the filesystems. We'll be installing
to /mnt/root,
so mount the filesystem that will be / onto /mnt/root.
Examples:
-mount -t ext2 /dev/hda1 /mnt/root
-mount -t ext3 /dev/hda1 /mnt/root
-mount -t reiserfs /dev/hda1 /mnt/root
-mount -t jfs /dev/hda1 /mnt/root
-mount -t xfs /dev/hda1 /mnt/root
+[1mmount -t ext2 /dev/hda1 /mnt/root[m
+[1mmount -t reiserfs /dev/hda1 /mnt/root[m
+[1mmount -t xfs /dev/hda1 /mnt/root[m
Then mount any other partitions you made at the proper subdirectories.
You'll probably need to make directories for the other mount points first
(assuming you just formatted the / partition). Make sure you mount / first.
For example, if you created /dev/hda2 for /usr:
-mkdir /mnt/root/usr
-mount -t ext2 /dev/hda2 /mnt/root/usr
+[1mmkdir /mnt/root/usr[m
+[1mmount -t ext2 /dev/hda2 /mnt/root/usr[m
+(or, for example, if it's a jfs partition)
+[1mmount -t jfs /dev/hda1 /mnt/root[m
Don't forget to mount [1mall[m the (system) partitions you plan to use.
-Don't forget to turn on swap via
-swapon /dev/hda2
+Also, you may want to turn on swap via e.g.
+[1mswapon /dev/hda2[m
diff --git a/iso/usr/share/doc/smgl.install/steps/edit-confs
b/iso/usr/share/doc/smgl.install/steps/edit-confs
index 21bb64e..5452d82 100644
--- a/iso/usr/share/doc/smgl.install/steps/edit-confs
+++ b/iso/usr/share/doc/smgl.install/steps/edit-confs
@@ -1,8 +1,13 @@
-Hmm. This is a bit fun to document. Big TODO.
+[1mediting basic configuration files[m
-You need to edit /mnt/root/etc/fstab so the system knows your partitions on
-bootup. We'll need better-documented conf file templates for this.
+Now, we need to set up our partitions so the system will find them again on
+bootup. For this, edit [1m/mnt/root/etc/fstab[m and add your partitions.
-And more doc monkeys.
+(For editors available on this iso, do [1mhelp editors[m)
+
+Also, take a look at the files in [1m/mnt/root/etc/sysconfig/[m and edit
any you
+feel should be different. Especially, if you selected a custom keymap at the
+start of this install, you'll need to edit the file called [1mkeymap[m
+in that directory (do [1m cat /tmp/selected-keymap[m to see which you
chose)
Type [1mnext[m to go to the boot-loader selection step.
diff --git a/iso/usr/share/doc/smgl.install/steps/grub
b/iso/usr/share/doc/smgl.install/steps/grub
index c620c21..e74f269 100644
--- a/iso/usr/share/doc/smgl.install/steps/grub
+++ b/iso/usr/share/doc/smgl.install/steps/grub
@@ -1,22 +1,22 @@
[1mgrub instructions[m:
-First, chroot into the target platform. We provide a wrapper command that
-will help set up the chroot for you. It outputs messages about what it is
-doing by default. If you don't want to see these messages, pass the -q
-option (for quiet)
+To run grub properly, it needs to be chroot'ed into the new system. This
needs
+some directories (/dev, /proc), so we provide a wrapper to set those up for
+you and clean them up again when you're done.
-Example:
-/usr/bin/smgl-chroot
-/usr/bin/smgl-chroot -q
+Run the script to get a shell inside the installed system:
+[1msmgl-chroot[m
-Then run grub so you can update the boot record:
-/sbin/grub
-> root (hd0,0)
-> setup (hd0)
-> quit
+Then run grub so you can update the boot record (TODO: use grub-install
here?):
+[1m/sbin/grub[m
+
+You'll get a grub shell, where you need to enter the following commands,
+without the > in front (adjust for your disk layout):
+> [1mroot (hd0,0)[m
+> [1msetup (hd0)[m
+> [1mquit[m
Exit the chroot:
-exit
+[1mexit[m
Unless you got an error message when you were installing the boot loader,
-you should be done with this step. Type [1mnext[m to go to the next
-step.
+you should be done with this step. Type [1mnext[m to go to the next step.
diff --git a/iso/usr/share/doc/smgl.install/steps/lilo
b/iso/usr/share/doc/smgl.install/steps/lilo
index 0a591c1..370eb10 100644
--- a/iso/usr/share/doc/smgl.install/steps/lilo
+++ b/iso/usr/share/doc/smgl.install/steps/lilo
@@ -1,20 +1,20 @@
[1mlilo instructions[m:
-Edit /mnt/root/etc/lilo.conf
+Edit [1m/mnt/root/etc/lilo.conf[m to your setup (especially, you'll want
to change
+the boot= and root= entries to point to your partitions, and you'll need to
+set the kernel version correctly)
-Chroot into the target platform. We provide a wrapper command that
-will help set up the chroot for you. It outputs messages about what it is
-doing by default. If you don't want to see these messages, pass the -q
-option (for quiet)
+To run lilo properly, it needs to be chroot'ed into the new system. This
needs
+some directories (/dev, /proc), so we provide a wrapper to set those up for
+you and clean them up again when you're done.
-Example:
-/usr/bin/smgl-chroot
-/usr/bin/smgl-chroot -q
+Run the script to get a shell inside the installed system:
+[1msmgl-chroot[m
Then run lilo so it updates the boot record:
-/sbin/lilo
+[1m/sbin/lilo[m
Exit the chroot:
-exit
+[1mexit[m
Unless you got an error message when you were installing the boot loader,
you should be done with this step. Type [1mnext[m to go to the next
diff --git a/iso/usr/share/doc/smgl.install/steps/reboot
b/iso/usr/share/doc/smgl.install/steps/reboot
index c710915..8d6ff88 100644
--- a/iso/usr/share/doc/smgl.install/steps/reboot
+++ b/iso/usr/share/doc/smgl.install/steps/reboot
@@ -13,5 +13,8 @@ umount /mnt/root/var/spool
umount /mnt/root/var
umount /mnt/root
-You should be able to reboot now.
-Don't forget to take out the CD before the machine boots back up!
+Now, reboot via something like
+[1mshutdown -r now "install finished"[m
+
+We don't (yet) eject the CD during shutdown, so be sure to take it out during
+reboot or configure your BIOS not to try and boot from it.
diff --git a/iso/usr/share/doc/smgl.install/steps/user-setup
b/iso/usr/share/doc/smgl.install/steps/user-setup
index 6a6f027..cb7040f 100644
--- a/iso/usr/share/doc/smgl.install/steps/user-setup
+++ b/iso/usr/share/doc/smgl.install/steps/user-setup
@@ -1,24 +1,22 @@
[1muser-setup step[m
-First, chroot into the target platform. We provide a wrapper command that
-will help set up the chroot for you. It outputs messages about what it is
-doing by default. If you don't want to see these messages, pass the -q
-option (for quiet)
+Finally, we need to give the root user a password and probably create an user
+for you to do your daily work with.
-Example:
-/usr/bin/smgl-chroot
-/usr/bin/smgl-chroot -q
+To set up users, you'll want to chroot into the target system again, as you
+already did to install the bootloader:
+[1msmgl-chroot[m
-Set up a password for the root user:
-passwd root
+Set up a password for the root user (pick a secure one, but not one you'll
+forget. Also, bear in mind that it can be bypassed with a screwdriver.):
+[1mpasswd root[m
If you would like to add additional users at this time, you may feel free
to do so by typing the following:
-useradd -g 1000 -b /home -m USERNAME
-passwd USERNAME
+[1museradd -b /home -m mbolton[m
+[1mpasswd mbolton[m
-Replace USERNAME with the username you want to add. After you are done,
-make sure you exit the chroot:
-exit
+Of course, you may not want to be called mbolton, so replace that with
whatever
+login you want.
-Make sure it is a reasonably secure password, but not one you will forget.
-Type [1mnext[m to go to the next step.
+Finally, exit the chroot to return to the installer:
+[1mexit[m
diff --git a/iso/usr/share/doc/smgl.install/welcome
b/iso/usr/share/doc/smgl.install/welcome
index 26ec647..7496808 100644
--- a/iso/usr/share/doc/smgl.install/welcome
+++ b/iso/usr/share/doc/smgl.install/welcome
@@ -7,13 +7,14 @@ You can enter [1mback[m at any time to jump to the
previous step.
If you ever get lost, type [1msteps[m to get a list of installer steps,
and e.g. [1mjump copy-base[m to jump to a specific step.
-
Don't worry, there's no magic attached to the steps, you can jump between
them as you please without breaking anything.
If at any time you need help, type [1mhelp[m.
To see this message again, type [1mwelcome[m.
+If you need to set a different keymap, type [1m539[m.
+
If you have any feedback you'd like us to hear, please drop by
#sourcemage-cauldron on irc.freenode.net, file a bug on bugs.sourcemage.org,
or just send an email to the mailing lists or to iso AT sourcemage.org.
diff --git a/iso/usr/share/smgl.install/bashrc
b/iso/usr/share/smgl.install/bashrc
index 9d3f3d2..af23447 100755
--- a/iso/usr/share/smgl.install/bashrc
+++ b/iso/usr/share/smgl.install/bashrc
@@ -52,8 +52,6 @@ function next() {
CURSTEP=$(cat $INSTALLER_STATUS)
# find next status
CURSTEP=$(grep "^$CURSTEP:" $INSTALLER_DATA/order | head -n 1 | cut -d:
-f2)
- # check if next status is a branch
- [[ ${CURSTEP} == *'|'* ]] && CURSTEP="error"
# if we couldn't find a next status, jump to 'error'
CURSTEP=${CURSTEP:-error}
# save new status
@@ -65,9 +63,7 @@ function next() {
function back() {
local CURSTEP
CURSTEP=$(cat $INSTALLER_STATUS)
- if [[ $CURSTEP != "init" ]] ;then
- CURSTEP=$(grep ":$CURSTEP$" $INSTALLER_DATA/order | head -n 1 | cut -d:
-f1)
- fi
+ CURSTEP=$(grep ":$CURSTEP$" $INSTALLER_DATA/order | tail -n 1 | cut -d:
-f1)
CURSTEP=${CURSTEP:-error}
echo "$CURSTEP" >$INSTALLER_STATUS
todo
@@ -99,16 +95,12 @@ function jump() {
good=1
echo "$*" >$INSTALLER_STATUS
todo
- break
+ return
fi
done
-
- if [[ $good = 0 ]]
- then
- echo ""
- echo "Error: '$*' is not a recognized step."
- echo "Type [1msteps[m to see a list of steps."
- fi
+ echo ""
+ echo "Error: '$*' is not a recognized step."
+ echo "Type [1msteps[m to see a list of steps."
}
function welcome() {
@@ -116,7 +108,13 @@ function welcome() {
}
function help() {
- header $INSTALLER_DATA/commands
+ helpfile=$INSTALLER_DOCS/help/${1:-index}
+ if [[ -e $helpfile ]] ;then
+ header $helpfile
+ else
+ echo "No installer help for '$1', falling back to bash's builtin help"
+ builtin help $1
+ fi
}
PS1="[current:\$(cur_step) next:\$(next_step) \$(num_current)/\$(num_steps)]
For a list of commands, type [1mhelp[m\n\u \w\$ "
diff --git a/iso/usr/share/smgl.install/commands
b/iso/usr/share/smgl.install/commands
deleted file mode 100644
index eda899f..0000000
--- a/iso/usr/share/smgl.install/commands
+++ /dev/null
@@ -1,7 +0,0 @@
-back return to the previous step
-help print a list of commands (this list)
-jump <step> jump directly to <step>
-next go to the next step
-steps print a listing of all possible steps
-todo show what needs to be done for the current step
-welcome show some help information (seen at the welcome
screen)
diff --git a/iso/usr/share/smgl.install/keymap
b/iso/usr/share/smgl.install/keymap
deleted file mode 100755
index fd5f7e6..0000000
--- a/iso/usr/share/smgl.install/keymap
+++ /dev/null
@@ -1,135 +0,0 @@
-#!/bin/bash
-
-PREFIX=/usr/share/keymaps
-CHOICES=
-MAX=
-INPUT=
-RESULT=1
-
-function prompt() {
- echo ""
- printf "\tPlease enter a number (0 to go back): "
- read INPUT
- if [[ -n $INPUT ]]
- then
- if [[ $INPUT -lt 0 || $INPUT -gt $MAX ]]
- then
- echo "Error: You must enter a number corresponding to one"
- echo "of the choices in the list above!"
- return 1
- fi
- else
- return 0
- fi
-}
-
-function make_list {
- local list
-
- #LIST=$(find $PREFIX/$LISTDIR/* -maxdepth 0 -type d -not -name include)
- list=( $(find $PREFIX/* -maxdepth 0 -type d -not -name include) )
- MAX=${#list[*]}
- if [[ $MAX = 0 ]]
- then
- #LIST=$(find $PREFIX/$LISTDIR/* -type f -name *.map.gz)
- list=( $(find $PREFIX/* -type f -name *.map.gz) )
- MAX=${#list[*]}
- fi
- for ((i=0; i < $MAX; i++))
- do
- CHOICES[$i]=${list[i]##*/}
- done
-}
-
-function print_dirs {
- echo ""
- for ((i=0; i < $MAX; i++))
- do
- printf "\t\t\t[%2d] %s\n" "$(($i + 1))" "${CHOICES[i]}"
- done | more
-}
-
-function print_files {
- echo ""
- for ((i=0; i < $MAX; i++))
- do
- #printf "[%2d] %s" "$i" "${CHOICES[i]%.map.gz}"
- #printf "%2d %s" "$i" "${CHOICES[i]%.map.gz}"
- printf "[%2d] %s\n" "$(($i + 1))" "${CHOICES[i]}"
- done | column | more
-}
-
-function print_list {
- if [[ $MAX -gt 20 ]]
- then
- print_files
- else
- print_dirs
- fi
-}
-
-function go_list {
- local rc=1
-
- make_list
- print_list
- while [[ $rc = 1 ]]
- do
- prompt
- rc="$?"
- done
- if [[ $INPUT = 0 ]]
- then
- if [[ $PREFIX != "/usr/share/keymaps" ]]
- then
- PREFIX=${PREFIX%/[^/]*}
- fi
- else
- (( INPUT -= 1 ))
- INPUT=${CHOICES[INPUT]}
- if [[ $INPUT == *.map.gz ]]
- then
- PREFIX="$PREFIX/$INPUT"
- if [[ $(loadkeys $PREFIX) ]]
- then
- RESULT=0
- else
- RESULT=2
- fi
- else
- PREFIX="$PREFIX/$INPUT"
- fi
- fi
-}
-
-echo ""
-cat <<EOF
-Before beginning the installation, you should select your keymap. First,
-choose your keyboard's hardware type from the list below. Some hardware
-types will also have a subtype, which will be presented in another menu.
-After you are done choosing your hardware type (and subtype), choose your
-preferred keymapping from the menu you are presented with. You may enter 0
-to go back to a previous menu.
-EOF
-
-while [[ $RESULT = "1" ]]
-do
- go_list
- #clear
-done
-
-if [[ $RESULT = "0" ]]
-then
- exit 0
-else
- exit 1
-fi
-
-#ls | sed 's/.map.gz$//' | nl -w 2 -s ' ' -nln | column | more
-
-#entries=( dummy $(echo * | sed -n 's/.k\?map\(.gz\)\?$//p') ); for((i=1;
-#i<${#entries[*]}; i++)) ;do printf "%2d %s" "$i" "${entries[i]}"; done |
-#column | more
-
-
-# vim:tabstop=2:softtabstop=2:shiftwidth=2:expandtab:ai
diff --git a/iso/usr/share/smgl.install/order
b/iso/usr/share/smgl.install/order
index aee487a..034fd30 100644
--- a/iso/usr/share/smgl.install/order
+++ b/iso/usr/share/smgl.install/order
@@ -7,9 +7,10 @@ edit-confs:boot-loader
boot-loader:grub
grub:install-opt-spells
lilo:install-opt-spells
+boot-loader:install-opt-spells
install-opt-spells:user-setup
user-setup:reboot
reboot:reboot
-init:init
error:init
+init:init
init:error
diff --git a/iso/usr/share/smgl.install/smgl-chroot
b/iso/usr/share/smgl.install/smgl-chroot
deleted file mode 100755
index f1e9dda..0000000
--- a/iso/usr/share/smgl.install/smgl-chroot
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-
-QUIET=
-
-if [[ $# -gt 0 ]]
-then
- while getopts "q" Option
- do
- case $Option in
- q ) QUIET=1
- esac
- done
- shift $(($OPTIND - 1))
-fi
-
-if [[ $QUIET = 1 ]]
-then
- mount --bind /dev /mnt/root/dev && \
- mount --bind /dev/pts /mnt/root/dev/pts && \
- mount --bind /proc /mnt/root/proc
-else
- echo "mount --bind /dev /mnt/root/dev" && \
- mount --bind /dev /mnt/root/dev && \
- echo "mount --bind /dev /mnt/root/dev" && \
- mount --bind /dev/pts /mnt/root/dev/pts && \
- echo "mount --bind /dev /mnt/root/dev" && \
- mount --bind /proc /mnt/root/proc
-fi || exit $?
-
-
-if [[ $QUIET = 1 ]]
-then
- chroot /mnt/root /bin/bash -l
-else
- echo "Entering chroot..."
- chroot /mnt/root /bin/bash -l
-fi || exit $?
-
-if [[ $QUIET = 1 ]]
-then
- umount /mnt/root/proc && \
- umount /mnt/root/dev/pts && \
- umount /mnt/root/dev
-else
- echo "Unmounting /mnt/root/proc" && \
- umount /mnt/root/proc && \
- echo "Unmounting /mnt/root/dev/pts" && \
- umount /mnt/root/dev/pts && \
- echo "Unmounting /mnt/root/dev" && \
- umount /mnt/root/dev
-fi
-
-exit $?
-
-# vim:sw=2:ts=2:softtabstop=2:expandtab:ai
- [SM-Commit] GIT changes to master cauldron by Karsten Behrmann (e4a1b5119c1c4f6b6b2a411b187afaef70b64509), Karsten Behrmann, 02/23/2008
Archive powered by MHonArc 2.6.24.