Date: Sat, 15 Apr 2006 09:18:15 +0200 From: "Björn König" <bkoenig@cs.tu-berlin.de> To: FreeBSD-gnats-submit@freebsd.org Cc: qa@freebsd.org Subject: [patch] environment variable EDITOR is set wrong in fixit mode Message-ID: <20060415071815.56F845285C@eurystheus.local>
next in thread | raw e-mail | index | archive | help
>Submitter-Id: current-users
>Originator: Björn König
>Organization:
>Confidential: no
>Synopsis: [patch] environment variable EDITOR is set wrong in fixit mode
>Severity: non-critical
>Priority: medium
>Category: misc
>Class: change-request
>Release: FreeBSD 6.1-RC i386
>Environment:
System: FreeBSD hoppel.local 6.1-RC FreeBSD 6.1-RC #0: Fri Apr 14 20:32:06 CEST 2006 bkoenig@hoppel.local:/home/bkoenig/obj/home/bkoenig/devel/freebsd/RELENG_6_1/src/sys/HOPPEL i386
>Description:
If you start the fixit mode of disc1 then the
environment variable EDITOR is set wrong. Its
value is /mnt2/stand/vi, but vi doesn't exist
at this place.
This concerns the variable PAGER likewise.
>How-To-Repeat:
Go to fixit mode:
Fixit# $EDITOR
/mnt2/stand/vi: not found
>Fix:
There are at least two possible solutions.
First of all /mnt2/stand is a symlink to /rescue,
but /rescue doesn't exist. It migth be better to
create a symlink to "rescue" instead of "/rescue".
In this case /mnt2/stand would be a symlink to
"rescue", i.e. /mnt2/rescue becomes the real path.
EDITOR don't need to be changed and vi works. PAGER
still doesn't work, because more doesn't exist
in rescue.
A second approach would be to simply change EDITOR to
/mnt2/usr/bin/vi resp. PAGER to /mnt/usr/bin/more.
These two patches deals with the issue. You may
apply both patches.
--- src-release-Makefile-2006041501.diff begins here ---
--- release/Makefile.orig Sun Apr 9 06:28:24 2006
+++ release/Makefile Sat Apr 15 08:55:22 2006
@@ -937,7 +937,7 @@
@cp -Rp ${RD}/kernels/GENERIC/ ${CD_LIVEFS}/boot/kernel
@rm -f ${CD_LIVEFS}/.profile
@cp ${.CURDIR}/fixit.profile ${CD_LIVEFS}/.profile
- @ln -sf /rescue ${CD_LIVEFS}/stand
+ @ln -sf rescue ${CD_LIVEFS}/stand
.if ${TARGET} != "pc98"
@echo "Setting up CDROM boot area"
@rm -f ${CD_LIVEFS}/boot/loader.conf
--- src-release-Makefile-2006041501.diff ends here ---
--- src-release-fixit.profile-2006041501.diff begins here ---
--- release/fixit.profile.orig Thu Sep 2 15:40:34 2004
+++ release/fixit.profile Sat Apr 15 08:43:32 2006
@@ -3,8 +3,8 @@
export BLOCKSIZE=K
export PS1="Fixit# "
-export EDITOR="/mnt2/stand/vi"
-export PAGER="/mnt2/stand/more"
+export EDITOR="/mnt2/usr/bin/vi"
+export PAGER="/mnt2/usr/bin/more"
export SCSI_MODES="/mnt2/usr/share/misc/scsi_modes"
# the root MFS doesn't have /dev/nrsa0, pick a better default for mt(1)
export TAPE=/mnt2/dev/nrsa0
--- src-release-fixit.profile-2006041501.diff ends here ---
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060415071815.56F845285C>