diff options
| author | Dirk von Suchodoletz | 2009-05-22 20:08:58 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2009-05-22 20:08:58 +0200 |
| commit | 350c3a2bced4c5d13bb1323c5ee0427c4dc5499a (patch) | |
| tree | afbf77cd8e920c30f015c7562b87a9d165db3e4e | |
| parent | add apache config; minor path changes (diff) | |
| download | core-350c3a2bced4c5d13bb1323c5ee0427c4dc5499a.tar.gz core-350c3a2bced4c5d13bb1323c5ee0427c4dc5499a.tar.xz core-350c3a2bced4c5d13bb1323c5ee0427c4dc5499a.zip | |
Some minor enhancements for PreBoot ...
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2866 95ad53e4-c205-0410-b2fa-d234c58c8868
| -rwxr-xr-x | boot-env/preboot/preboot.sh | 9 | ||||
| -rwxr-xr-x | boot-env/preboot/uclib-rootfs/init | 10 | ||||
| -rw-r--r-- | initramfs/stage3-stuff/etc/messages | 3 |
3 files changed, 12 insertions, 10 deletions
diff --git a/boot-env/preboot/preboot.sh b/boot-env/preboot/preboot.sh index 9ec9e90d..05efadd1 100755 --- a/boot-env/preboot/preboot.sh +++ b/boot-env/preboot/preboot.sh @@ -15,19 +15,16 @@ # get configuration . /etc/initramfs-setup -ash - # we expect to have a system selection dialog file in /preboot/bootmenu.dialog -dialog --file bootmenu.dialog 2>result +while [ "x$(cat result)" = "x" ] ; do + dialog --file bootmenu.dialog 2>result +done # source the system to boot configuration ($kernel, $initramfs, $append, # $label) sysname=$(cat result) . ./$sysname - sysname=$(readlink $sysname) -# if wget - ash # bring the mac address into the standard format 01-<MAC> diff --git a/boot-env/preboot/uclib-rootfs/init b/boot-env/preboot/uclib-rootfs/init index cff0d86f..192b88bd 100755 --- a/boot-env/preboot/uclib-rootfs/init +++ b/boot-env/preboot/uclib-rootfs/init @@ -142,6 +142,7 @@ mkdir /preboot tar -xzf /tmp/preboot.env -C /preboot # start a debug shell if needed, else set quiet kernel parameter if [ "${DEBUGLEVEL}" -gt 0 ] ; then + echo "Starting shell, leaving it would continue init." /bin/ash else # no debugging output for stage3 run @@ -149,7 +150,10 @@ else fi # run the preboot interactive part which finally will execute kexec cd /preboot -exec ./preboot.sh || sh -# we will never return from that one ... - +exec ./preboot.sh +# we should never return from that one ... +echo "The execution of the main preboot environment failed. Please check" +echo "network access of your box. Is $boot_uri reachable!?" +# ping -c 1 $boot_uri +sleep 20 && echo "o" > /proc/sysrq-trigger diff --git a/initramfs/stage3-stuff/etc/messages b/initramfs/stage3-stuff/etc/messages index c7558e13..3682384d 100644 --- a/initramfs/stage3-stuff/etc/messages +++ b/initramfs/stage3-stuff/etc/messages @@ -142,7 +142,8 @@ error_errlcfg=" Did not get any configuration data via ldap until now ..." unpack_ConfTGZ=" Error during unpacking of the ConfTGZ archive.\nAre you sure \ it is in proper format?" nomachsetup=" No machine-setup file found. You might not have gotten any \ -configuration\n from your server. Your slx client will not work properly." +configuration\n from your server. Your slx client will not work properly. \ +Please check that /initramfs and /rootfs are present!" # messages from distro functions |