[update] : Good Bye Snapd

[alterlinux/LUBS.git] / lubs

diff --git a/lubs b/lubs
index d9872d5..ab581b1 100755 (executable)
--- a/lubs
+++ b/lubs
@@ -26,7 +26,7 @@ channels_dir="${script_path}/channels"
 nfb_dir="${script_path}/nfb"
 
 codename="focal"
-mirror="http://ftp.jaist.ac.jp/pub/Linux/ubuntu/"
+mirror="http://linux.yz.yamagata-u.ac.jp/ubuntu/"
 os_name="Ubuntu"
 iso_name="ubuntu"
 
@@ -42,7 +42,6 @@ iso_filename="${iso_name}-${iso_version}-${arch}.iso"
 channel_name="serene"
 
 username="liveuser"
-password="liveuser"
 usershell="/bin/bash"
 
 debug=false
@@ -341,25 +340,6 @@ make_apt_packages() {
     remove "${work_dir}/airootfs/aptpkglist"
 }
 
-make_snap_packages() {
-    remove "${work_dir}/airootfs/snappkglist"
-
-    if [[ -f "${channels_dir}/share/snap-packages.${arch}" ]]; then
-        grep -h -v ^'#' "${channels_dir}/share/snap-packages.${arch}" | grep -v "^$" >> "${work_dir}/airootfs/snappkglist"
-    fi
-
-    if [[ -f "${channels_dir}/${channel_name}/snap-packages.${arch}" ]]; then
-        grep -h -v ^'#' "${channels_dir}/${channel_name}/snap-packages.${arch}" | grep -v "^$" >> "${work_dir}/airootfs/snappkglist"
-    fi
-
-    if [[ -s "${work_dir}/airootfs/snappkglist" ]]; then
-        _apt_install snapd
-        run_cmd env -i bash -c 'snap install $(echo $(<snappkglist))'
-    fi
-
-    remove "${work_dir}/airootfs/snappkglist"
-}
-
 make_config() {
     # Locales
     run_cmd env -i bash -c 'DEBIAN_FRONTEND=noninteractive LANG=en_US.UTF-8 LC_ALL=C LANGUAGE=en_US.UTF-8 dpkg-reconfigure locales'
@@ -378,42 +358,10 @@ make_config() {
     run_cmd truncate -s 0 /etc/machine-id
 }
 
-make_customize_airootfs() {
-    #-- Overwrite airootfs files --#
-    local copy_airootfs
-
-    copy_airootfs() {
-        local _dir="${1%/}"
-
-        if [[ -d "${_dir}" ]]; then
-            cp -af "${_dir}"/* "${work_dir}/airootfs"
-        fi
-    }
-
-    copy_airootfs "${channels_dir}/share/airootfs"
-    copy_airootfs "${channels_dir}/${channel_name}/airootfs"
-
-    #-- Run scripts --#
-    local _customize_siript_options
-    _customize_siript_options="-a ${arch} -u ${username} -p ${password} -s ${usershell}"
-
-    #if ${bash_debug}; then
-    #    _customize_siript_options="$_customize_siript_options -x"
-    #elif ${debug}; then
-    if ${debug}; then
-        _customize_siript_options="$_customize_siript_options -d"
-    fi
-
-    # run_customize_script <script path from lubs> <script path in chroot>
-    local run_customize_script
-    run_customize_script() {
-        if [[ -f "${1}" ]]; then
-            chmod 755 "${1}"
-            run_cmd "${2}" "${_customize_siript_options}"
-        fi
-    }
-    run_customize_script "${work_dir}/airootfs/root/customize_airootfs.sh" "/root/customize_airootfs.sh"
-    run_customize_script "${work_dir}/airootfs/root/customize_airootfs_${channel_name}.sh"  "/root/customize_airootfs_${channel_name}.sh"
+make_add_user() {
+    sed "s|%USERNAME%|${username}|g;s|%OS_NAME%|${os_name}|g" "${nfb_dir}/casper.conf" > "${work_dir}/airootfs/etc/casper.conf"
+    chmod 755 "${work_dir}"/airootfs/usr/share/initramfs-tools/scripts/casper-bottom/*adduser "${work_dir}"/airootfs/usr/share/initramfs-tools/scripts/casper-bottom/*autologin
+    run_cmd env -i bash -c 'mkinitramfs -o /boot/initrd.img-`uname -r` `uname -r`'
 }
 
 make_clean() {
@@ -488,8 +436,9 @@ make_efi() {
     mkfs.fat -F 16 -f 1 -r 112 "${bootfiles_dir}/isolinux/efiboot.img"
     mkdir "${bootfiles_dir}/mnt"
     mount "${bootfiles_dir}/isolinux/efiboot.img" "${bootfiles_dir}/mnt"
-    cp "${bootfiles_dir}/isolinux/bootia32.efi" "${bootfiles_dir}/mnt"
-    cp "${bootfiles_dir}/isolinux/bootx64.efi" "${bootfiles_dir}/mnt"
+    mkdir -p "${bootfiles_dir}/mnt/efi/boot"
+    cp "${bootfiles_dir}/isolinux/bootia32.efi" "${bootfiles_dir}/mnt/efi/boot"
+    cp "${bootfiles_dir}/isolinux/bootx64.efi" "${bootfiles_dir}/mnt/efi/boot"
     umount -d "${bootfiles_dir}/mnt"
     rm -r "${bootfiles_dir}/mnt"
 }
@@ -666,9 +615,8 @@ run_once make_basefs
 run_once make_sourcelist
 run_once make_systemd
 run_once make_apt_packages
-#run_once make_snap_packages
 run_once make_config
-run_once make_customize_airootfs
+run_once make_add_user
 run_once make_clean
 run_once make_squashfs
 run_once make_nfb