fixed boot

Signed-off-by: kokkiemouse <kokkiemouse@gmail.com>

diff --git a/channels/serene/airootfs/root/customize_airootfs_serene.sh b/channels/serene/airootfs/root/customize_airootfs_serene.sh
index 2d53270..e031bbf 100755 (executable)
--- a/channels/serene/airootfs/root/customize_airootfs_serene.sh
+++ b/channels/serene/airootfs/root/customize_airootfs_serene.sh
@@ -34,4 +34,5 @@ ln -s /usr/share/backgrounds/serene-wallpaper-1.png /usr/share/backgrounds/image
 
 echo -e "sed -i \"s/^autologin/#autologin/g\" /etc/lightdm/lightdm.conf" >> /usr/share/calamares/final-process
 sed -i "s/- grubcfg/# - grubcfg/g" /usr/share/calamares/settings.conf
-sed -i "s/sb-shim/grub/g" /usr/share/calamares/modules/bootloader.conf
\ No newline at end of file
+sed -i "s/sb-shim/grub/g" /usr/share/calamares/modules/bootloader.conf
+sed -i "s/fedora/Serene Linux on Fedora/g" /usr/share/calamares/modules/bootloader.conf

diff --git a/channels/share/airootfs/etc/selinux/config b/channels/share/airootfs/etc/selinux/config
new file mode 100644 (file)
index 0000000..758606d
--- /dev/null
+++ b/channels/share/airootfs/etc/selinux/config
@@ -0,0 +1 @@
+SELINUX=disabled 

diff --git a/channels/share/airootfs/usr/share/calamares/modules/shellprocess.conf b/channels/share/airootfs/usr/share/calamares/modules/shellprocess.conf
new file mode 100644 (file)
index 0000000..9bf00ee
--- /dev/null
+++ b/channels/share/airootfs/usr/share/calamares/modules/shellprocess.conf
@@ -0,0 +1,37 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+#
+# Configuration for the shell process job.
+#
+# Executes a list of commands found under the key *script*.
+# If the top-level key *dontChroot* is true, then the commands
+# are executed in the context of the live system, otherwise
+# in the context of the target system. In all of the commands,
+# the following substitutions will take place:
+#  - `@@ROOT@@` is replaced by the root mount point of the **target**
+#    system from the point of view of the command (for chrooted
+#    commands, that will be */*).
+#  - `@@USER@@` is replaced by the username, set on the user page.
+#
+# The (global) timeout for the command list can be set with
+# the *timeout* key. The value is a time in seconds, default
+# is 10 seconds if not set.
+#
+# If a command starts with "-" (a single minus sign), then the
+# return value of the command following the - is ignored; otherwise,
+# a failing command will abort the installation. This is much like
+# make's use of - in a command.
+#
+# The value of *script* may be:
+#   - a single string; this is one command that is executed.
+#   - a list of strings; these are executed one at a time, by
+#     separate shells (/bin/sh -c is invoked for each command).
+#   - an object, specifying a key *command* and (optionally)
+#     a key *timeout* to set the timeout for this specific
+#     command differently from the global setting.
+---
+dontChroot: false
+timeout: 50
+script:
+    - "chmod 755 /usr/share/calamares/final-process"
+    - "/usr/share/calamares/final-process -u @@USER@@"

diff --git a/lfbs b/lfbs
index 5f6ad46..be792a5 100755 (executable)
--- a/lfbs
+++ b/lfbs
@@ -441,6 +441,8 @@ make_squashfs() {
     remove "${work_dir}/airootfs/boot"
     mkdir "${work_dir}/airootfs/boot"
     cp ${bootfiles_dir}/boot/vmlinuz ${work_dir}/airootfs/boot/vmlinuz-$(run_cmd ls /lib/modules)
+    kernelkun=$(run_cmd ls /lib/modules)
+    echo -e "\nkernel-install add ${kernelkun} /boot/vmlinuz-${kernelkun}" >> ${work_dir}/airootfs/usr/share/calamares/final-process
     umount "${work_dir}/airootfs"
     _msg_info "Minimize rootfs..."
     resize2fs -M "${work_dir}/squashfsroot/LiveOS/rootfs.img"