Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mkimage-profiles
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Anton Palgunov
mkimage-profiles
Commits
f43f250e
You need to sign in or sign up before continuing.
Commit
f43f250e
authored
Apr 23, 2021
by
Anton Midyukov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
install2, live, live.mk, rescue: Add local boot for grub-pc menu (iso)
parent
b9bbd4c3
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
5 deletions
+8
-5
live.mk
conf.d/live.mk
+2
-1
config.mk
features.in/install2/config.mk
+2
-1
config.mk
features.in/live/config.mk
+3
-2
config.mk
features.in/rescue/config.mk
+1
-1
No files found.
conf.d/live.mk
View file @
f43f250e
...
@@ -11,7 +11,8 @@ distro/syslinux: distro/.boot \
...
@@ -11,7 +11,8 @@ distro/syslinux: distro/.boot \
endif
endif
ifeq (,$(filter-out i586 x86_64 aarch64 ppc64le riscv64,$(ARCH)))
ifeq (,$(filter-out i586 x86_64 aarch64 ppc64le riscv64,$(ARCH)))
distro/grub: distro/.boot use/grub use/hdt +efi; @:
distro/grub: distro/.boot use/grub use/hdt +efi \
use/grub/localboot_bios.cfg use/grub/sdab_bios.cfg; @:
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
@$(call set,BOOTLOADER,grubpcboot)
@$(call set,BOOTLOADER,grubpcboot)
endif
endif
...
...
features.in/install2/config.mk
View file @
f43f250e
...
@@ -20,7 +20,8 @@ use/install2: use/stage2 sub/stage2@install2 use/metadata \
...
@@ -20,7 +20,8 @@ use/install2: use/stage2 sub/stage2@install2 use/metadata \
# doesn't use/install2/fs on purpose (at least so far)
# doesn't use/install2/fs on purpose (at least so far)
use/install2/full: \
use/install2/full: \
use/install2/packages use/install2/vmguest use/install2/tools \
use/install2/packages use/install2/vmguest use/install2/tools \
use/syslinux/localboot.cfg use/syslinux/ui/menu use/bootloader
use/syslinux/localboot.cfg use/grub/localboot_bios.cfg \
use/syslinux/ui/menu use/bootloader
@$(call add,INSTALL2_PACKAGES,xorg-drv-synaptics)
@$(call add,INSTALL2_PACKAGES,xorg-drv-synaptics)
@$(call add,INSTALL2_PACKAGES,xorg-drv-libinput)
@$(call add,INSTALL2_PACKAGES,xorg-drv-libinput)
...
...
features.in/live/config.mk
View file @
f43f250e
...
@@ -44,7 +44,7 @@ use/live/x11: use/live/base use/deflogin/desktop use/x11-autologin use/sound \
...
@@ -44,7 +44,7 @@ use/live/x11: use/live/base use/deflogin/desktop use/x11-autologin use/sound \
# a browser is requested too, the recommended one can be overridden downstream
# a browser is requested too, the recommended one can be overridden downstream
use/live/desktop: use/live/x11 use/x11/xorg use/x11/wacom \
use/live/desktop: use/live/x11 use/x11/xorg use/x11/wacom \
use/l10n use/browser/firefox/live use/xdg-user-dirs/deep \
use/l10n use/browser/firefox/live use/xdg-user-dirs/deep \
use/syslinux/localboot.cfg +vmguest; @:
use/syslinux/localboot.cfg
use/grub/localboot_bios.cfg
+vmguest; @:
# preconfigure apt for both live and installed-from-live systems
# preconfigure apt for both live and installed-from-live systems
use/live/repo: use/live
use/live/repo: use/live
...
@@ -56,7 +56,8 @@ use/live/repo/online:
...
@@ -56,7 +56,8 @@ use/live/repo/online:
@$(call add,LIVE_PACKAGES,livecd-online-repo)
@$(call add,LIVE_PACKAGES,livecd-online-repo)
# alterator-based permanent installation
# alterator-based permanent installation
use/live/install: use/metadata use/xdg-user-dirs use/syslinux/localboot.cfg \
use/live/install: use/metadata use/xdg-user-dirs \
use/syslinux/localboot.cfg use/grub/localboot_bios.cfg \
use/bootloader/live use/bootloader/grub
use/bootloader/live use/bootloader/grub
@$(call add,LIVE_PACKAGES,livecd-install)
@$(call add,LIVE_PACKAGES,livecd-install)
@$(call add,LIVE_PACKAGES,livecd-installer-features)
@$(call add,LIVE_PACKAGES,livecd-installer-features)
...
...
features.in/rescue/config.mk
View file @
f43f250e
...
@@ -9,7 +9,7 @@ use/rescue/base: use/rescue/.base
...
@@ -9,7 +9,7 @@ use/rescue/base: use/rescue/.base
@$(call add,RESCUE_LISTS,\
@$(call add,RESCUE_LISTS,\
$(call tags,base && (rescue || network || security || archive)))
$(call tags,base && (rescue || network || security || archive)))
use/rescue: use/rescue/.base use/syslinux/sdab.cfg \
use/rescue: use/rescue/.base use/syslinux/sdab.cfg
use/grub/sdab_bios.cfg
\
use/services use/firmware/full +wireless
use/services use/firmware/full +wireless
@$(call add,DEFAULT_SERVICES_DISABLE,rpcbind)
@$(call add,DEFAULT_SERVICES_DISABLE,rpcbind)
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
...
...
Write
Preview
Markdown
is supported
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