Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Adélie Linux
Image Creation
Commits
ae61fe98
Verified
Commit
ae61fe98
authored
Feb 02, 2020
by
A. Wilcox
🦊
Browse files
Use arch suffixes for bzImage/initrd/squashfs; fix GRUB root set
parent
ac8601cb
Changes
9
Hide whitespace changes
Inline
Side-by-side
adelie-build-cd
View file @
ae61fe98
...
...
@@ -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
()
{
...
...
ppc/early.cfg
View file @
ae61fe98
search.fs_label "Adelie 1.0rc1 ppc" --no-floppy
roo
t
search.fs_label "Adelie 1.0rc1 ppc" --no-floppy
--se
t
set prefix=($root)/boot
ppc/early.cfg64
View file @
ae61fe98
search.fs_label "Adelie 1.0rc1 ppc64"
roo
t
search.fs_label "Adelie 1.0rc1 ppc64"
--no-floppy --se
t
set prefix=($root)/boot
ppc/grub.cfg
View file @
ae61fe98
...
...
@@ -2,9 +2,9 @@ menuentry "Adelie Linux 1.0-RC1 Live (PowerPC 32-bit)" --class linux --id adelie
insmod part_apple
insmod iso9660
insmod linux
search --label "Adelie 1.0rc1 ppc" --hint cd,apple2 --no-floppy
roo
t
linux ($root)/bzImage
initrd ($root)/initrd
search --label "Adelie 1.0rc1 ppc" --hint cd,apple2 --no-floppy
--se
t
linux ($root)/bzImage
-ppc squashroot=ppc.squashfs
initrd ($root)/initrd
-ppc
}
menuentry "Reboot and Try Again" --class reboot --id reboot {
...
...
ppc/grub.cfg64
View file @
ae61fe98
...
...
@@ -2,9 +2,9 @@ menuentry "Adelie Linux 1.0-RC1 Live (PowerPC 64-bit)" --class linux --id adelie
insmod part_apple
insmod iso9660
insmod linux
search --label "Adelie 1.0rc1 ppc64" --hint cd,apple2 --no-floppy
roo
t
linux ($root)/bzImage
initrd ($root)/initrd
search --label "Adelie 1.0rc1 ppc64" --hint cd,apple2 --no-floppy
--se
t
linux ($root)/bzImage
-ppc64 squashroot=ppc64.squashfs
initrd ($root)/initrd
-ppc64
}
menuentry "Reboot and Try Again" --class reboot --id reboot {
...
...
x86/early.cfg
View file @
ae61fe98
search.fs_label "Adelie 1.0rc1 pmmx" --no-floppy
roo
t
search.fs_label "Adelie 1.0rc1 pmmx" --no-floppy
--se
t
set prefix=($root)/boot
x86/early.cfg64
View file @
ae61fe98
search.fs_label "Adelie 1.0rc1 x86_64" --no-floppy
roo
t
search.fs_label "Adelie 1.0rc1 x86_64" --no-floppy
--se
t
set prefix=($root)/boot
x86/grub.cfg
View file @
ae61fe98
menuentry "Adelie Linux 1.0-RC1 Live (Intel 32-bit)" --class linux --id adelie-live-cd {
insmod iso9660
insmod linux
search --label "Adelie 1.0rc1 pmmx" --no-floppy
roo
t
linux ($root)/bzImage
initrd ($root)/initrd
search --label "Adelie 1.0rc1 pmmx" --no-floppy
--se
t
linux ($root)/bzImage
-pmmx squashroot=pmmx.squashfs
initrd ($root)/initrd
-pmmx
}
menuentry "Reboot and Try Again" --class reboot --id reboot {
...
...
x86/grub.cfg64
View file @
ae61fe98
menuentry "Adelie Linux 1.0-RC1 Live (Intel 64-bit)" --class linux --id adelie-live-64 {
insmod iso9660
insmod linux
search --label "Adelie 1.0rc1 x86_64" --no-floppy
roo
t
linux ($root)/bzImage
initrd ($root)/initrd
search --label "Adelie 1.0rc1 x86_64" --no-floppy
--se
t
linux ($root)/bzImage
-x86_64 squashroot=x86_64.squashfs
initrd ($root)/initrd
-x86_64
}
menuentry "Reboot and Try Again" --class reboot --id reboot {
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment