summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Griffin <aaronmgriffin@gmail.com>2008-12-23 00:53:16 -0600
committerAaron Griffin <aaronmgriffin@gmail.com>2008-12-23 00:53:16 -0600
commit5712c412ff0a82a73f32ca5c074d413e3526f373 (patch)
treeeb509dd9cee431a64c2e8664dd8cdcf5694f89b9
parent2a58a09f8c836336cfd99b7e3f885064dbe2318b (diff)
install-iso config changes
Re-order isomounts Few changes to the Makefile Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-rw-r--r--configs/install-iso/Makefile2
-rw-r--r--configs/install-iso/isomounts4
2 files changed, 3 insertions, 3 deletions
diff --git a/configs/install-iso/Makefile b/configs/install-iso/Makefile
index 1cf261c..57ab395 100644
--- a/configs/install-iso/Makefile
+++ b/configs/install-iso/Makefile
@@ -32,7 +32,7 @@ overlay: base-iso
cp -r overlay $(WORKDIR)/
root-image:
- mkarchiso -p "$(PACKAGES)" create $(WORKDIR)
+ mkarchiso -p $(PACKAGES) create $(WORKDIR)
base-iso: root-image
mv $(WORKDIR)/root-image/boot $(WORKDIR)/iso/
diff --git a/configs/install-iso/isomounts b/configs/install-iso/isomounts
index 3aa6cb6..e88f8a9 100644
--- a/configs/install-iso/isomounts
+++ b/configs/install-iso/isomounts
@@ -6,7 +6,7 @@
# syntax: <img> <arch> <mount point> <type>
-root-image.sqfs i686 / squashfs
+# ORDER MATTERS! Files take top-down precedence. Be careful
overlay.sqfs i686 / squashfs
-overlay.sqfs x86_64 / squashfs
core-pkgs.sqfs i686 /src/core/pkg squashfs
+root-image.sqfs i686 / squashfs