DeforaOS/uKernel
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Place GRUB's configuration file in /boot/grub

Browse Source
This commit is contained in:
Pierre Pronchery 2019-03-28 00:42:51 +01:00
parent 84cff792a9
commit e4dd4cb877
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/iso.sh
View File

@ -82,10 +82,10 @@ _iso()
_error "$target: Could not create temporary directory" _error "$target: Could not create temporary directory"
return 2 return 2
fi fi
$DEBUG $MKDIR -- "$tmpdir/boot" "$tmpdir/grub" $DEBUG $MKDIR -- "$tmpdir/boot/grub"
$DEBUG $INSTALL -m 0644 "$UKERNELBIN" "$tmpdir/boot/uKernel.bin" $DEBUG $INSTALL -m 0644 "$UKERNELBIN" "$tmpdir/boot/uKernel.bin"
$DEBUG $INSTALL -m 0644 "$ULOADERBIN" "$tmpdir/boot/uLoader.bin" $DEBUG $INSTALL -m 0644 "$ULOADERBIN" "$tmpdir/boot/uLoader.bin"
$CAT > "$tmpdir/grub/grub.cfg" << EOF $CAT > "$tmpdir/boot/grub/grub.cfg" << EOF
menuentry "DeforaOS" { menuentry "DeforaOS" {
multiboot /boot/uKernel.bin multiboot /boot/uKernel.bin
} }
@ -93,8 +93,8 @@ EOF
$DEBUG $GRUBMKRESCUE -o "$target" "$tmpdir" $DEBUG $GRUBMKRESCUE -o "$target" "$tmpdir"
ret=$? ret=$?
$DEBUG $RM -- "$tmpdir/boot/uKernel.bin" "$tmpdir/boot/uLoader.bin" \ $DEBUG $RM -- "$tmpdir/boot/uKernel.bin" "$tmpdir/boot/uLoader.bin" \
"$tmpdir/grub/grub.cfg" "$tmpdir/boot/grub/grub.cfg"
$DEBUG $RMDIR -- "$tmpdir/boot" "$tmpdir/grub" "$tmpdir" $DEBUG $RMDIR -- "$tmpdir/boot/grub" "$tmpdir/boot" "$tmpdir"
if [ $ret -eq 127 ]; then if [ $ret -eq 127 ]; then
_error "$target: Could not create ISO image: $GRUBMKRESCUE not available (ignored)" _error "$target: Could not create ISO image: $GRUBMKRESCUE not available (ignored)"
ret=0 ret=0