From: kokkiemouse Date: Sat, 12 Sep 2020 06:44:35 +0000 (+0900) Subject: fixed mnt X-Git-Tag: 2020-11-20-a~185 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=31a70bfccf44e1b0c29b8f7c90b30c84bc9aa699;p=alterlinux%2FLFBS.git fixed mnt Signed-off-by: kokkiemouse --- diff --git a/lfbs b/lfbs index 7fbedfb..cbac0cd 100755 --- a/lfbs +++ b/lfbs @@ -245,6 +245,10 @@ prepare_build() { _msg_error "This script must be run as root." 1 fi umount_chroot_airootfs + # Check codename + if [[ -z $(grep -h -v ^'#' ${channels_dir}/${channel_name}/codename.${arch} | grep -x ${codename}) ]]; then + _msg_error "This codename (${channel_name}) is not supported on this channel (${codename})." + fi if [[ -d "${work_dir}/squashfsroot/LiveOS/" ]]; then mkdir -p "${work_dir}/squashfsroot/LiveOS/" mkdir -p "${work_dir}/airootfs/" @@ -252,10 +256,6 @@ prepare_build() { mkfs.ext4 -F "${work_dir}/squashfsroot/LiveOS/rootfs.img" fi mount -o loop,rw,sync "${work_dir}/squashfsroot/LiveOS/rootfs.img" "${work_dir}/airootfs" - # Check codename - if [[ -z $(grep -h -v ^'#' ${channels_dir}/${channel_name}/codename.${arch} | grep -x ${codename}) ]]; then - _msg_error "This codename (${channel_name}) is not supported on this channel (${codename})." - fi }