diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-04-07 08:20:31 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-04-07 08:21:57 +0000 |
| commit | 38788304bbb3ffc7519890ce78e00006381cb0dc (patch) | |
| tree | 13afadb6af139751d206156d885612f11b125564 | |
| parent | cb649fea3e85629aae6be48a40a7ac842c5b9720 (diff) | |
| download | aports-38788304bbb3ffc7519890ce78e00006381cb0dc.tar.bz2 aports-38788304bbb3ffc7519890ce78e00006381cb0dc.tar.xz | |
main/mkinitfs: skip .apk-new when migrating
| -rw-r--r-- | main/mkinitfs/APKBUILD | 2 | ||||
| -rw-r--r-- | main/mkinitfs/mkinitfs.pre-upgrade | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD index 350ae70680..05c77af2d1 100644 --- a/main/mkinitfs/APKBUILD +++ b/main/mkinitfs/APKBUILD @@ -2,7 +2,7 @@ pkgname=mkinitfs pkgver=2.6.0 _ver=${pkgver%_git*} -pkgrel=3 +pkgrel=4 pkgdesc="Tool to generate initramfs images for Alpine" url=http://git.alpinelinux.org/cgit/mkinitfs depends="busybox apk-tools>=2.0 lddtree>=1.25" diff --git a/main/mkinitfs/mkinitfs.pre-upgrade b/main/mkinitfs/mkinitfs.pre-upgrade index d9424b887d..0ece527f9e 100644 --- a/main/mkinitfs/mkinitfs.pre-upgrade +++ b/main/mkinitfs/mkinitfs.pre-upgrade @@ -4,6 +4,9 @@ mkdir -p /etc/mkinitfs/features.d for i in files modules; do for j in /etc/mkinitfs/$i.d/*; do [ -e "$j" ] || continue + case "$j" in + *.apk-new) continue;; + esac mv $j /etc/mkinitfs/features.d/${j##*/}.$i done done |