diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2012-01-12 16:09:19 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-01-12 16:09:19 +0000 |
| commit | 875f276f29721f6a373b3601fe9835fe440724ec (patch) | |
| tree | 416886475a1b3b8ecfe35c22f433629f6fa3b723 /main | |
| parent | 216e78928e6939028b5df5fe734b259f57389db3 (diff) | |
| download | aports-875f276f29721f6a373b3601fe9835fe440724ec.tar.bz2 aports-875f276f29721f6a373b3601fe9835fe440724ec.tar.xz | |
main/alpine-conf: use acfpasswd tool in setup-acf
Diffstat (limited to 'main')
| -rw-r--r-- | main/alpine-conf/0001-setup-acf-use-acfpasswd-utility-to-set-password.patch | 35 | ||||
| -rw-r--r-- | main/alpine-conf/APKBUILD | 6 |
2 files changed, 39 insertions, 2 deletions
diff --git a/main/alpine-conf/0001-setup-acf-use-acfpasswd-utility-to-set-password.patch b/main/alpine-conf/0001-setup-acf-use-acfpasswd-utility-to-set-password.patch new file mode 100644 index 0000000000..9f0aec603d --- /dev/null +++ b/main/alpine-conf/0001-setup-acf-use-acfpasswd-utility-to-set-password.patch @@ -0,0 +1,35 @@ +From 3ed9c1d7846d62d6a83b5f9d9f93cbfe2c515ef7 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Thu, 12 Jan 2012 11:55:21 +0000 +Subject: [PATCH] setup-acf: use acfpasswd utility to set password + +--- + setup-acf.in | 7 ++----- + 1 files changed, 2 insertions(+), 5 deletions(-) + +diff --git a/setup-acf.in b/setup-acf.in +index 487db00..9e1489f 100644 +--- a/setup-acf.in ++++ b/setup-acf.in +@@ -31,16 +31,13 @@ while [ $# -gt 0 ]; do + done + + if [ "$create_passwd" != "no" ]; then +- askpassword "root ACF" + mkdir -p /etc/acf + if [ -f /etc/acf/passwd ]; then + mv /etc/acf/passwd /etc/acf/passwd.backup + fi +- # this will show password on process list but we assume user is alone +- # on the box at this stage +- _md5passwd=$(echo -n "$_password" | md5sum | cut -d' ' -f1) +- echo "root:$_md5passwd:Admin account:ADMIN" >/etc/acf/passwd ++ echo "root:x:Admin account:ADMIN" >/etc/acf/passwd + chmod 600 /etc/acf/passwd ++ acfpasswd -s root + fi + + # install packages +-- +1.7.8.3 + diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index ed2dabfd97..51ad201e74 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD @@ -1,13 +1,14 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-conf pkgver=2.9.3 -pkgrel=2 +pkgrel=3 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-setup-disk-fix-compaq-server-disk-arrays-dev-cciss-c.patch 0001-setup-disk-fix-booting-from-cciss-devices.patch + 0001-setup-acf-use-acfpasswd-utility-to-set-password.patch " arch="all" @@ -40,4 +41,5 @@ package() { } md5sums="5252c8ff669b91f0c7a5cbdf0b9b7552 alpine-conf-2.9.3.tar.bz2 35287e6f69886ebfd762be07737943a2 0001-setup-disk-fix-compaq-server-disk-arrays-dev-cciss-c.patch -1594f8b3a3e27bffa83a1632b49f4d6d 0001-setup-disk-fix-booting-from-cciss-devices.patch" +1594f8b3a3e27bffa83a1632b49f4d6d 0001-setup-disk-fix-booting-from-cciss-devices.patch +eb3e6b8bee0060022149368e01006f03 0001-setup-acf-use-acfpasswd-utility-to-set-password.patch" |