diff options
author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-02-02 15:38:13 -0600 |
---|---|---|
committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-02-02 15:38:13 -0600 |
commit | ae61fe98419a46847009f0153d6b2e43f5bed891 (patch) | |
tree | 5f8cf9fcb2f7f6805dcaac701f2db66c68a91d68 /adelie-build-cd | |
parent | ac8601cb7ef8f6bc2e18a664320c70fe12f1f055 (diff) | |
download | image-ae61fe98419a46847009f0153d6b2e43f5bed891.tar.gz image-ae61fe98419a46847009f0153d6b2e43f5bed891.tar.bz2 image-ae61fe98419a46847009f0153d6b2e43f5bed891.tar.xz image-ae61fe98419a46847009f0153d6b2e43f5bed891.zip |
Use arch suffixes for bzImage/initrd/squashfs; fix GRUB root set
Diffstat (limited to 'adelie-build-cd')
-rwxr-xr-x | adelie-build-cd | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/adelie-build-cd b/adelie-build-cd index 4a9fe3d..18d77a5 100755 --- a/adelie-build-cd +++ b/adelie-build-cd @@ -256,7 +256,7 @@ make_structure() { squash_it() { header 'Creating compressed file system image...' - mksquashfs squashroot-$ARCH cdroot-$ARCH/adelie.squashfs -noappend + mksquashfs squashroot-$ARCH cdroot-$ARCH/$ARCH.squashfs -noappend } make_initrd() { @@ -304,9 +304,9 @@ make_initrd() { header 'Compressing initrd...' - (cd initrd-$ARCH; find . | cpio -H newc -o) > cdroot-$ARCH/initrd - gzip -9 cdroot-$ARCH/initrd - mv cdroot-$ARCH/initrd.gz cdroot-$ARCH/initrd + (cd initrd-$ARCH; find . | cpio -H newc -o) > cdroot-$ARCH/initrd-$ARCH + gzip -9 cdroot-$ARCH/initrd-$ARCH + mv cdroot-$ARCH/initrd-$ARCH.gz cdroot-$ARCH/initrd-$ARCH } prepare_cdroot() { @@ -322,7 +322,7 @@ prepare_cdroot() { header 'Adding kernel...' - mv squashroot-$ARCH/boot/vmlinu* cdroot-$ARCH/bzImage + mv squashroot-$ARCH/boot/vmlinu* cdroot-$ARCH/bzImage-$ARCH } create_iso() { |