[arch-projects] [mkinitcpio] [PATCH 3/3] add mkinitcpio version marker in buildroot creation

Dave Reisner dreisner at archlinux.org
Wed Sep 11 08:14:54 EDT 2013


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 at archlinux.org>
---
 functions  | 3 +++
 mkinitcpio | 3 ---
 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[@]}" |
-- 
1.8.4



More information about the arch-projects mailing list