changeset 467:774126882534

Fix packaging run as root, clean up some unnecessary stuff, use more appropriate temp directory.
author Rob Landley <rob@landley.net>
date Mon, 10 Nov 2008 17:26:34 -0600
parents ce303506c266
children 3d2996abb6ea
files package-mini-native.sh
diffstat 1 files changed, 3 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/package-mini-native.sh	Mon Nov 10 17:25:03 2008 -0600
+++ b/package-mini-native.sh	Mon Nov 10 17:26:34 2008 -0600
@@ -59,7 +59,7 @@
 fi
 
 # Write out a script to control user mode linux
-TARDEST="mini-native-$ARCH"
+TARDEST="temp-$ARCH"
 cat > "${WORK}/uml-package.sh" << EOF &&
 #!/bin/sh
 mount -n -t ramfs /dev /dev
@@ -70,9 +70,6 @@
 /sbin/losetup /dev/loop0 "$IMAGE"
 mount -n -t ext2 /dev/loop0 "$TARDEST"
 tar xf "$BUILD/mini-native-${ARCH}.tar.bz2"
-mkdir -p "$TARDEST"/dev
-mknod "$TARDEST"/dev/console c 5 1
-echo
 df "$TARDEST"
 umount "$TARDEST"
 /sbin/losetup -d /dev/loop0
@@ -99,11 +96,9 @@
 # If we're running as root, we don't need UML.
 
 else
-  TARDEST="$BUILD/mini-native-$ARCH"
+  TARDEST="$BUILD/temp-$ARCH"
   mount -o loop "$IMAGE" "$TARDEST" &&
-  tar -x -f "$BUILD/mini-native-${ARCH}.tar.bz2" -C "$TARDEST" &&
-  mkdir -p "$TARDEST"/dev &&
-  mknod "$TARDEST"/dev/console c 5 1 &&
+  cp -a "$BUILD/mini-native-${ARCH}"/. "$TARDEST" &&
   df "$TARDEST"
 
   RETVAL=$?