From b94641a1af46ddcf5aa03eafdb89834439768b12 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Mon, 25 Aug 2008 13:24:47 +0200 Subject: [PATCH] Use vim.basic as alternative setting for vi --- debian/changelog | 3 ++- etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives | 9 +++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index cfbe813..aadbe90 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,8 +29,9 @@ grml-live (0.9) unstable; urgency=low * Display progress of squashfs, when building via a buildsystem just set -no-progress in $SQUASHFS_OPTIONS instead. * Use linux-kernel-headers-grml in grml-medium. + * Use vim.basic as alternative setting for 'vi'. - -- Michael Prokop Mon, 18 Aug 2008 00:03:14 +0200 + -- Michael Prokop Mon, 25 Aug 2008 13:24:25 +0200 grml-live (0.8) unstable; urgency=low diff --git a/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives b/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives index 33646d7..fb0912c 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives +++ b/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives @@ -4,7 +4,7 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2 or any later version. -# Latest change: Fri Dec 28 23:14:32 CET 2007 [mika] +# Latest change: Mon Aug 25 13:24:20 CEST 2008 [mika] ################################################################################ set -u @@ -12,10 +12,15 @@ set -e if [ -r $target/usr/bin/vim.basic ] ; then $ROOTCMD update-alternatives --set editor /usr/bin/vim.basic + $ROOTCMD update-alternatives --set vi /usr/bin/vim.basic fi +## Too many people don't expect to get that, so deactive by default: +# if [ -r $target/usr/bin/vim.tiny ] ; then +# $ROOTCMD update-alternatives --set vi /usr/bin/vim.tiny +# fi + if [ -r $target/usr/bin/vim.tiny ] ; then - $ROOTCMD update-alternatives --set vi /usr/bin/vim.tiny fi if [ -r $target/usr/bin/uxterm ] ; then -- 2.1.4