diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2011-01-06 13:44:08 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-01-06 13:44:08 +0000 |
| commit | fa8637266d490e569fbd4807d82e9142d5b75fd0 (patch) | |
| tree | 3e21473528bef0771b7c83fc0a487ed821282034 /main | |
| parent | 81aa49a3d6105dbd53b600e0d70e2c0de3894202 (diff) | |
| download | aports-fa8637266d490e569fbd4807d82e9142d5b75fd0.tar.bz2 aports-fa8637266d490e569fbd4807d82e9142d5b75fd0.tar.xz | |
main/alpine-conf: use vi as default editor
ref #496
Diffstat (limited to 'main')
| -rw-r--r-- | main/alpine-conf/APKBUILD | 8 | ||||
| -rw-r--r-- | main/alpine-conf/editor.patch | 27 |
2 files changed, 32 insertions, 3 deletions
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index 8a8c3a55b8..778a9ba69c 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD @@ -1,14 +1,15 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-conf pkgver=2.5.4 -pkgrel=1 +pkgrel=2 pkgdesc="Alpine configuration management scripts" url=http://git.alpinelinux.org/cgit/$pkgname depends="openrc" source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2 0001-lbu-remount-LBU_MEDIA-as-read-write-if-it-was-read-o.patch + editor.patch " -arch="x86 x86_64" +arch="noarch" license="GPL-2" _builddir="$srcdir"/$pkgname-$pkgver @@ -37,4 +38,5 @@ package() { done } md5sums="91a2b8a150917cc06f6c9ec839b70bb0 alpine-conf-2.5.4.tar.bz2 -9245a4bc53b24584d43b3a3f1556c500 0001-lbu-remount-LBU_MEDIA-as-read-write-if-it-was-read-o.patch" +9245a4bc53b24584d43b3a3f1556c500 0001-lbu-remount-LBU_MEDIA-as-read-write-if-it-was-read-o.patch +c6f425ae21ff983f94b64eef8c236b22 editor.patch" diff --git a/main/alpine-conf/editor.patch b/main/alpine-conf/editor.patch new file mode 100644 index 0000000000..bec421e5fa --- /dev/null +++ b/main/alpine-conf/editor.patch @@ -0,0 +1,27 @@ +commit ca0e10950a5db60121ac741f0bad28af9bb504b9 +Author: Natanael Copa <ncopa@alpinelinux.org> +Date: Tue Dec 28 13:27:55 2010 +0000 + + setup-interfaces: use vi as default editor + + since nano is not shipped with mini iso. + +diff --git a/setup-interfaces.in b/setup-interfaces.in +index aad042d..b96ee58 100755 +--- a/setup-interfaces.in ++++ b/setup-interfaces.in +@@ -141,12 +141,11 @@ while [ "$answer" != "yes" ] && [ "$answer" != "no" ] ; do + done + + if [ "$answer" = "yes" ]; then +- [ -z "$EDITOR" ] && EDITOR=nano +- case $EDITOR in ++ case "$EDITOR" in + nano) pkg_inst nano;; + vim) pkg_inst vim;; + esac +- $EDITOR interfaces ++ ${EDITOR:-vi} interfaces + fi + + mkdir -p $ROOT/etc/network |