work_dir="${script_path}/work"
channels_dir="${script_path}/channels"
nfb_dir="${script_path}/nfb"
-codename="32"
-os_name="Fedora"
+codename="33"
+os_name="SereneLinux"
iso_name="Fedora"
language="ja_JP.UTF-8"
-channel_name="lxde"
+channel_name="serene"
cache_dir="${script_path}/cache"
-
+bootsplash=false
arch="x86_64"
out_dir="${script_path}/out"
run_cmd() {
local mount
- for mount in "dev" "dev/pts" "proc" "sys" "etc/resolv.conf"; do
+ for mount in "dev" "dev/pts" "proc" "sys" "run/systemd/resolve/stub-resolv.conf"; do
#for mount in "dev" "dev/pts" "proc" "sys" ; do
- if [[ "${mount}" == "etc/resolv.conf" ]]; then
- cp /etc/resolv.conf "${work_dir}/airootfs/${mount}"
+ if [[ "${mount}" == "run/systemd/resolve/stub-resolv.conf" ]]; then
+ # cp /etc/resolv.conf "${work_dir}/airootfs/run${mount}"
+ mount --bind /etc/resolv.conf "${work_dir}/airootfs/run/systemd/resolve/stub-resolv.conf"
else
mount --bind /${mount} "${work_dir}/airootfs/${mount}"
fi
echo
echo " -a | --arch <str> Set architecture"
echo " Default: ${arch}"
+ echo " -b | --bootsplash Enable Plymouth"
echo " -l | --lang <lang> Specifies the default language for the live environment"
echo " Default: ${locale_name}"
echo " -m | --mirror <url> Set apt mirror server."
make_basefs() {
_msg_info "Installing Fedora to '${work_dir}/airootfs'..."
- dnfstrap @Core yamad-repo
+ dnfstrap @Core yamad-repo
_msg_info "${codename} installed successfully!"
echo 'PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PATH}' > "${work_dir}/airootfs/etc/bash.bashrc"
fi
run_cmd ln -sf /etc/machine-id /var/lib/dbus/machine-id
}
+make_repo_packages() {
+ remove "${work_dir}/airootfs/dnfrepopkglist"
+ #_apt_install initramfs-tools
+ # run_cmd env -i bash -c 'DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade --yes'
+
+ if [[ -f "${channels_dir}/share/add_repo.${arch}" ]]; then
+ grep -h -v ^'#' "${channels_dir}/share/add_repo.${arch}" | grep -v "^$" >> "${work_dir}/airootfs/dnfrepopkglist"
+ fi
+
+ if [[ -f "${channels_dir}/${channel_name}/add_repo.${arch}" ]]; then
+ grep -h -v ^'#' "${channels_dir}/${channel_name}/add_repo.${arch}" | grep -v "^$" >> "${work_dir}/airootfs/dnfrepopkglist"
+ fi
+
+ if [[ -s "${work_dir}/airootfs/dnfrepopkglist" ]]; then
+ mount --bind "${cache_dir}" "${work_dir}/airootfs/dnf_cache"
+ sed -i -e "s|\${codename}|${codename}|g" "${work_dir}/airootfs/dnfrepopkglist"
+ run_cmd env -i bash -c 'dnf -y --nogpgcheck -c /dnf_conf install $(echo $(<dnfrepopkglist))'
+ fi
+
+ remove "${work_dir}/airootfs/dnfrepopkglist"
+}
make_dnf_packages() {
remove "${work_dir}/airootfs/dnfpkglist"
#_apt_install initramfs-tools
if [[ -f "${channels_dir}/${channel_name}/packages-${locale_name}.${arch}" ]]; then
grep -h -v ^'#' "${channels_dir}/${channel_name}/packages-${locale_name}.${arch}" | grep -v "^$" >> "${work_dir}/airootfs/dnfpkglist"
fi
-
+ if [[ ${bootsplash} == true ]]; then
+ if [[ -f "${channels_dir}/share/packages_plymouth.${arch}" ]]; then
+ grep -h -v ^'#' "${channels_dir}/share/packages_plymouth.${arch}" | grep -v "^$" >> "${work_dir}/airootfs/dnfpkglist"
+ fi
+
+ if [[ -f "${channels_dir}/${channel_name}/packages_plymouth.${arch}" ]]; then
+ grep -h -v ^'#' "${channels_dir}/${channel_name}/packages_plymouth.${arch}" | grep -v "^$" >> "${work_dir}/airootfs/dnfpkglist"
+ fi
+ fi
if [[ -s "${work_dir}/airootfs/dnfpkglist" ]]; then
mount --bind "${cache_dir}" "${work_dir}/airootfs/dnf_cache"
run_cmd env -i bash -c 'dnf -y --nogpgcheck -c /dnf_conf install $(echo $(<dnfpkglist))'
# -k changed in AlterISO3 from passing kernel name to passing kernel configuration.
local _airootfs_script_options _run_script
_airootfs_script_options="-p ${liveuser_password} -u ${liveuser_name} -o ${os_name} -s ${liveuser_shell} -a ${arch} -g ${locale_gen_name} -l ${locale_name} -z ${locale_time} "
-
+ if [[ ${bootsplash} == true ]]; then
+ _airootfs_script_options="${_airootfs_script_options} -b"
+ fi
_run_script() {
local _file
for _file in ${@}; do
mkdir -p "${bootfiles_dir}"/{grub,LiveOS,boot,isolinux}
#generate initrd
_msg_info "make initrd..."
- run_cmd dracut --xz --add "dmsquash-live convertfs pollcdrom" --omit plymouth --no-hostonly --no-early-microcode /boot/initrd0 `run_cmd ls /lib/modules`
+ run_cmd dracut --xz --add "dmsquash-live convertfs pollcdrom" --no-hostonly --no-early-microcode /boot/initrd0 `run_cmd ls /lib/modules`
cp ${work_dir}/airootfs/boot/vmlinuz-$(run_cmd ls /lib/modules) ${bootfiles_dir}/boot/vmlinuz
mv ${work_dir}/airootfs/boot/initrd0 ${bootfiles_dir}/boot/initrd
#cp isolinux
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"
_msg_info "Compress rootfs.."
- mksquashfs "${work_dir}/squashfsroot/" "${bootfiles_dir}/LiveOS/squashfs.img"
+ mksquashfs "${work_dir}/squashfsroot/" "${bootfiles_dir}/LiveOS/squashfs.img" -noappend -no-recovery -comp zstd -Xcompression-level 19 -b 1048576
+ _msg_info "Deleting block image..."
+ rm -rf "${work_dir}/squashfsroot/LiveOS/rootfs.img"
}
make_nfb() {
# isolinux setup
sed "s|%OS_NAME%|${os_name}|g" "${nfb_dir}/isolinux.cfg" | sed "s|%CD_LABEL%|${iso_label}|g" > "${bootfiles_dir}/isolinux/isolinux.cfg"
#grub
- sed "s|%OS_NAME%|${os_name}|g" "${nfb_dir}/grub.cfg" | sed "s|%CD_LABEL%|${iso_label}|g" > "${bootfiles_dir}/grub/grub.cfg"
+ if [[ ${bootsplash} = true ]]; then
+ sed "s|%OS_NAME%|${os_name}|g" "${nfb_dir}/grub.cfg" | sed "s|%CD_LABEL%|${iso_label}|g" | sed "s|selinux=0|selinux=0 quiet splash|g" > "${bootfiles_dir}/grub/grub.cfg"
+ else
+ sed "s|%OS_NAME%|${os_name}|g" "${nfb_dir}/grub.cfg" | sed "s|%CD_LABEL%|${iso_label}|g" > "${bootfiles_dir}/grub/grub.cfg"
+ fi
+ sed "s|%OS_NAME%|${os_name}|g" "${nfb_dir}/grub.cfg" | sed "s|%CD_LABEL%|${iso_label}|g" | sed "s|selinux=0|selinux=0 quiet splash|g" > "${bootfiles_dir}/grub/grub.cfg"
}
make_efi() {
# UEFI 32bit (ia32)
# 引数解析（）
# 参考記事：https://0e0.pw/ci83 https://0e0.pw/VJlg
-_opt_short="w:l:o:ha:-:m:c:d"
-_opt_long="help,arch:,codename:,debug,help,lang,mirror:,out:,work,cache-only"
+_opt_short="w:l:o:hba:-:m:c:d"
+_opt_long="help,arch:,codename:,debug,help,lang,mirror:,out:,work,cache-only,bootsplash"
OPT=$(getopt -o ${_opt_short} -l ${_opt_long} -- "${@}")
if [[ ${?} != 0 ]]; then
arch="${2}"
shift 2
;;
+ -b | --bootsplash)
+ bootsplash=true
+ shift 1
+ ;;
-c | --cache)
cache_dir="${2}"
shift 2
parse_files
run_once make_basefs
run_once make_systemd
+run_once make_repo_packages
run_once make_dnf_packages
run_once make_cp_airootfs
run_once make_config
OSDN Git Service
