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
2
Issues
2
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
Ximper Linux
mkimage-profiles
Commits
5c4f4aab
Commit
5c4f4aab
authored
Sep 29, 2023
by
Anton Midyukov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove lilo support
lilo is stagnating, it is better to prepare in advance for the fact that it will not exist.
parent
cefad179
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
5 additions
and
54 deletions
+5
-54
tar2fs
bin/tar2fs
+0
-33
README
features.in/bootloader/README
+3
-3
config.mk
features.in/bootloader/config.mk
+1
-10
config.mk
features.in/rescue/config.mk
+1
-1
vm.mk
lib/vm.mk
+0
-6
lilo
pkg.in/lists/lilo
+0
-1
No files found.
bin/tar2fs
View file @
5c4f4aab
...
@@ -344,7 +344,6 @@ fi
...
@@ -344,7 +344,6 @@ fi
tar
-C
"
$ROOTFS
"
--numeric-owner
-xf
"
$TAR
"
tar
-C
"
$ROOTFS
"
--numeric-owner
-xf
"
$TAR
"
for
i
in
/dev /proc /sys
;
do
mount
--bind
"
$i
"
"
$ROOTFS$i
"
;
done
for
i
in
/dev /proc /sys
;
do
mount
--bind
"
$i
"
"
$ROOTFS$i
"
;
done
# loop device so lilo could work...
if
grep
-qe
"[[:space:]]/[[:space:]]"
"
$ROOTFS
/etc/fstab"
;
then
\
if
grep
-qe
"[[:space:]]/[[:space:]]"
"
$ROOTFS
/etc/fstab"
;
then
\
sed
-i
"s/LABEL=ROOT/
$ROOTDEV
/"
"
$ROOTFS
/etc/fstab"
sed
-i
"s/LABEL=ROOT/
$ROOTDEV
/"
"
$ROOTFS
/etc/fstab"
else
else
...
@@ -397,38 +396,6 @@ ARCH="$(chroot "$ROOTFS" rpm --eval '%_host_cpu')"
...
@@ -397,38 +396,6 @@ ARCH="$(chroot "$ROOTFS" rpm --eval '%_host_cpu')"
# Setup bootloader
# Setup bootloader
case
"
$BOOTLOADER
"
in
case
"
$BOOTLOADER
"
in
lilo
)
# configure and install bootloader
REGEXP
=
'^.*: ([0-9]+) cylinders, ([0-9]+) heads, ([0-9]+) sectors/track*$'
set
--
$(
sfdisk
-g
"
$LOOPDEV
"
|
grep
-E
"
$REGEXP
"
|
sed
-r
"s@
$REGEXP
@
\1
\2
\3
@"
)
LILO_COMMON
=
"lba32
delay=1
vga=0
image=/boot/vmlinuz
initrd=/boot/initrd.img
append=
\"
root=
$ROOTDEV
rootdelay=3 console=tty1 console=ttyS0,115200n8
\"
label=linux"
cat
>
"
$ROOTFS
"
/etc/lilo-loop.conf
<<-
EOF
boot=
$LOOPDEV
disk=
$LOOPDEV
bios=0x80
cylinders=
$1
heads=
$2
sectors=
$3
partition=
$LOOPROOT
start=63
$LILO_COMMON
EOF
chroot
"
$ROOTFS
"
lilo
-C
/etc/lilo-loop.conf
cat
>
"
$ROOTFS
"
/etc/lilo.conf
<<-
EOF
boot=
$BLOCKDEV
$LILO_COMMON
EOF
;;
grub-efi
)
grub-efi
)
echo
'GRUB_DISABLE_OS_PROBER=true'
>>
"
$ROOTFS
"
/etc/sysconfig/grub2
echo
'GRUB_DISABLE_OS_PROBER=true'
>>
"
$ROOTFS
"
/etc/sysconfig/grub2
chroot
"
$ROOTFS
"
grub-mkconfig
-o
/boot/grub/grub.cfg
chroot
"
$ROOTFS
"
grub-mkconfig
-o
/boot/grub/grub.cfg
...
...
features.in/bootloader/README
View file @
5c4f4aab
=== features.in/bootloader ===
=== features.in/bootloader ===
Добавление установки загрузчика основной системы, затребованного
Добавление установки загрузчика основной системы, затребованного
посредством указания "grub"
, "lilo"
или "uboot" в BASE_BOOTLOADER.
посредством указания "grub" или "uboot" в BASE_BOOTLOADER.
Соответствующий модуль alterator
добавляется в устанавливаемую
Модуль alterator-grub
добавляется в устанавливаемую
систему (он НЕ должен требоваться пакету installer-distro-*)
систему (он НЕ должен требоваться пакету installer-distro-*)
и требует пакет выбранного загрузчика. Так как для uboot такого
и требует пакет выбранного загрузчика. Так как для uboot такого
модуля нет и в тоже время uboot не используется в установочных
модуля нет и в тоже время uboot не используется в установочных
...
@@ -18,6 +18,6 @@
...
@@ -18,6 +18,6 @@
При необходимости всё-таки "пересилить" последнее изменение можно
При необходимости всё-таки "пересилить" последнее изменение можно
@$(call set,BASE_BOOTLOADER,grub
_или_lilo
)
@$(call set,BASE_BOOTLOADER,grub)
Реализация экспериментальная (нужно модуляризовать installer-steps).
Реализация экспериментальная (нужно модуляризовать installer-steps).
features.in/bootloader/config.mk
View file @
5c4f4aab
# TODO: invent something prettier
(think "lilo+grub" -- or error out?)
# TODO: invent something prettier
# - add,BASE_PACKAGES,alterator-$* is overly additive
# - add,BASE_PACKAGES,alterator-$* is overly additive
# NB: due to make target becoming having been made,
# NB: due to make target becoming having been made,
# the last different one wins
# the last different one wins
...
@@ -22,15 +22,6 @@ ifeq (distro,$(IMAGE_CLASS))
...
@@ -22,15 +22,6 @@ ifeq (distro,$(IMAGE_CLASS))
endif
endif
endif
endif
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
use/bootloader/lilo: \
use/bootloader/%: use/bootloader
@$(call set,BASE_BOOTLOADER,$*)
@echo Warning: use/bootloader/lilo is deprecated!
else
use/bootloader/lilo: ; @:
endif
ifeq (,$(filter-out $(GRUB_ARCHES),$(ARCH)))
ifeq (,$(filter-out $(GRUB_ARCHES),$(ARCH)))
use/bootloader/grub: \
use/bootloader/grub: \
use/bootloader/%: use/bootloader
use/bootloader/%: use/bootloader
...
...
features.in/rescue/config.mk
View file @
5c4f4aab
...
@@ -13,7 +13,7 @@ use/rescue/base: use/rescue/.base
...
@@ -13,7 +13,7 @@ use/rescue/base: use/rescue/.base
use/rescue: use/rescue/.base use/services use/firmware/full +wireless
use/rescue: use/rescue/.base 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)))
@$(call add,RESCUE_PACKAGES,
lilo
syslinux)
@$(call add,RESCUE_PACKAGES,syslinux)
endif
endif
@$(call add,RESCUE_LISTS,\
@$(call add,RESCUE_LISTS,\
$(call tags,(base || extra || server || misc || fs) \
$(call tags,(base || extra || server || misc || fs) \
...
...
lib/vm.mk
View file @
5c4f4aab
...
@@ -9,12 +9,6 @@ ifeq (vm,$(IMAGE_CLASS))
...
@@ -9,12 +9,6 @@ ifeq (vm,$(IMAGE_CLASS))
vm/.bare: profile/bare
vm/.bare: profile/bare
@$(call add,BASE_PACKAGES,interactivesystem shadow-utils e2fsprogs)
@$(call add,BASE_PACKAGES,interactivesystem shadow-utils e2fsprogs)
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
vm/.base-lilo: vm/.bare use/bootloader/lilo; @:
else
vm/.base-lilo: vm/.base-grub; @:
endif
ifeq (,$(filter-out i586 x86_64 ppc64le,$(ARCH)))
ifeq (,$(filter-out i586 x86_64 ppc64le,$(ARCH)))
vm/.base-grub: vm/.bare use/bootloader/grub; @:
vm/.base-grub: vm/.bare use/bootloader/grub; @:
else
else
...
...
pkg.in/lists/lilo
deleted
100644 → 0
View file @
cefad179
lilo@X86
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