summaryrefslogtreecommitdiffstats
path: root/installer
diff options
context:
space:
mode:
authorFelix Endres2007-01-22 18:58:09 +0100
committerFelix Endres2007-01-22 18:58:09 +0100
commit6e90d2586fea6f9a269f4eaf1f0eeabff8fb8b39 (patch)
treea399b0e826107d8d121b4bcc6ccd194ad9ad127d /installer
parentWrong "sleep" was removed in rev. 638 ... (diff)
downloadcore-6e90d2586fea6f9a269f4eaf1f0eeabff8fb8b39.tar.gz
core-6e90d2586fea6f9a269f4eaf1f0eeabff8fb8b39.tar.xz
core-6e90d2586fea6f9a269f4eaf1f0eeabff8fb8b39.zip
Some minor improvements
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@642 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'installer')
-rwxr-xr-xinstaller/ld4-inst24
1 files changed, 21 insertions, 3 deletions
diff --git a/installer/ld4-inst b/installer/ld4-inst
index 269c356e..2835d528 100755
--- a/installer/ld4-inst
+++ b/installer/ld4-inst
@@ -124,9 +124,12 @@ distro_check() {
Breezy*|breezy*)
eval "$2=\"5.10\""
;;
- Dapper*|dapper*|*)
+ Dapper*|dapper*)
eval "$2=\"6.06\""
;;
+ Edgy*|edgy*|*)
+ eval "$2=\"6.10\""
+ ;;
esac
;;
Gentoo*|gentoo*)
@@ -222,14 +225,17 @@ configure() {
echo "Using ${server_distro} as server distribution"
# ask for client distro
+ if [ -z ${client_distro} ] ; then
+ client_distro=$server_distro
+ fi
ask "Client distribution (e.g. debian): " client_distro ${client_distro}
ask "Client distribution version (numerical - e.g. 3.1): " \
client_distro_ver ${client_distro_ver}
distro_check client_distro client_distro_ver
- echo "Using ${client_distro} as client distribution"
+ echo "Using ${client_distro}-$client_distro_ver as client distribution"
if [ -z ${rootdir} ] ; then
- rootdir="/nfsroot/"${client_distro}-${client_distro_ver}
+ rootdir="/srv/openslx/export/"${client_distro}-${client_distro_ver}
fi
. distro-specs/config-${server_distro}
@@ -534,6 +540,18 @@ dxs_pxedefault_conf="pxelinux/default"
dxs_cl_dir="/var/opt/openslx/config/default/initramfs"
dxs_client_conf="machine-setup.pls-configure"
+# Quick and dirty: rebuild the ramdisk
+if [ "x$1" = "x-g" ]; then
+ echo "Creating initial ramdisk from last runs settings (if possible...)"
+ precheck
+ if [ -f .config ] ; then
+ . .config
+ create_initrd
+ exit 0
+ else
+ echo "No previous settings found. Please configure your installation first"
+ fi
+fi
header
precheck #(run as root, rsync etc.)