Skip to content
Browse files

Merge pull request #39 from daniel-pittman/feature/master/better-iso-…

…file-metadata

Better iso file metadata
  • Loading branch information...
2 parents 19a11aa + 2a4b7b1 commit c0630d037f375fa3ef810dd6845b8abeeec82cb4 @daniel-pittman daniel-pittman committed Jan 8, 2013
Showing with 23 additions and 4 deletions.
  1. +3 −0 build-bundle-file.sh
  2. +3 −0 iso-build-files/build_initial_directories.sh
  3. +17 −4 iso-build-files/rebuild_iso.sh
View
3 build-bundle-file.sh
@@ -456,6 +456,9 @@ cd tmp-build-dir
echo "creating razor microkernel overlay tarball"
tar zc${TAR_V}f build_dir/dependencies/razor-microkernel-overlay.tar.gz usr etc opt tmp root
+# ensure the copyright and license content is added to the image
+cp COPYING LICENSE tmp-build-dir/build_dir/
+
# and create a gzipped tarfile containing the dependencies folder and the set
# of scripts that are used to build the ISO (so that all the user has to do is
# copy over this one file to a directory somewhere and unpack it and they will
View
3 iso-build-files/build_initial_directories.sh
@@ -58,3 +58,6 @@ cd ..
mkdir newiso
cp -rp original-iso-files/boot newiso
sed -i "s/timeout 300/timeout 100/" newiso/boot/isolinux/isolinux.cfg
+
+# Install the copyright and license files in the new ISO image
+cp COPYING LICENSE newiso/
View
21 iso-build-files/rebuild_iso.sh
@@ -89,9 +89,22 @@ cp -p core.gz newiso/boot/
# build the YAML file needed for use in Razor, place it into the root of the
# ISO filesystem
./build_iso_yaml.rb newiso ${ISO_VERSION} boot/vmlinuz boot/core.gz
+
+# since this is multi-line, easier to build it here
+preparer=<<EOF
+Puppet Labs <puppet-razor@googlegroups.com>
+http://puppetlabs.com/solutions/next-generation-provisioning/
+Built on [$(uname -a)]
+Built at [$(date +'%Y-%m-%d %H:%M:%S')]
+Built by [$(whoami)@$(hostname -f)]
+EOF
# finally, build the ISO itself from the newiso directory
-"${GENISO}" -quiet -l -J -R -V TC-custom \
- -no-emul-boot -boot-load-size 4 -boot-info-table \
- -b boot/isolinux/isolinux.bin \
- -c boot/isolinux/boot.cat \
+"${GENISO}" -quiet -l -J -R \
+ -no-emul-boot -boot-load-size 4 -boot-info-table \
+ -b boot/isolinux/isolinux.bin \
+ -c boot/isolinux/boot.cat \
+ -A 'Razor Microkernel' -sysid 'LINUX' \
+ -p "${preparer:0:128}" \
+ -V "Razor MK ${ISO_VERSION:0:22}" \
+ -copyright 'LICENSE' \
-o "${ISO_NAME}" newiso

0 comments on commit c0630d0

Please sign in to comment.
Something went wrong with that request. Please try again.