diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2012-03-23 15:22:42 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-03-23 15:22:50 +0000 |
commit | 758bdae62cd02aa460b784c5c1a03123bb4c036f (patch) | |
tree | 4ef05de209912edeb437052a9f11a1ce70ad7f75 | |
parent | a4c6209e0bc6e9708c4d7139bdd29b81c5d59b25 (diff) | |
download | alpine_aports-758bdae62cd02aa460b784c5c1a03123bb4c036f.tar.bz2 alpine_aports-758bdae62cd02aa460b784c5c1a03123bb4c036f.tar.xz alpine_aports-758bdae62cd02aa460b784c5c1a03123bb4c036f.zip |
main/alpine-conf: upgrade to 2.10.0
4 files changed, 3 insertions, 133 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 deleted file mode 100644 index 9f0aec603d..0000000000 --- a/main/alpine-conf/0001-setup-acf-use-acfpasswd-utility-to-set-password.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | From 3ed9c1d7846d62d6a83b5f9d9f93cbfe2c515ef7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Natanael Copa <ncopa@alpinelinux.org> | ||
3 | Date: Thu, 12 Jan 2012 11:55:21 +0000 | ||
4 | Subject: [PATCH] setup-acf: use acfpasswd utility to set password | ||
5 | |||
6 | --- | ||
7 | setup-acf.in | 7 ++----- | ||
8 | 1 files changed, 2 insertions(+), 5 deletions(-) | ||
9 | |||
10 | diff --git a/setup-acf.in b/setup-acf.in | ||
11 | index 487db00..9e1489f 100644 | ||
12 | --- a/setup-acf.in | ||
13 | +++ b/setup-acf.in | ||
14 | @@ -31,16 +31,13 @@ while [ $# -gt 0 ]; do | ||
15 | done | ||
16 | |||
17 | if [ "$create_passwd" != "no" ]; then | ||
18 | - askpassword "root ACF" | ||
19 | mkdir -p /etc/acf | ||
20 | if [ -f /etc/acf/passwd ]; then | ||
21 | mv /etc/acf/passwd /etc/acf/passwd.backup | ||
22 | fi | ||
23 | - # this will show password on process list but we assume user is alone | ||
24 | - # on the box at this stage | ||
25 | - _md5passwd=$(echo -n "$_password" | md5sum | cut -d' ' -f1) | ||
26 | - echo "root:$_md5passwd:Admin account:ADMIN" >/etc/acf/passwd | ||
27 | + echo "root:x:Admin account:ADMIN" >/etc/acf/passwd | ||
28 | chmod 600 /etc/acf/passwd | ||
29 | + acfpasswd -s root | ||
30 | fi | ||
31 | |||
32 | # install packages | ||
33 | -- | ||
34 | 1.7.8.3 | ||
35 | |||
diff --git a/main/alpine-conf/0001-setup-disk-fix-booting-from-cciss-devices.patch b/main/alpine-conf/0001-setup-disk-fix-booting-from-cciss-devices.patch deleted file mode 100644 index ff04c5d443..0000000000 --- a/main/alpine-conf/0001-setup-disk-fix-booting-from-cciss-devices.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | From 631c361640d22e40d19b43d3b1e63b4da84ad18a Mon Sep 17 00:00:00 2001 | ||
2 | From: Natanael Copa <ncopa@alpinelinux.org> | ||
3 | Date: Tue, 8 Nov 2011 09:22:53 +0000 | ||
4 | Subject: [PATCH] setup-disk: fix booting from cciss devices | ||
5 | |||
6 | --- | ||
7 | setup-disk.in | 8 ++++++++ | ||
8 | 1 files changed, 8 insertions(+), 0 deletions(-) | ||
9 | |||
10 | diff --git a/setup-disk.in b/setup-disk.in | ||
11 | index a2b610f..6f49e6a 100644 | ||
12 | --- a/setup-disk.in | ||
13 | +++ b/setup-disk.in | ||
14 | @@ -206,6 +206,14 @@ install_mounted_root() { | ||
15 | raid[456]) raidmod="$raidmod,raid456";; | ||
16 | esac | ||
17 | done | ||
18 | + | ||
19 | + # check if we need hardware raid drivers | ||
20 | + case $rootdev in | ||
21 | + /dev/cciss/*) | ||
22 | + initfs_features="$(echo $initfs_features | sed 's/raid//') raid" | ||
23 | + ;; | ||
24 | + esac | ||
25 | + | ||
26 | if [ -n "$VERBOSE" ]; then | ||
27 | echo "Root device: $rootdev" | ||
28 | echo "Root filesystem: $root_fs" | ||
29 | -- | ||
30 | 1.7.7.2 | ||
31 | |||
diff --git a/main/alpine-conf/0001-setup-disk-fix-compaq-server-disk-arrays-dev-cciss-c.patch b/main/alpine-conf/0001-setup-disk-fix-compaq-server-disk-arrays-dev-cciss-c.patch deleted file mode 100644 index bef005ae1a..0000000000 --- a/main/alpine-conf/0001-setup-disk-fix-compaq-server-disk-arrays-dev-cciss-c.patch +++ /dev/null | |||
@@ -1,58 +0,0 @@ | |||
1 | From a8e3f8ca13a03356b89d096b25c7e9223aae89c8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Natanael Copa <ncopa@alpinelinux.org> | ||
3 | Date: Mon, 7 Nov 2011 14:01:23 +0000 | ||
4 | Subject: [PATCH] setup-disk: fix compaq server disk arrays /dev/cciss/c0d0 | ||
5 | style disks | ||
6 | |||
7 | --- | ||
8 | setup-disk.in | 15 +++++++++------ | ||
9 | 1 files changed, 9 insertions(+), 6 deletions(-) | ||
10 | |||
11 | diff --git a/setup-disk.in b/setup-disk.in | ||
12 | index 33ab925..a2b610f 100644 | ||
13 | --- a/setup-disk.in | ||
14 | +++ b/setup-disk.in | ||
15 | @@ -292,7 +292,8 @@ find_swap_size() { | ||
16 | local size=$(( $memtotal_kb * 2 / 1024 )) | ||
17 | local disk= disksize= | ||
18 | for disk in $@; do | ||
19 | - local sysfspath=/sys/block/${disk#/dev/}/size | ||
20 | + local sysfsdev=$(echo ${disk#/dev/} | sed 's:/:!:g') | ||
21 | + local sysfspath=/sys/block/$sysfsdev/size | ||
22 | # disksize = x * 512 / (1024 * 1024) = x / 2048 | ||
23 | # maxsize = $disksize / 4 = x / (2048 * 4) = x / 8192 | ||
24 | maxsize=$(awk '{ printf "%i", $0 / 8192 }' $sysfspath ) | ||
25 | @@ -312,11 +313,12 @@ find_swap_size() { | ||
26 | |||
27 | has_mounted_part() { | ||
28 | local p | ||
29 | + local sysfsdev=$(echo ${1#/dev/} | sed 's:/:!:g') | ||
30 | # parse /proc/mounts for mounted devices | ||
31 | - for p in $(awk '$1 ~ /^\/dev\// {gsub("/dev/", "", $1); print $1}' \ | ||
32 | + for p in $(awk '$1 ~ /^\/dev\// {gsub("/dev/", "", $1); gsub("/", "!", $1); print $1}' \ | ||
33 | /proc/mounts); do | ||
34 | - [ "$p" = "$1" ] && return 0 | ||
35 | - [ -e /sys/block/$1/$p ] && return 0 | ||
36 | + [ "$p" = "$sysfsdev" ] && return 0 | ||
37 | + [ -e /sys/block/$sysfsdev/$p ] && return 0 | ||
38 | done | ||
39 | return 1 | ||
40 | } | ||
41 | @@ -376,11 +378,12 @@ init_progs() { | ||
42 | show_disk_info() { | ||
43 | local disk= vendor= model= d= size= | ||
44 | for disk in $@; do | ||
45 | - d=${disk##*/} | ||
46 | + local dev=${disk#/dev/} | ||
47 | + d=$(echo $dev | sed 's:/:!:g') | ||
48 | vendor=$(cat /sys/block/$d/device/vendor 2>/dev/null) | ||
49 | model=$(cat /sys/block/$d/device/model 2>/dev/null) | ||
50 | size=$(awk '{gb = ($1 * 512)/1000000000; printf "%.1f GB\n", gb}' /sys/block/$d/size 2>/dev/null) | ||
51 | - echo " $d ($size $vendor $model)" | ||
52 | + echo " $dev ($size $vendor $model)" | ||
53 | done | ||
54 | } | ||
55 | |||
56 | -- | ||
57 | 1.7.7.2 | ||
58 | |||
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index 51ad201e74..85167faaa5 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD | |||
@@ -1,14 +1,11 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=alpine-conf | 2 | pkgname=alpine-conf |
3 | pkgver=2.9.3 | 3 | pkgver=2.10.0 |
4 | pkgrel=3 | 4 | pkgrel=0 |
5 | pkgdesc="Alpine configuration management scripts" | 5 | pkgdesc="Alpine configuration management scripts" |
6 | url=http://git.alpinelinux.org/cgit/$pkgname | 6 | url=http://git.alpinelinux.org/cgit/$pkgname |
7 | depends="openrc" | 7 | depends="openrc" |
8 | source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2 | 8 | source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2 |
9 | 0001-setup-disk-fix-compaq-server-disk-arrays-dev-cciss-c.patch | ||
10 | 0001-setup-disk-fix-booting-from-cciss-devices.patch | ||
11 | 0001-setup-acf-use-acfpasswd-utility-to-set-password.patch | ||
12 | " | 9 | " |
13 | 10 | ||
14 | arch="all" | 11 | arch="all" |
@@ -39,7 +36,4 @@ package() { | |||
39 | ln -s lbu "$pkgdir"/sbin/lbu_$i | 36 | ln -s lbu "$pkgdir"/sbin/lbu_$i |
40 | done | 37 | done |
41 | } | 38 | } |
42 | md5sums="5252c8ff669b91f0c7a5cbdf0b9b7552 alpine-conf-2.9.3.tar.bz2 | 39 | md5sums="41770f37b79868aec34ce5f2b03c495b alpine-conf-2.10.0.tar.bz2" |
43 | 35287e6f69886ebfd762be07737943a2 0001-setup-disk-fix-compaq-server-disk-arrays-dev-cciss-c.patch | ||
44 | 1594f8b3a3e27bffa83a1632b49f4d6d 0001-setup-disk-fix-booting-from-cciss-devices.patch | ||
45 | eb3e6b8bee0060022149368e01006f03 0001-setup-acf-use-acfpasswd-utility-to-set-password.patch" | ||