Rename loader

Signed-off-by: Alexey Gladkov <legion@altlinux.org>

Author: legionus

Makefile

@@ -1,12 +1,12 @@
-PROJECT = miboot
+PROJECT = bootloader
 VERSION = 1.0.0
 
 BACKEND = ncurses
 
 MENU_PROG = bootmenu
 CFLAGS    = -Os -Wall -Wextra
 
-basedir     = /lib/miboot
+basedir     = /lib/$(PROJECT)
 sbindir    ?= /sbin
 sysconfdir ?= /etc
 
@@ -38,27 +38,27 @@ ncurses_SRCS   = bootmenu.c
 ncurses_LIBS   = -lnewt -lslang -liniparser
 ncurses_OBJS   = $(ncurses_SRCS:.c=.o)
 
-all: miboot $(MENU_PROG) build-kernel
+all: make-bootloader $(MENU_PROG) build-kernel
 
 INSTALL_TARGETS = \
 	install-bin \
 	install-menu \
 	install-kernel \
-	install-miboot-config
+	install-config
 
 install: $(INSTALL_TARGETS)
 
-install-bin: $(PROJECT)
+install-bin: make-bootloader
 	$(MKDIR_P) -- $(DESTDIR)/$(sbindir)
-	$(INSTALL) -m755 $(PROJECT) $(DESTDIR)/$(sbindir)/$(PROJECT)
+	$(INSTALL) -m755 make-bootloader $(DESTDIR)/$(sbindir)/make-bootloader
 
 install-menu: $(MENU_PROG)
 	$(MKDIR_P) -- $(DESTDIR)/$(basedir)/bin
 	$(INSTALL) -m755 $(MENU_PROG) $(DESTDIR)/$(basedir)/bin/bootmenu
 
-install-miboot-config:
+install-config:
 	$(MKDIR_P) -- $(DESTDIR)/$(sysconfdir)
-	$(CP) -f -- initrd-miboot.mk $(DESTDIR)/$(sysconfdir)/$(PROJECT).mk
+	$(CP) -f -- initrd-bootloader.mk $(DESTDIR)/$(sysconfdir)/$(PROJECT).mk
 
 install-kernel: linux build-kernel
 	$(MKDIR_P) -- $(DESTDIR)/$(basedir)/boot

feature/data/lib/poll/scripts/boot-config

@@ -5,7 +5,7 @@
 
 prefix=
 conf=
-n='miboot.conf'
+n='bootloader.conf'
 
 for d in '' '/boot'; do
 	if [ -e "$rootmnt$d/$n" ]; then
@@ -23,4 +23,4 @@ message "Found $conf"
 if [ -z "${BOOT_CONFIG-}" ]; then
 	echo "BOOT_CONFIG=\"$conf\""
 	echo "BOOT_PREFIX=\"$prefix\""
-fi >> /.initrd/initenv
+fi >> /.initrd/initenv

feature/rules.mk

@@ -2,7 +2,7 @@ bootloader: create
 	@$(MSG) "Building bootloader ..."
 	@put-tree "$(ROOTDIR)" $(BOOTLOADER_DATADIR)
 	@put-file "$(ROOTDIR)" $(BOOTLOADER_FILES)
-	@put-file -r "/lib/miboot" "$(ROOTDIR)" /lib/miboot/bin/bootmenu
+	@put-file -r "/lib/bootloader" "$(ROOTDIR)" /lib/bootloader/bin/bootmenu
 	@echo "bootloader" > "$(ROOTDIR)/etc/initrd/method"
 
 pack: bootloader

initrd-miboot.mk initrd-bootloader.mkinitrd-miboot.mk renamed to initrd-bootloader.mk

@@ -1,5 +1,4 @@
 AUTODETECT = root device keyboard
 FEATURES += bootloader system-glibc rdshell
 MOUNTPOINTS = /boot
-IMAGEFILE = $(BOOTDIR)/miboot.img
-
+IMAGEFILE = $(BOOTDIR)/bootloader.img

kernel.config

@@ -361,7 +361,7 @@ CONFIG_X86_INTEL_TSX_MODE_OFF=y
 # CONFIG_X86_INTEL_TSX_MODE_AUTO is not set
 CONFIG_EFI=y
 CONFIG_EFI_STUB=y
-CONFIG_EFI_MIXED=y
+# CONFIG_EFI_MIXED is not set
 # CONFIG_SECCOMP is not set
 # CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
@@ -390,8 +390,8 @@ CONFIG_HOTPLUG_CPU=y
 CONFIG_LEGACY_VSYSCALL_XONLY=y
 # CONFIG_LEGACY_VSYSCALL_NONE is not set
 CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="initrd=\\EFI\\LINUX\\miboot.img quiet"
-CONFIG_CMDLINE_OVERRIDE=y
+CONFIG_CMDLINE="ro quiet initrd=\\EFI\\LINUX\\bootloader.img"
+# CONFIG_CMDLINE_OVERRIDE is not set
 CONFIG_MODIFY_LDT_SYSCALL=y
 CONFIG_HAVE_LIVEPATCH=y
 # end of Processor type and features

miboot.in make-bootloader.inmiboot.in renamed to make-bootloader.in

@@ -3,9 +3,8 @@
 . shell-error
 . shell-args
 
-PROJECT=miboot
+PROJECT=bootloader
 
-TARGET="/var/lib/$PROJECT"
 MIBOOT_DIR="/lib/$PROJECT"
 KERNEL_DIR="$MIBOOT_DIR"
 
@@ -162,7 +161,7 @@ done
 
 bootloader_build_image
 
-bootloader_copy "$KERNEL_DIR/boot/vmlinuz"    "$bootdir/efi/EFI/LINUX/$PROJECT.efi"
-bootloader_copy "$KERNEL_DIR/boot/miboot.img" "$bootdir/efi/EFI/LINUX/$PROJECT.img"
+bootloader_copy "$KERNEL_DIR/boot/vmlinuz"        "$bootdir/efi/EFI/LINUX/$PROJECT.efi"
+bootloader_copy "$KERNEL_DIR/boot/bootloader.img" "$bootdir/efi/EFI/LINUX/$PROJECT.img"
 
 bootloader_update_config

make-initrd-bootloader.spec

@@ -29,9 +29,9 @@ Make-initrd bootloader feature.
 %install
 %makeinstall_std
 
-kver="`cat "%buildroot/lib/miboot/boot/version"`"
-mv -f -- "%buildroot/lib/miboot/boot/System.map" "%buildroot/lib/miboot/boot/System.map-$kver"
-mv -f -- "%buildroot/lib/miboot/boot/config"     "%buildroot/lib/miboot/boot/config-$kver"
+kver="`cat "%buildroot/lib/bootloader/boot/version"`"
+mv -f -- "%buildroot/lib/bootloader/boot/System.map" "%buildroot/lib/bootloader/boot/System.map-$kver"
+mv -f -- "%buildroot/lib/bootloader/boot/config"     "%buildroot/lib/bootloader/boot/config-$kver"
 
 mkdir -p %buildroot/%_datadir/make-initrd/features
 cp -a feature %buildroot/%_datadir/make-initrd/features/bootloader
@@ -44,22 +44,22 @@ rm -f -- "$modules_dir"/source
 
 rm -f -- "$modules_dir"/modules.{alias,dep,symbols,builtin}.bin
 touch -- "$modules_dir"/modules.{alias,dep,symbols,builtin}.bin
-touch %buildroot/lib/miboot/boot/miboot.img
+touch %buildroot/lib/bootloader/boot/bootloader.img
 
 %add_findreq_skiplist /usr/share/make-initrd/features/*
-%add_verify_elf_skiplist /lib/miboot/boot/vmlinuz-*
-%brp_strip_none /lib/miboot/boot/*
+%add_verify_elf_skiplist /lib/bootloader/boot/vmlinuz-*
+%brp_strip_none /lib/bootloader/boot/*
 
 %files
-/sbin/miboot
-/lib/miboot
-%ghost /lib/miboot/boot/miboot.img
+/sbin/make-bootloader
+/lib/bootloader
+%ghost /lib/bootloader/boot/bootloader.img
 /lib/modules/*
 %ghost /lib/modules/*/modules.alias.bin
 %ghost /lib/modules/*/modules.dep.bin
 %ghost /lib/modules/*/modules.symbols.bin
 %ghost /lib/modules/*/modules.builtin.bin
-%config(noreplace) %_sysconfdir/miboot.mk
+%config(noreplace) %_sysconfdir/bootloader.mk
 %_datadir/make-initrd/features/bootloader
 
 %changelog