summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2013-09-09 01:50:07 +0200
committerDave Reisner <dreisner@archlinux.org>2013-09-09 01:50:07 +0200
commitb76977e710cebed3a799f0ac0b25b1a380323745 (patch)
treea168f231587b2938e99d10cea0360a75544e4cea
parentd0cbe1615281a935d492cc1fd7542198f22f71ad (diff)
downloadmkinitcpio-b76977e710cebed3a799f0ac0b25b1a380323745.tar.gz
mkinitcpio-b76977e710cebed3a799f0ac0b25b1a380323745.tar.xz
add mkinitcpio version marker in buildroot creation
It doesn't make any sense that this was added during the final image creation. This fixes a subtle bug that would manifest itself if the user archived the build root manually. Signed-off-by: Dave Reisner <dreisner@archlinux.org>
-rw-r--r--functions3
-rwxr-xr-xmkinitcpio3
2 files changed, 3 insertions, 3 deletions
diff --git a/functions b/functions
index 532884f..e54f4bf 100644
--- a/functions
+++ b/functions
@@ -648,6 +648,9 @@ initialize_buildroot() {
;;
esac
+ # mkinitcpio version stamp
+ printf '%s' "$version" >"$workdir/root/VERSION"
+
# kernel module dir
install -dm755 "$workdir/root/usr/lib/modules/$kernver/kernel"
diff --git a/mkinitcpio b/mkinitcpio
index 8139ee0..7ce6c5c 100755
--- a/mkinitcpio
+++ b/mkinitcpio
@@ -210,9 +210,6 @@ build_image() {
cpio_opts+=('-R' '0:0')
fi
- # write version stamp
- printf '%s' "$version" > "$BUILDROOT/VERSION"
-
pushd "$BUILDROOT" >/dev/null
find . -print0 |
LANG=C bsdcpio "${cpio_opts[@]}" |